Date: Tue, 5 Aug 2014 01:42:01 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r269552 - projects/release-noxdev/release Message-ID: <53e03669.5800.3ff15e4d@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Tue Aug 5 01:42:01 2014 New Revision: 269552 URL: http://svnweb.freebsd.org/changeset/base/269552 Log: Call load_chroot_env() and load_target_env() where they can be mutually conflicting with regard to TARGET, TARGET_ARCH, XDEV, and XDEV_ARCH. 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:38:24 2014 (r269551) +++ projects/release-noxdev/release/release.sh Tue Aug 5 01:42:01 2014 (r269552) @@ -166,6 +166,7 @@ if [ -n "${TARGET}" ] && [ -n "${TARGET_ else ARCH_FLAGS= fi +load_chroot_env CHROOT_MAKEENV="${CHROOT_MAKEENV} MAKEOBJDIRPREFIX=${CHROOTDIR}/tmp/obj" CHROOT_WMAKEFLAGS="${MAKE_FLAGS} ${WORLD_FLAGS} ${CONF_FILES}" CHROOT_IMAKEFLAGS="${CONF_FILES}" @@ -228,6 +229,7 @@ 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 @@ -252,6 +254,7 @@ 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 @@ -264,6 +267,7 @@ 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 eval chroot ${CHROOTDIR} make -C /usr/src ${RELEASE_WMAKEFLAGS} buildworld
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?53e03669.5800.3ff15e4d>