Date: Sun, 5 Nov 2017 22:29:34 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325457 - head/release/scripts Message-ID: <201711052229.vA5MTY0v007045@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Sun Nov 5 22:29:34 2017 New Revision: 325457 URL: https://svnweb.freebsd.org/changeset/base/325457 Log: Rework r325076: Just use the pre-existing OBJDIR. Like was done in usr.sbin/mergemaster in r249906, we can just use the already-built OBJDIR for install(1). Sponsored by: Dell EMC Isilon Modified: head/release/scripts/mm-mtree.sh Modified: head/release/scripts/mm-mtree.sh ============================================================================== --- head/release/scripts/mm-mtree.sh Sun Nov 5 22:28:39 2017 (r325456) +++ head/release/scripts/mm-mtree.sh Sun Nov 5 22:29:34 2017 (r325457) @@ -114,14 +114,10 @@ echo '' ${MM_MAKE} DESTDIR=${DESTDIR} distrib-dirs ;; esac - od=${TEMPROOT}/usr/obj ${MM_MAKE} DESTDIR=${TEMPROOT} distrib-dirs && - MAKEOBJDIRPREFIX=$od ${MM_MAKE} kernel-toolchain \ - MK_TOOLCHAIN=no MK_CROSS_COMPILER=no \ - MK_CDDL=no MK_TESTS=no MK_RESCUE=no && - MAKEOBJDIRPREFIX=$od ${MM_MAKE} _obj SUBDIR_OVERRIDE=etc && - MAKEOBJDIRPREFIX=$od ${MM_MAKE} everything SUBDIR_OVERRIDE=etc && - MAKEOBJDIRPREFIX=$od ${MM_MAKE} DESTDIR=${TEMPROOT} distribution;} || + ${MM_MAKE} _obj SUBDIR_OVERRIDE=etc && + ${MM_MAKE} everything SUBDIR_OVERRIDE=etc && + ${MM_MAKE} DESTDIR=${TEMPROOT} distribution;} || { echo ''; echo " *** FATAL ERROR: Cannot 'cd' to ${SOURCEDIR} and install files to"; echo " the temproot environment";
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201711052229.vA5MTY0v007045>