Date: Mon, 16 Dec 2024 23:45:52 GMT From: Ed Maste <emaste@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 950401d21e33 - main - release: Sort etcupdate entries for base metalog Message-ID: <202412162345.4BGNjq08062585@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=950401d21e33df7ac63ef1d2316a18f09ffbaabe commit 950401d21e33df7ac63ef1d2316a18f09ffbaabe Author: Pat Maddox <pat@patmaddox.com> AuthorDate: 2024-12-13 21:15:45 +0000 Commit: Ed Maste <emaste@FreeBSD.org> CommitDate: 2024-12-16 22:58:42 +0000 release: Sort etcupdate entries for base metalog Supports reproducible builds. PR: 283214 Reviewed-by: emaste Signed-off-by: Pat Maddox <pat@patmaddox.com> --- release/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/release/Makefile b/release/Makefile index 6b05b986318d..a874aece8cdf 100644 --- a/release/Makefile +++ b/release/Makefile @@ -139,8 +139,9 @@ base.txz: -s ${WORLDDIR} -d "${.OBJDIR}/${DISTDIR}/base/var/db/etcupdate" \ -L /dev/null -N echo "./var/db/etcupdate type=dir uname=root gname=wheel mode=0755" >> ${.OBJDIR}/${DISTDIR}/base.meta - sed -n 's,^\.,./var/db/etcupdate/current,p' ${.OBJDIR}/${DISTDIR}/base/var/db/etcupdate/current/METALOG \ - >> ${.OBJDIR}/${DISTDIR}/base.meta + sed -n 's,^\.,./var/db/etcupdate/current,p' \ + ${.OBJDIR}/${DISTDIR}/base/var/db/etcupdate/current/METALOG | \ + env -i LC_COLLATE=C sort >> ${.OBJDIR}/${DISTDIR}/base.meta rm ${.OBJDIR}/${DISTDIR}/base/var/db/etcupdate/current/METALOG # Package all components ( cd ${WORLDDIR} && ${IMAKE} -DNO_ROOT packageworld DISTDIR=${.OBJDIR}/${DISTDIR} )
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202412162345.4BGNjq08062585>