diff options
author | Glen Barber <gjb@FreeBSD.org> | 2015-05-06 15:20:29 +0000 |
---|---|---|
committer | Glen Barber <gjb@FreeBSD.org> | 2015-05-06 15:20:29 +0000 |
commit | 8501ddab551e23d9595e569a5facf5451545ce24 (patch) | |
tree | b0d7affbf4e778077f90624b7440e374d5f7072f | |
parent | 7290c83913b0df6f2bc404badd9d8f6106d2d9f1 (diff) | |
download | src-8501ddab551e23d9595e569a5facf5451545ce24.tar.gz src-8501ddab551e23d9595e569a5facf5451545ce24.zip |
Add a return to chroot_build_target().
In chroot_build_release(), reverse the order evaluating
EMBEDDEDBUILD.
Sponsored by: The FreeBSD Foundation
Notes
Notes:
svn path=/projects/release-arm-redux/; revision=282548
-rwxr-xr-x | release/release.sh | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/release/release.sh b/release/release.sh index 0b123dfb2617..2db5cf347acf 100755 --- a/release/release.sh +++ b/release/release.sh @@ -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. |