Date: Wed, 6 May 2015 15:20:29 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r282548 - projects/release-arm-redux/release Message-ID: <201505061520.t46FKTr1055996@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Wed May 6 15:20:29 2015 New Revision: 282548 URL: https://svnweb.freebsd.org/changeset/base/282548 Log: Add a return to chroot_build_target(). In chroot_build_release(), reverse the order evaluating EMBEDDEDBUILD. Sponsored by: The FreeBSD Foundation Modified: projects/release-arm-redux/release/release.sh Modified: projects/release-arm-redux/release/release.sh ============================================================================== --- projects/release-arm-redux/release/release.sh Wed May 6 15:17:28 2015 (r282547) +++ projects/release-arm-redux/release/release.sh Wed May 6 15:20:29 2015 (r282548) @@ -236,7 +236,6 @@ chroot_setup() { # extra_chroot_setup(): Prepare anything additional within the build # necessary for the release build. extra_chroot_setup() { - mount -t devfs devfs ${CHROOTDIR}/dev [ -e /etc/resolv.conf ] && cp /etc/resolv.conf \ ${CHROOTDIR}/etc/resolv.conf @@ -282,8 +281,24 @@ chroot_build_target() { eval chroot ${CHROOTDIR} make -C /usr/src ${RELEASE_WMAKEFLAGS} buildworld eval chroot ${CHROOTDIR} make -C /usr/src ${RELEASE_KMAKEFLAGS} buildkernel + return 0 +} # chroot_build_target + +# chroot_build_release(): Invoke the 'make release' target. +chroot_build_release() { + buildenv_setup + load_target_env + + if [ -z "${EMBEDDEDBUILD}" ]; then + eval chroot ${CHROOTDIR} make -C /usr/src/release \ + ${RELEASE_RMAKEFLAGS} release + eval chroot ${CHROOTDIR} make -C /usr/src/release \ + ${RELEASE_RMAKEFLAGS} install DESTDIR=/R \ + WITH_COMPRESSED_IMAGES=${WITH_COMPRESSED_IMAGES} \ + WITH_COMPRESSED_VMIMAGES=${WITH_COMPRESSED_VMIMAGES} + return 0 + else # Embedded builds do not use the 'make release' target. - if [ -n "${EMBEDDEDBUILD}" ]; then buildenv_setup # If a crochet configuration file exists in *this* checkout of # release/, copy it to the /tmp/external directory within the @@ -297,31 +312,16 @@ chroot_build_target() { cp ${RELENGDIR}/tools/${XDEV}/crochet-${KERNEL}.conf \ ${CHROOTDIR}/tmp/external/${XDEV}/crochet-${KERNEL}.conf /bin/sh ${RELENGDIR}/${XDEV}/release.sh + return 0 fi # If the script does not exist for this architecture, exit. # This probably should be checked earlier, but allowing the # rest of the build process to get this far will at least set # up the chroot environment for testing. return 1 - else - # Not embedded. - return 0 fi return 0 -} # chroot_build_target - -# chroot_build_release(): Invoke the 'make release' target. -chroot_build_release() { - buildenv_setup - load_target_env - eval chroot ${CHROOTDIR} make -C /usr/src/release ${RELEASE_RMAKEFLAGS} \ - release - eval chroot ${CHROOTDIR} make -C /usr/src/release ${RELEASE_RMAKEFLAGS} \ - install DESTDIR=/R WITH_COMPRESSED_IMAGES=${WITH_COMPRESSED_IMAGES} \ - WITH_COMPRESSED_VMIMAGES=${WITH_COMPRESSED_VMIMAGES} - - return 0 } # chroot_build_release() # main(): Start here.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505061520.t46FKTr1055996>