From nobody Sat Jan 24 02:08:00 2026 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 4dydVt03pMz6Q7sb for ; Sat, 24 Jan 2026 02:08:06 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dydVs6Zk4z3QWB for ; Sat, 24 Jan 2026 02:08:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769220485; 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=8YyQ4zlhzI+lwhhXlVzumro50vILkZfq6Thfi2OjIQo=; b=dVDd577yV0Z93g5NQSF/ombD85ctMhjjWftF47Kpa+b9nE+3RaK3m3aFrVOtCtacqIHA23 I0AFmtPjY3pGHy7MKnqLd3OI8P0evbrsLzXPXPEofsQDvYAgASx+44moq0J8lQa6+Jjc4S 1sW3adPRSuSSqM0XZlGUCsJBwobzcLQuPTdse1n/kp62zSi0TdxDhqRqvB5KoVDCJMt+lu nQ1+DxT8Ew9/SRhmUC+vSofj4a+qN75ykhFfiGB5X6Li9y7fCvY8/bGdZvAbSECDQXLs/S fBSFnq/9V+hPkyiKHnigZH2p6BD6uwvyH2UxJ7uVJvAFgYaQJQHD+3AExWE08g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769220485; 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=8YyQ4zlhzI+lwhhXlVzumro50vILkZfq6Thfi2OjIQo=; b=FixwzHqZ4LY6HvjCn4wsLBCJBxc8PuR1SFf0wgCEZwVv71UwPDIQrnC7k83H1eoEtpxn8S 34zmV7XO8CbDGh2grGrF1arP/Eui3/BS8mIxcxrNllKKJ3XRty0O/GmRrmo7BKckZwaWW/ 3wLXXodsdjVKIsymbfMGHrUrucfjU5flllqklDAGwbhLPJay9EHV3K+XflRhSfCNrbfBtk YAEJXNR0hCKgx93T8ytVxqzG5IkBta2VGNJa8AMYjdccYkt0d1kJPyAxDZOr043fJBydXk Tgq+2TdaH/suoHVrCTXQS0QWOxRTxayaP/MgNrMy19VaLbyBRL9vBgOPbKi/vQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769220485; a=rsa-sha256; cv=none; b=QpSfsu1UIvYPyQRzfA4YwxTlm+TowKRDkpn1IbThJK5SomHR0wictvAuv7Flh7LSBTqLW8 hvMXLLyFXK4nN93e3VrmqtsQ9fm8bWZOiW8Ovxl6w0Gmly30+QY4YFgSu734kjLgCxBC+n NutIaL3dvCJmLj5nuZQ4uSA/RrgxNTmb1ZTyc/zhWq/IWONBlpVSS+QolYZnmvvFm8cKXz pe3Ws3E/ZpTPwzTECnMxK1OVTpz6pkNm2VtuykuJrfWLj9634Ue6nPGD4qvZjj8tf4Wte7 eg0N+Z6h0ICT7KExI7TrDU5R8wKFwzqL3auRyC6uI1BM1f7ySEGC7vqs8b6CFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dydVs6B3wzlHw for ; Sat, 24 Jan 2026 02:08:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2460a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 24 Jan 2026 02:08:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: cd730bef74f9 - main - nanobsd: Use mtree -C to produce the 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: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd730bef74f9ecc2500fd5c01094dd5bfd34c246 Auto-Submitted: auto-generated Date: Sat, 24 Jan 2026 02:08:00 +0000 Message-Id: <69742980.2460a.271ca31c@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=cd730bef74f9ecc2500fd5c01094dd5bfd34c246 commit cd730bef74f9ecc2500fd5c01094dd5bfd34c246 Author: Jose Luis Duran AuthorDate: 2026-01-24 02:06:57 +0000 Commit: Jose Luis Duran CommitDate: 2026-01-24 02:06:57 +0000 nanobsd: Use mtree -C to produce the metalog Prefer an mtree -C output, which is guaranteed to be mtree-compatible. Add "gname", "uname", and "tags" to the default keyword set, while removing "size" and "time", the latter being set on kernel file entries and taking precedence over makefs -T (when paired with -F). As a side effect, this produces a cleaner file with sorted keywords. Note that passing "-u" to sort in order to pipe to mtree is no longer necessary, but we'll do it out of habit. Reviewed by: imp MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54854 --- tools/tools/nanobsd/defaults.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/tools/nanobsd/defaults.sh b/tools/tools/nanobsd/defaults.sh index a0a186cee42f..31f3df9a3086 100755 --- a/tools/tools/nanobsd/defaults.sh +++ b/tools/tools/nanobsd/defaults.sh @@ -554,8 +554,8 @@ run_late_customize() { # fixup_before_diskimage() { # Run the deduplication script that takes the metalog journal and - # combines multiple entries for the same file (see source for - # details). We take the extra step of removing the size keywords. This + # combines multiple entries for the same file (see source for details). + # We take the extra step of removing the size and time keywords. This # script, and many of the user scripts, copies, appends and otherwise # modifies files in the build, changing their sizes. These actions are # impossible to trap, so go ahead remove the size= keyword. For this @@ -566,7 +566,7 @@ fixup_before_diskimage() { cp ${NANO_METALOG} ${NANO_METALOG}.pre echo "/set uname=${NANO_DEF_UNAME} gname=${NANO_DEF_GNAME}" > ${NANO_METALOG} cat ${NANO_METALOG}.pre | ${NANO_TOOLS}/mtree-dedup.awk | \ - sed -e 's/ size=[0-9][0-9]*//' | sort >> ${NANO_METALOG} + sort -u | mtree -C -K uname,gname,tags -R size,time >> ${NANO_METALOG} fi }