From owner-svn-src-projects@FreeBSD.ORG Thu May 7 17:35:49 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7BF6D582; Thu, 7 May 2015 17:35:49 +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 6A7A014E2; Thu, 7 May 2015 17:35:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t47HZnob052819; Thu, 7 May 2015 17:35:49 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t47HZnWT052818; Thu, 7 May 2015 17:35:49 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201505071735.t47HZnWT052818@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 17:35:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r282588 - 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 17:35:49 -0000 Author: gjb Date: Thu May 7 17:35:48 2015 New Revision: 282588 URL: https://svnweb.freebsd.org/changeset/base/282588 Log: In arm_create_disk(), chroot(8) to the build environment is necessary. In arm_install_base(), chroot(8) when installing world and kernel. Fix paths for fstab(5) and rc.conf(5). Sponsored by: The FreeBSD Foundation Modified: projects/release-arm-redux/release/tools/arm.subr Modified: projects/release-arm-redux/release/tools/arm.subr ============================================================================== --- projects/release-arm-redux/release/tools/arm.subr Thu May 7 17:33:21 2015 (r282587) +++ projects/release-arm-redux/release/tools/arm.subr Thu May 7 17:35:48 2015 (r282588) @@ -64,52 +64,52 @@ umount_loop() { arm_create_disk() { # Create the target raw file and temporary work directory. - 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} - gpart create -s bsd ${mddev}s2 - gpart add -t freebsd-ufs -a 64k /dev/${mddev}s2 - newfs -U -L rootfs /dev/${mddev}s2a - tunefs -j enable -N enable /dev/${mddev}s2a + chroot ${CHROOTDIR} gpart create -s ${PART_SCHEME} ${mddev} + chroot ${CHROOTDIR} gpart add -t '!12' -a 63 -s ${FAT_SIZE} ${mddev} + chroot ${CHROOTDIR} gpart set -a active -i 1 ${mddev} + chroot ${CHROOTDIR} newfs_msdos -L msdosboot -F ${FAT_TYPE} /dev/${mddev}s1 + chroot ${CHROOTDIR} gpart add -t freebsd ${mddev} + chroot ${CHROOTDIR} gpart create -s bsd ${mddev}s2 + chroot ${CHROOTDIR} gpart add -t freebsd-ufs -a 64k /dev/${mddev}s2 + chroot ${CHROOTDIR} newfs -U -L rootfs /dev/${mddev}s2a + chroot ${CHROOTDIR} tunefs -j enable -N enable /dev/${mddev}s2a return 0 } arm_install_base() { - mount /dev/${mddev}s2a ${DESTDIR} - cd ${WORLDDIR} && \ - eval make TARGET=${EMBEDDED_TARGET} \ - TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \ - DESTDIR=${DESTDIR} KERNCONF=${KERNEL} \ - installworld installkernel distribution + chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${DESTDIR} + eval chroot ${CHROOTDIR} make -C ${WORLDDIR} \ + TARGET=${EMBEDDED_TARGET} \ + TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \ + DESTDIR=${DESTDIR} KERNCONF=${KERNEL} \ + installworld installkernel distribution echo '# Custom /etc/fstab for FreeBSD embedded images' \ - > ${DESTDIR}/etc/fstab + > ${CHROOTDIR}/${DESTDIR}/etc/fstab echo "/dev/msdosfs/MSDOSBOOT /boot/msdos msdosfs rw,noatime 0 0" \ - >> ${DESTDIR}/etc/fstab + >> ${CHROOTDIR}/${DESTDIR}/etc/fstab echo "/dev/ufs/rootfs / ufs rw 1 1" \ - >> ${DESTDIR}/etc/fstab + >> ${CHROOTDIR}/${DESTDIR}/etc/fstab echo "md /tmp mfs rw,noatime,-s30m 0 0" \ - >> ${DESTDIR}/etc/fstab + >> ${CHROOTDIR}/${DESTDIR}/etc/fstab echo "md /var/log mfs rw,noatime,-s15m 0 0" \ - >> ${DESTDIR}/etc/fstab + >> ${CHROOTDIR}/${DESTDIR}/etc/fstab echo "md /var/tmp mfs rw,noatime,-s12m 0 0" \ - >> ${DESTDIR}/etc/fstab + >> ${CHROOTDIR}/${DESTDIR}/etc/fstab local hostname hostname="$(echo ${KERNEL} | tr '[:upper:]' '[:lower:]')" - echo "hostname=\"${hostname}\"" > ${DESTDIR}/etc/rc.conf - echo 'ifconfig_DEFAULT="DHCP"' >> ${DESTDIR}/etc/rc.conf - echo 'sshd_enable="YES"' >> ${DESTDIR}/etc/rc.conf - echo 'sendmail_enable="NONE"' >> ${DESTDIR}/etc/rc.conf - echo 'sendmail_submit_enable="NO"' >> ${DESTDIR}/etc/rc.conf - echo 'sendmail_outbound_enable="NO"' >> ${DESTDIR}/etc/rc.conf - echo 'sendmail_msp_queue_enable="NO"' >> ${DESTDIR}/etc/rc.conf + echo "hostname=\"${hostname}\"" > ${CHROOTDIR}/${DESTDIR}/etc/rc.conf + echo 'ifconfig_DEFAULT="DHCP"' >> ${CHROOTDIR}/${DESTDIR}/etc/rc.conf + echo 'sshd_enable="YES"' >> ${CHROOTDIR}/${DESTDIR}/etc/rc.conf + echo 'sendmail_enable="NONE"' >> ${CHROOTDIR}/${DESTDIR}/etc/rc.conf + echo 'sendmail_submit_enable="NO"' >> ${CHROOTDIR}/${DESTDIR}/etc/rc.conf + echo 'sendmail_outbound_enable="NO"' >> ${CHROOTDIR}/${DESTDIR}/etc/rc.conf + echo 'sendmail_msp_queue_enable="NO"' >> ${CHROOTDIR}/${DESTDIR}/etc/rc.conf sync - umount_loop ${DESTDIR} + umount_loop ${CHROOTDIR}/${DESTDIR} return 0 }