From nobody Fri Nov 15 23:30:49 2024 X-Original-To: dev-commits-src-branches@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 4XqtYk39Zsz5dhdD; Fri, 15 Nov 2024 23:30:50 +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 4XqtYk0nWFz3xbh; Fri, 15 Nov 2024 23:30:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731713450; 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=b9TjDDddN57nCGB1j/WT4ZCmXOpZ0nrXXE/G8cp54rw=; b=kG+G5zLshUZtYHTGxIzrJ5eCTsDiHmHDcTUR9U3oVsD3dtIzn/i+y+H+yZKnG8f2XDe6kD CiRZu10k0GoQwqRt7ZAO19tpHlkwFWnVuy0QAkCnUR/OBYIocP9Z1HUKw+lc95KtdY52FV xNhqE3/BSoAPG/LF4giZv2tppk/lAiYEmhGVollgPKs+rbi9teUcg2dCYEXNU+ITnpYrpF xAj+PYtX1pJEzJdAafGtxeL7ASz7kFoi/NzBATgFEqz0Byi1E02x9ov8b6YdzsXFmkZV0w jGNAt7WX9d9mGlBYLGtX2yFoMbIzN6lOaWTtOZdwlfI0+N0wxq0uSS/e8VIuow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731713450; 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=b9TjDDddN57nCGB1j/WT4ZCmXOpZ0nrXXE/G8cp54rw=; b=lcsXf2EfVADslt2K6vqgccvVuNJ4C6Kpn9EXY3BVdko9jLOQIbcVLdtqlcJXWDkuJHhTWb fp3o6vZp5lokLRl5/gpsAQxUzfc2Jbwe8swI6H19v1vlavUM6OlWaEy1ZbEhGQEAYAZfUT CtiM+S/Jz36pyI74QlmcSAR3HdqsbOVuskHQnU+QkwsBICV1TrWbPMx1GXaR3G+xoC34VT tGi9RNzGF/XWJiHr+dh62ubkvo6/lLg5Kk92zGqCFoM8hWln2ZLKvKrTDT1LnYiqBsu5bM ZvzCJ0fZT7fVRP2qm8SnCq1UmhBdCY68xuWw7G3xqvEjXBSzZnwZ+frdBKQ7cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731713450; a=rsa-sha256; cv=none; b=eRqzS3z9gpdlXMEVkZvRClQY8H2GrZwqhJ1oS9GPTHwT3LhHKJr2gjrg3zHNG2zE6QMnRX WFVewgKe9Yr0zq8KOhaSSE+Dc69dH+3R6ez1vcIqJHPqHRgqjF1rp5y8xtrQJi0Ybknmw3 w7aAhg2kkFXI17araE9zmC254DJjQHUH2sDA5DawdN5JZWXJu6jK8cEGLOFAIRAszjTlAc frwMWm7fmxiwlf2tHjzu9NvZhsGWo/l4BAIXUpAJBvDJykQTBJ2OJL0V7r7AFmx49+5HIk cnKcD4NnqCj/p822jt1YkiKWkgjzleJTtA84JY1zWI+ZSHDCraTXl1eFffhNcw== 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 4XqtYk0P3VzkGQ; Fri, 15 Nov 2024 23:30:50 +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 4AFNUnpJ042045; Fri, 15 Nov 2024 23:30:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AFNUnC8042042; Fri, 15 Nov 2024 23:30:49 GMT (envelope-from git) Date: Fri, 15 Nov 2024 23:30:49 GMT Message-Id: <202411152330.4AFNUnC8042042@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 0aeaf495babf - releng/14.2 - release: Exclude container images from globs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.2 X-Git-Reftype: branch X-Git-Commit: 0aeaf495babf9506b3b6ce5e46b13b9c604094b4 Auto-Submitted: auto-generated The branch releng/14.2 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=0aeaf495babf9506b3b6ce5e46b13b9c604094b4 commit 0aeaf495babf9506b3b6ce5e46b13b9c604094b4 Author: Colin Percival AuthorDate: 2024-11-14 22:30:44 +0000 Commit: Colin Percival CommitDate: 2024-11-15 23:23:06 +0000 release: Exclude container images from globs We use a *.txz glob to get all of the "distributions" which comprise the FreeBSD release, but we now (optionally) also build container images which are .txz files. Grep those out from the distribution lists. A better long-term fix would probably be to generate an explicit list of the .txz files we want rather than using an overbroad glob and filtering out the files we *don't* want. Approved by: re (cperciva) Fixes: d03c82c28da8 ("release: add optional OCI images") MFC after: 1 minute Sponsored by: Amazon (cherry picked from commit 47866cdcc7278faa27250dcea16374231c676050) (cherry picked from commit 012bb7fdafb30032f7a09212ffd6398eb4230b07) --- release/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/release/Makefile b/release/Makefile index 4f95d3ba32ec..36c47e5ad454 100644 --- a/release/Makefile +++ b/release/Makefile @@ -177,12 +177,12 @@ disc1: packagesystem -DDB_FROM_SRC ) # Copy distfiles mkdir -p ${.TARGET}/usr/freebsd-dist - for dist in MANIFEST $$(ls *.txz | grep -vE -- '(${base ${_ALL_libcompats}:L:ts|})-dbg'); \ + 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 .if defined(NO_ROOT) echo "./usr/freebsd-dist type=dir uname=root gname=wheel mode=0755" >> ${.TARGET}/METALOG - for dist in MANIFEST $$(ls *.txz | grep -vE -- '(${base ${_ALL_libcompats}:L:ts|})-dbg'); \ + 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; \ done .endif @@ -247,12 +247,12 @@ dvd: packagesystem -DDB_FROM_SRC ) # Copy distfiles mkdir -p ${.TARGET}/usr/freebsd-dist - for dist in MANIFEST *.txz; \ + for dist in MANIFEST $$(ls *.txz | grep -v container); \ do cp $${dist} ${.TARGET}/usr/freebsd-dist; \ done .if defined(NO_ROOT) echo "./usr/freebsd-dist type=dir uname=root gname=wheel mode=0755" >> ${.TARGET}/METALOG - for dist in MANIFEST *.txz; \ + 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; \ done .endif @@ -300,7 +300,7 @@ mini-memstick.img: bootonly-memstick cd bootonly-memstick && sh ${.CURDIR}/${TARGET}/make-memstick.sh .${NO_ROOT:D/METALOG} ../${.TARGET} packagesystem: ${DISTRIBUTIONS} - sh ${.CURDIR}/scripts/make-manifest.sh *.txz > MANIFEST + sh ${.CURDIR}/scripts/make-manifest.sh $$(ls *.txz | grep -v container) > MANIFEST touch ${.TARGET} pkg-stage: dvd