From nobody Mon Dec 16 23:45:52 2024 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 4YBxQm2fZdz5gjvl; Mon, 16 Dec 2024 23:45:52 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YBxQm28bpz4HXh; Mon, 16 Dec 2024 23:45:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734392752; 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=EezSBIZaMAvUxwmU4HLjKpchV7jhTCRzfVZvAVgQntc=; b=vcFGtH3Ks0NorXx2MIT+1cCbxiSf0nJ8wT6LNkF1NI1vKsoCpXct64GlAgtOy7XSosGldw FbV7mgXiHQFg04p8suqs1i38C1+OvaVDWv8//VE7/H4E57bOwNYhqsYzzILecUGC83WF2I SiYZajT6dDOFtCao6vxPF32YttxSKAQClWRNAqXO4EDAr28wHRTXcK+BvVrOH1lcUVsUk7 xiF/Z2G+OjUk0iX2N6R23RyZO82yRZe79stMzyALyeYFLFEozYTXXNE9+QlEIlRRcGbLlQ 02+Gj/Q6pfIIrTzkT6853FKYw7NzbZ/S69QTpRVnr/+BDMoQ3VqBAiBF4LCEsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734392752; 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=EezSBIZaMAvUxwmU4HLjKpchV7jhTCRzfVZvAVgQntc=; b=OEatAJmQV4RzTduyqWJVDh43gC+uJJw6kGf5Ho8oisV8mHN+Ktm3qxGtm2orYTcho99u8D 4nqgmgDD6WDcLTybLhjBcbqrDcW+AGjmeUqCYMc0jkrDWNcnny4Ty9cKz2DnzXKFjig1mQ maiVsGDQBP6+8qA6YpD/tdCJJpz0+WjY3QbUVHPy6TR02aRAHnHkOZOc+nQ0dXhzg9E9LL kIDbCD1TMNfcwsy1SfAoDcrAhYxabQvOKLaTJhZh5zPBNaE3BYKZ0ddLMfO+24DHioZnRD L7SjT3i41eNv/tbPJodcSdt3ngJeUYjbHLJolY9Kqyem2SObxmeCNnG6nOhg+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734392752; a=rsa-sha256; cv=none; b=O0AC5GV7e+0UHPi6uK59lluw25ovy3rZY6mQUYImuyHKRL736FeY7go+dIGjRb5VW705NO OrC8V27ASV5BivnhU8S/dWkSL8inwcwKTRF0TotyFkmaE5CjunR8K8N5MFApHOY13WKDU/ p3sW2dGuROJhAiDM6W5lVa/f2DnfX6JoT147CBfSSLw7dqjzFlirjkb5jxRopH8+zNuWPH H58AVrJva/6T+Txnkf2bftoBxVpyfbL0CYVrYbFzhNpccQhIZSWNOavQi/FCd6e1oqF1sx m/lumhonPd9XaM4EWQ1uqt5hMJ+ciS7SbwJMVi7GflP6KsGBej5BEQqvK7zuNw== 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 4YBxQm1dzWz1Dmx; Mon, 16 Dec 2024 23:45:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BGNjqHQ062588; Mon, 16 Dec 2024 23:45:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BGNjq08062585; Mon, 16 Dec 2024 23:45:52 GMT (envelope-from git) Date: Mon, 16 Dec 2024 23:45:52 GMT Message-Id: <202412162345.4BGNjq08062585@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 950401d21e33 - main - release: Sort etcupdate entries for base metalog 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 950401d21e33df7ac63ef1d2316a18f09ffbaabe Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=950401d21e33df7ac63ef1d2316a18f09ffbaabe commit 950401d21e33df7ac63ef1d2316a18f09ffbaabe Author: Pat Maddox AuthorDate: 2024-12-13 21:15:45 +0000 Commit: Ed Maste 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 --- 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} )