Date: Wed, 25 Dec 2013 18:25:58 +0000 (UTC) From: Julio Merino <jmmv@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r259881 - head/release Message-ID: <201312251825.rBPIPxNo047853@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jmmv Date: Wed Dec 25 18:25:58 2013 New Revision: 259881 URL: http://svnweb.freebsd.org/changeset/base/259881 Log: Put the release objdir inside the chroot. When building the system from outside the chroot as part of the release process, ensure the objdir is within the chroot so that the whole output of the release.sh script is self-contained in a single directory. Use CHROOTDIR/tmp/obj instead of CHROOTDIR/usr/obj to minimize possible interferences with the output of the build itself. Reviewed by: gjb Approved by: rpaulo (mentor) Modified: head/release/release.sh Modified: head/release/release.sh ============================================================================== --- head/release/release.sh Wed Dec 25 17:28:18 2013 (r259880) +++ head/release/release.sh Wed Dec 25 18:25:58 2013 (r259881) @@ -126,6 +126,7 @@ if [ "x${TARGET}" != "x" ] && [ "x${TARG else ARCH_FLAGS= fi +CHROOT_MAKEENV="MAKEOBJDIRPREFIX=${CHROOTDIR}/tmp/obj" CHROOT_WMAKEFLAGS="${MAKE_FLAGS} ${WORLD_FLAGS} ${CONF_FILES}" CHROOT_IMAKEFLAGS="${CONF_FILES}" CHROOT_DMAKEFLAGS="${CONF_FILES}" @@ -163,9 +164,11 @@ if [ "x${NOPORTS}" = "x" ]; then fi cd ${CHROOTDIR}/usr/src -make ${CHROOT_WMAKEFLAGS} buildworld -make ${CHROOT_IMAKEFLAGS} installworld DESTDIR=${CHROOTDIR} -make ${CHROOT_DMAKEFLAGS} distribution DESTDIR=${CHROOTDIR} +env ${CHROOT_MAKEENV} make ${CHROOT_WMAKEFLAGS} buildworld +env ${CHROOT_MAKEENV} make ${CHROOT_IMAKEFLAGS} installworld \ + DESTDIR=${CHROOTDIR} +env ${CHROOT_MAKEENV} make ${CHROOT_DMAKEFLAGS} distribution \ + DESTDIR=${CHROOTDIR} mount -t devfs devfs ${CHROOTDIR}/dev cp /etc/resolv.conf ${CHROOTDIR}/etc/resolv.conf trap "umount ${CHROOTDIR}/dev" EXIT # Clean up devfs mount on exit
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312251825.rBPIPxNo047853>