From nobody Fri Jul 15 22:18:04 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ll5Mw48x8z4Wn0M; Fri, 15 Jul 2022 22:18:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ll5Mw3ZkFz41ps; Fri, 15 Jul 2022 22:18:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657923484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yY0/SzKQXQntGBCnCWykS73Pie/T/gJTk4XcuLO6cbw=; b=TE5UNESogNIQ38JYZ9t1vastPT9JlmBjMEqANlfaYdfSWl8LNAabcG+XE8WjFO86Cwcidc mN+01J1i71UG51/J7Lq9aDHvcRIHC+eDxHnpWZFr985IP7gtJSVNyIJxP9CzI3yR56l2LC HEQtVkOS1CyQ3x14h7yUkSoRCkzXuCCNTq+GIhYFgoOhv0raAy4BN/pbrxvB+sWrIGNjW6 qJwkro6REeXoTCzwAMIERsm6al7vxHk4Aqn37zwlrOBF8TwTjD8E7bL0HM48EwmkPNIIkG HRg71Qz9omh5SiumbIsJ7JZNukkNMO0Xzzv5OqNw/egAWaTP6s2ywxt+ngIXJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ll5Mw2hgvzxx4; Fri, 15 Jul 2022 22:18:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26FMI4r0099904; Fri, 15 Jul 2022 22:18:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26FMI44C099903; Fri, 15 Jul 2022 22:18:04 GMT (envelope-from git) Date: Fri, 15 Jul 2022 22:18:04 GMT Message-Id: <202207152218.26FMI44C099903@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 5e0a749cf132 - main - Makefile.inc1: Set LC_COLLATE in distributeworld for glibc compatibility List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5e0a749cf132fba11825f827c63f8ba5e09e7a5b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657923484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yY0/SzKQXQntGBCnCWykS73Pie/T/gJTk4XcuLO6cbw=; b=IBfOMCYhaBHjKPUfxDI/xyB1Jqtv9idXkNWUuf1GsPV86NtiTX8USBmLcBfX16BGn8Yo6o PR0MYJl0tGF8sromAE427Veg7S5RiUCrp3+XxK04jWJsVIavhCjjiUwYMhGj0CMxbVKhLu ErQQkLf6UqTpggpFiiZG9EV03bSqAydcHWDUEzEs6NboJDO1pO58nTHvcWu4wh89P9K3ac SMXKg1apr/R3XZVm/shdVNU+tDJnjnAmckEk7MePNqArMXkB2SuPb12NDK/2PwQ8/3mXHR TT0JyQXjdHXDSIbMTGtSkk49n5MV1Unt4IbFEO+kCL1RDPR0FurKnWyUKKXeGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657923484; a=rsa-sha256; cv=none; b=n1Vg9aeNHd4HPhc9ogDXMdTqGESzSXHd63+jJaG42aORhE5n4/+M98F1qLnaRuJxQJ9HO7 JYzomKsyq19RZydKZFiJ/B9Mmp8bpR6HkqwRvbKj0bbOA7J72uau7S7+KRcZu3SCnpyuSD L9ei1LPLIPYLyLAfIboGrFbdsLIPRO6LiCESGgxK/mvUzVvSLeAaBhGJkwgSmD4ncV/vHz 0/mJ+P0jYzoBPD9+63i2NvQiER4uK1wKp4eii2V+BseE8O/qvW2xJRdV4xDcwRBJmneDR9 N1C+vAhjMVQ20C36ClID4I5s5MJD6ZSBEHZUkm2DCui2nO6kA8k+/2pfQUqwbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=5e0a749cf132fba11825f827c63f8ba5e09e7a5b commit 5e0a749cf132fba11825f827c63f8ba5e09e7a5b Author: Jessica Clarke AuthorDate: 2022-07-15 22:04:26 +0000 Commit: Jessica Clarke CommitDate: 2022-07-15 22:04:26 +0000 Makefile.inc1: Set LC_COLLATE in distributeworld for glibc compatibility distributeworld relies on "foo" sorting directly before "foo type=...", but with glibc both en_US and en_GB have "fooa" sort between "foo" and "foo z", resulting in some files (in particular, id due to "ident" sorting before "id type=" but after "id") not being included in the meta files and thus not included in the dist tarballs. Forcing use of the C locale ensures this does not occur. Reviewed by: brooks Obtained from: CheriBSD Differential Revision: https://reviews.freebsd.org/D35812 --- Makefile.inc1 | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 43cd3c3344c8..b9691017a1ab 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -975,6 +975,8 @@ DISTR_MTREE= ${DISTR_MTREECMD} ${DISTR_MTREEFLAGS} WORLDTMP_MTREE= ${DISTR_MTREECMD} ${WORLDTMP_MTREEFLAGS} DESTDIR_MTREE= ${DISTR_MTREECMD} ${DESTDIR_MTREEFLAGS} +METALOG_SORT_CMD= env -i LC_COLLATE=C sort + # kernel stage KMAKEENV= ${WMAKEENV:NSYSROOT=*} KMAKE= ${TIME_ENV} ${KMAKEENV} ${MAKE} ${.MAKEFLAGS} ${KERNEL_FLAGS} KERNEL=${INSTKERNNAME} @@ -1468,7 +1470,7 @@ distributeworld installworld stageworld: _installcheck_world .PHONY @# a line containing only the filename will sort immediately before @# the relevant mtree line. cd ${DESTDIR}/${DISTDIR}; \ - find ./${dist} | sort -u ${METALOG} - | \ + find ./${dist} | ${METALOG_SORT_CMD} -u ${METALOG} - | \ awk 'BEGIN { print "#${MTREE_MAGIC}" } !/ type=/ { file = $$1 } / type=/ { if ($$1 == file) { sub(/^\.\/${dist}\//, "./"); print } }' > \ ${DESTDIR}/${DISTDIR}/${dist}.meta .endfor @@ -1478,7 +1480,7 @@ distributeworld installworld stageworld: _installcheck_world .PHONY @# a line containing only the filename will sort immediately before @# the relevant mtree line. cd ${DESTDIR}/${DISTDIR}; \ - find ./${dist}/usr/lib/debug | sort -u ${METALOG} - | \ + find ./${dist}/usr/lib/debug | ${METALOG_SORT_CMD} -u ${METALOG} - | \ awk 'BEGIN { print "#${MTREE_MAGIC}" } !/ type=/ { file = $$1 } / type=/ { if ($$1 == file) { sub(/^\.\/${dist}\//, "./"); print } }' > \ ${DESTDIR}/${DISTDIR}/${dist}.debug.meta .endfor @@ -1999,7 +2001,7 @@ create-packages: .PHONY create-packages-world create-packages-kernel create-world-packages: _pkgbootstrap .PHONY @rm -f ${WSTAGEDIR}/*.plist 2>/dev/null || : @cd ${WSTAGEDIR} ; \ - env -i LC_COLLATE=C sort ${WSTAGEDIR}/${DISTDIR}/METALOG | \ + ${METALOG_SORT_CMD} ${WSTAGEDIR}/${DISTDIR}/METALOG | \ awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk @for plist in ${WSTAGEDIR}/*.plist; do \ plist=$${plist##*/} ; \ @@ -2045,7 +2047,7 @@ create-kernel-packages: .PHONY create-kernel-packages: create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},} create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},}: _pkgbootstrap .PHONY @cd ${KSTAGEDIR}/${DISTDIR} ; \ - env -i LC_COLLATE=C sort ${KSTAGEDIR}/kernel.meta | \ + ${METALOG_SORT_CMD} ${KSTAGEDIR}/kernel.meta | \ awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \ -v kernel=yes -v _kernconf=${INSTALLKERNEL} ; \ sed -e "s/%VERSION%/${PKG_VERSION}/" \ @@ -2081,7 +2083,7 @@ _debug=-dbg create-kernel-packages: create-kernel-packages-extra-flavor${flavor:C,^""$,${_default_flavor},}-${_kernel} create-kernel-packages-extra-flavor${flavor:C,^""$,${_default_flavor},}-${_kernel}: _pkgbootstrap .PHONY @cd ${KSTAGEDIR}/kernel.${_kernel} ; \ - env -i LC_COLLATE=C sort ${KSTAGEDIR}/kernel.${_kernel}.meta | \ + ${METALOG_SORT_CMD} ${KSTAGEDIR}/kernel.${_kernel}.meta | \ awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \ -v kernel=yes -v _kernconf=${_kernel} ; \ sed -e "s/%VERSION%/${PKG_VERSION}/" \