Date: Tue, 5 Aug 2014 01:49:30 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r269555 - projects/release-noxdev/release Message-ID: <53e0382a.5863.1a2a2b59@svn.freebsd.org>
index | next in thread | raw e-mail
Author: gjb Date: Tue Aug 5 01:49:30 2014 New Revision: 269555 URL: http://svnweb.freebsd.org/changeset/base/269555 Log: Simplify where load_chroot_env() and load_target_env() are called. Sponsored by: The FreeBSD Foundation Modified: projects/release-noxdev/release/release.sh Modified: projects/release-noxdev/release/release.sh ============================================================================== --- projects/release-noxdev/release/release.sh Tue Aug 5 01:47:07 2014 (r269554) +++ projects/release-noxdev/release/release.sh Tue Aug 5 01:49:30 2014 (r269555) @@ -229,13 +229,13 @@ if [ -e ${SRC_CONF} ] && [ ! -c ${SRC_CO cp ${SRC_CONF} ${CHROOTDIR}/${SRC_CONF} fi -load_target_env # Embedded builds do not use the 'make release' target. if [ -n "${EMBEDDEDBUILD}" ]; then # If a crochet configuration file exists in *this* checkout of # release/, copy it to the /tmp/external directory within the chroot. # This allows building embedded releases without relying on updated # scripts and/or configurations to exist in the branch being built. + load_target_env if [ -e ${RELENGDIR}/tools/${XDEV}/crochet-${KERNEL}.conf ] && \ [ -e ${RELENGDIR}/${XDEV}/release.sh ]; then mkdir -p ${CHROOTDIR}/tmp/external/${XDEV}/ @@ -254,7 +254,6 @@ else fi if [ -d ${CHROOTDIR}/usr/ports ]; then - load_chroot_env # Run ldconfig(8) in the chroot directory so /var/run/ld-elf*.so.hints # is created. This is needed by ports-mgmt/pkg. chroot ${CHROOTDIR} /etc/rc.d/ldconfig forcerestart @@ -267,9 +266,9 @@ if [ -d ${CHROOTDIR}/usr/ports ]; then chroot ${CHROOTDIR} make -C /usr/ports/textproc/docproj \ ${PBUILD_FLAGS} OPTIONS_UNSET="FOP IGOR" install clean distclean fi - load_target_env fi +load_target_env eval chroot ${CHROOTDIR} make -C /usr/src ${RELEASE_WMAKEFLAGS} buildworld eval chroot ${CHROOTDIR} make -C /usr/src ${RELEASE_KMAKEFLAGS} buildkernel eval chroot ${CHROOTDIR} make -C /usr/src/release ${RELEASE_RMAKEFLAGS} \help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?53e0382a.5863.1a2a2b59>