Date: Mon, 18 Apr 2016 18:14:05 +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: r298220 - head Message-ID: <201604181814.u3IIE5a2059347@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Mon Apr 18 18:14:05 2016 New Revision: 298220 URL: https://svnweb.freebsd.org/changeset/base/298220 Log: META_MODE: Disable during installworld and similar. META_MODE may create cookies during staging of files to WORLDTMP that would also prevent installation of the files to the final DESTDIR, since the cookie already exists. This is not yet the case but will be soon. Prevent other similar issues by disabling META_MODE for any top-level install targets. Sponsored by: EMC / Isilon Storage Division Modified: head/Makefile Modified: head/Makefile ============================================================================== --- head/Makefile Mon Apr 18 18:14:02 2016 (r298219) +++ head/Makefile Mon Apr 18 18:14:05 2016 (r298220) @@ -183,6 +183,14 @@ SUB_MAKE= ${MAKE} -m ${.CURDIR}/share/mk _MAKE= PATH=${PATH} ${SUB_MAKE} -f Makefile.inc1 TARGET=${_TARGET} TARGET_ARCH=${_TARGET_ARCH} +# Must disable META_MODE when installing to avoid missing anything. The +# main problem is that buildworld will create cookies for install targets +# since they are being installed into WORLDTMP. This avoids unneeded and +# redundant restaging but is dangerous for user install targets. +.if make(distrib*) || make(*install*) +_MAKE+= MK_META_MODE=no +.endif + # Guess machine architecture from machine type, and vice versa. .if !defined(TARGET_ARCH) && defined(TARGET) _TARGET_ARCH= ${TARGET:S/pc98/i386/:S/arm64/aarch64/}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604181814.u3IIE5a2059347>