From nobody Tue Jun 17 17:23:16 2025 X-Original-To: dev-commits-src-main@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 4bMDGs1QWkz5VdpB; Tue, 17 Jun 2025 17:23:17 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bMDGs0rN5z3JJL; Tue, 17 Jun 2025 17:23:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750180997; 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=Pb0dtvf/zonQOCcoiD7TcxsoRGE0PyeRpBGX+2thUbQ=; b=nIsRGd9lyCnD90eN0YGl+z7d9cSC1dLE/7fu1nZeu9QUzQmDVZCMn++xdpJZGTj5cA50ZS /BrDnk3WguZ6ceet7RY2jsvFIEnWbpJPEflnAi4tLtNHRuCsE05edyoUToJaGcGmEAKL3I CJ6tA4zws5W5LHqjp85SyRD2o1+zMUjc+/SiBKcfvHL8U8xjnxJfJwKoKcp199BUw9UW6U omtOBA7Pvl1cQQB6Key2PelK/77U08Q8r1/MnSQuDTOxPxu/dqU7vXgzCBVoPbOaOaEIDg drJ6P9Yea2ABMk5S4xGwMi63bHi3NtUsOLa7MEcZPxrnp08arJQEeMkzj2tyvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750180997; 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=Pb0dtvf/zonQOCcoiD7TcxsoRGE0PyeRpBGX+2thUbQ=; b=nDIOXx24706KJ3uKbgGsxlOF5UFV+/JdgGH0o1QDgjQohpqWgGii1cu9Nce60tmu5Nu6L1 UotpR7mdLBokm56LQqXybFk58J3o5RsbBRMFilWxc6YEuTDweaYgzTb1zMdlttp6FfizxH y22hd6LGwFlMakBeXwzPlnq2SqyYobcrlQhEeZ4DVdue5NkdE6raZOAJpc8koww8HoBXvM 2zgmBGfYp6L79nbu6yB4veZ+vG5Wp48YibVjRGnatNlf6v+AE0W9MNGfKKVcN9XA+NaWBU jJP15FEENMSFykYv8Y+GSNHqYcYB4+Ho9TRX7fbuBDLSrKL0OZBYFU2Ak3q9dw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750180997; a=rsa-sha256; cv=none; b=o9wFprBZ5NdbhV/+K6n2qVVYE2KIXricQNBGZKth80HlXjx7oQpqbS2aPwAhR/mBcz18Ht F1WzQkL+l8LclCeJS5/oqvuTbN0FVT+6ckm9y3UzWHz7nemrs3jdwiwhvrM/Lz+Bvvjovz yoXIYM2/s/7agPYY7Yj19UwabbrXJBKZxierx2ILYmKoFyIboBT7phFVB1Ax5ZKbIr+yAe 9uFmhY9KoxLxmA7gu3WfB7PL3LjAIyv0nx4lPybW6Hhab7T2w/AATumiwNdGVIRXL/OMp5 kBmOBDTQ08KHkSy/MXsGX/UH7C59qJZSHxFiMeXwH632+D3AldouSz00cn9gew== 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 4bMDGs0RJxztGV; Tue, 17 Jun 2025 17:23:17 +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 55HHNGGB008488; Tue, 17 Jun 2025 17:23:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55HHNGIP008485; Tue, 17 Jun 2025 17:23:16 GMT (envelope-from git) Date: Tue, 17 Jun 2025 17:23:16 GMT Message-Id: <202506171723.55HHNGIP008485@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: b8ae4def0fc0 - main - release: Refactor dist set logic List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: b8ae4def0fc088fa411e53083f10d69f2d368bac Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b8ae4def0fc088fa411e53083f10d69f2d368bac commit b8ae4def0fc088fa411e53083f10d69f2d368bac Author: Ed Maste AuthorDate: 2025-05-20 20:49:02 +0000 Commit: Ed Maste CommitDate: 2025-06-17 17:15:52 +0000 release: Refactor dist set logic Add to the METALOG immediately following the operation itself to make the logic easier to follow. Fuse adjacent identical loops. Both of these are now possible as we no longer have separate paths for NO_ROOT builds. Move MANIFEST out of the loops for disc1 and dvd1 and copy it explicitly, so that all three MANIFEST operations are identical, and shared by pkgbase and legacy code paths for disc1 and dvd1. Reviewed by: jrm Event: Kitchener-Waterloo Hackathon 202506 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50383 --- release/Makefile | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/release/Makefile b/release/Makefile index a7549284ac35..4de2fe5264a6 100644 --- a/release/Makefile +++ b/release/Makefile @@ -210,20 +210,17 @@ disc1: packagesystem ${PKGBASE_REPO} mtree -c -p ${.TARGET}/usr/freebsd-packages | \ mtree -C -k type,mode,link,size | \ sed 's|^\.|./usr/freebsd-packages|g' >> ${.TARGET}/METALOG -# Copy manifest only (no distfiles) to get checksums +.endif + # Copy MANIFEST to provide legacy dist checksums in both modes mkdir -p ${.TARGET}/usr/freebsd-dist - cp MANIFEST ${.TARGET}/usr/freebsd-dist echo "./usr/freebsd-dist type=dir uname=root gname=wheel mode=0755" >> ${.TARGET}/METALOG + cp MANIFEST ${.TARGET}/usr/freebsd-dist echo "./usr/freebsd-dist/MANIFEST type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG -.else +.if !defined(PKGBASE) # Copy distfiles - mkdir -p ${.TARGET}/usr/freebsd-dist - for dist in MANIFEST $$(ls *.txz | grep -v container | grep -vE -- '(${base ${_ALL_libcompats}:L:ts|})-dbg'); \ - do cp $${dist} ${.TARGET}/usr/freebsd-dist; \ - done - echo "./usr/freebsd-dist type=dir uname=root gname=wheel mode=0755" >> ${.TARGET}/METALOG - for dist in MANIFEST $$(ls *.txz | grep -v container | grep -vE -- '(${base ${_ALL_libcompats}:L:ts|})-dbg'); \ - do echo "./usr/freebsd-dist/$${dist} type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG; \ + for dist in $$(ls *.txz | grep -v container | grep -vE -- '(${base ${_ALL_libcompats}:L:ts|})-dbg'); do \ + cp $${dist} ${.TARGET}/usr/freebsd-dist; \ + echo "./usr/freebsd-dist/$${dist} type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG; \ done .endif .if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG)) @@ -302,20 +299,18 @@ dvd: packagesystem ${PKGBASE_REPO} mtree -c -p ${.TARGET}/usr/freebsd-packages | \ mtree -C -k type,mode,link,size | \ sed 's|^\.|./usr/freebsd-packages|g' >> ${.TARGET}/METALOG -# Copy manifest only (no distfiles) to get checksums +.endif + # Copy MANIFEST to provide legacy dist checksums in both modes mkdir -p ${.TARGET}/usr/freebsd-dist - cp MANIFEST ${.TARGET}/usr/freebsd-dist echo "./usr/freebsd-dist type=dir uname=root gname=wheel mode=0755" >> ${.TARGET}/METALOG + cp MANIFEST ${.TARGET}/usr/freebsd-dist echo "./usr/freebsd-dist/MANIFEST type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG -.else +.if !defined(PKGBASE) # Copy distfiles mkdir -p ${.TARGET}/usr/freebsd-dist - for dist in MANIFEST $$(ls *.txz | grep -v container); \ - do cp $${dist} ${.TARGET}/usr/freebsd-dist; \ - done - echo "./usr/freebsd-dist type=dir uname=root gname=wheel mode=0755" >> ${.TARGET}/METALOG - for dist in MANIFEST $$(ls *.txz | grep -v container); \ - do echo "./usr/freebsd-dist/$${dist} type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG; \ + for dist in $$(ls *.txz | grep -v container); do \ + cp $${dist} ${.TARGET}/usr/freebsd-dist; \ + echo "./usr/freebsd-dist/$${dist} type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG; \ done .endif .if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG))