From owner-svn-src-projects@FreeBSD.ORG Thu May 7 00:27:29 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BE238CC; Thu, 7 May 2015 00:27:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 929A9152B; Thu, 7 May 2015 00:27:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t470RTsK036376; Thu, 7 May 2015 00:27:29 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t470RTJ6036374; Thu, 7 May 2015 00:27:29 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201505070027.t470RTJ6036374@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 7 May 2015 00:27:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r282573 - in projects/release-arm-redux/release: . tools X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 May 2015 00:27:29 -0000 Author: gjb Date: Thu May 7 00:27:28 2015 New Revision: 282573 URL: https://svnweb.freebsd.org/changeset/base/282573 Log: In release.sh, create the /dev directory within the chroot before attempting to mount(8) devfs. Also, create the .OBJDIR for the 'release' target, so files end up in the correct location. In tools/arm.subr, fix the target device when creating the gpart partition scheme. Sponsored by: The FreeBSD Foundation Modified: projects/release-arm-redux/release/release.sh projects/release-arm-redux/release/tools/arm.subr Modified: projects/release-arm-redux/release/release.sh ============================================================================== --- projects/release-arm-redux/release/release.sh Wed May 6 23:52:15 2015 (r282572) +++ projects/release-arm-redux/release/release.sh Thu May 7 00:27:28 2015 (r282573) @@ -243,6 +243,7 @@ chroot_setup() { # extra_chroot_setup(): Prepare anything additional within the build # necessary for the release build. extra_chroot_setup() { + mkdir -p ${CHROOTDIR}/dev mount -t devfs devfs ${CHROOTDIR}/dev [ -e /etc/resolv.conf ] && cp /etc/resolv.conf \ ${CHROOTDIR}/etc/resolv.conf @@ -323,6 +324,7 @@ chroot_build_release() { # chroot_arm_armv6_build_release(): Create arm/armv6 SD card image. chroot_arm_armv6_build_release() { load_target_env + eval chroot ${CHROOTDIR} make -C /usr/src/release obj # XXX: In progress. if [ -e "${RELENGDIR}/tools/${EMBEDDED_TARGET}.subr" ]; then . "${RELENGDIR}/tools/${EMBEDDED_TARGET}.subr" Modified: projects/release-arm-redux/release/tools/arm.subr ============================================================================== --- projects/release-arm-redux/release/tools/arm.subr Wed May 6 23:52:15 2015 (r282572) +++ projects/release-arm-redux/release/tools/arm.subr Thu May 7 00:27:28 2015 (r282573) @@ -64,8 +64,8 @@ umount_loop() { arm_create_disk() { # Create the target raw file and temporary work directory. - gpart create -s ${PART_SCHEME} ${IMGBASE} - gpart add -t '\!12' -a 63 -s ${FAT_SIZE} ${mddev} + gpart create -s ${PART_SCHEME} ${mddev} + gpart add -t '!12' -a 63 -s ${FAT_SIZE} ${mddev} gpart set -a active -i 1 ${mddev} newfs_msdos -L msdosboot -F ${FAT_TYPE} /dev/${mddev}s1 gpart add -t freebsd ${mddev}