From 469727c966bbd91447c8402470452b95810f3ffe Mon Sep 17 00:00:00 2001 From: Jessica Clarke Date: Thu, 8 Jun 2023 17:47:04 +0100 Subject: Makefile.inc1: Use INSTALL_DDIR for distributeworld's distrib-dirs INSTALL_DDIR is the canonicalised version of DESTDIR/DISTDIR. Whilst most of what distrib-dirs does doesn't need the canonicalised form, it is responsible for installing the POSIX and en_US.US_ASCII NLS symlinks to C, and therefore needs the canonicalised version for those two uses of install for NO_ROOT builds, since our install does a naive text-based prefix strip when creating the METALOG entry rather than a smarter path semantics-aware one (which itself is really a bug, and has bitten us many times). As a result, using plain DESTDIR/DISTDIR instead can result in the METALOG having ./path/to/destdir/base/usr/share/nls/$LOCALE rather than ./base/usr/share/nls/$LOCALE and then being filtered out when creating base.meta (or, if you're unlucky and the absolute path begins with base or tests, weird things will probably happen). Given this footgun an audit of DESTDIR uses is probably in order, especially those using DESTDIR/DISTDIR, but this is sufficient for now. --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile.inc1') diff --git a/Makefile.inc1 b/Makefile.inc1 index 86e8da9467da..88ae6dadd8a1 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1456,7 +1456,7 @@ distributeworld installworld stageworld: _installcheck_world .PHONY -mkdir ${DESTDIR}/${DISTDIR}/base ${_+_}cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH:Q} ${MAKE} \ METALOG=${METALOG} ${IMAKE_INSTALL} ${IMAKE_MTREE} \ - DISTBASE=/base DESTDIR=${DESTDIR}/${DISTDIR}/base \ + DISTBASE=/base DESTDIR=${INSTALL_DDIR}/base \ LOCAL_MTREE=${LOCAL_MTREE:Q} distrib-dirs ${INSTALL_SYMLINK} ${INSTALLFLAGS} usr/src/sys ${INSTALL_DDIR}/base/sys .endif # make(distributeworld) -- cgit v1.2.3