From nobody Thu Nov 14 22:40:16 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 4XqFTs0Q4Tz5dFbq; Thu, 14 Nov 2024 22:40: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XqFTr4nKtz4NjN; Thu, 14 Nov 2024 22:40:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731624016; 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=w39HKgynLjPyRj/eKf6uDs7qprwl8QWcTOuEhVPjwJ4=; b=GQzR7YKGaz66MYfaywQhrMx1Y+GSpPivSp/+jaGT/KNmQBg0qtqExeJ4+/UvVr9phQodcu HWMTGXu8IMtyFFdJIYZXwa44KNZWUrgTTpBSH9Jwx6eJcZobEBMMHsGCU6ii1mSxZVLajC XfLlnZDgvJwMS9PCLVM4OUKRtcPNT8c8OGgHj/Eo9JnorWxDd1gzb2rxwuUDdq+7YWWeIX gVK0DhCNg4bd7GtjNSCKeT+AlKtHB2KihjXZzWwMeDpUkLOrdUAhgP6GJ3On94/s2Qx7g2 LKLzpbStaTK2H+2WI/68VUeh4RjoY78DNGKBZOKp4kux6bvjrRZkQpgXSeKhkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731624016; 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=w39HKgynLjPyRj/eKf6uDs7qprwl8QWcTOuEhVPjwJ4=; b=X/whp+3QOhNeKPVOm5aNW8CBiFvFs0NR9GCcXtx3J9Vfi1Dwd82S4WQihZiB9tiPWhhQVs RFskYyB+KzMGWfj2C/dhz4NstjB6FhQ1dhE/p7y69/nqfmoEOCjX4bM7z1MeTxgzEyq0Vk pTAsNLLetVBZZ0jDPF8tCseR/iyazDsM2tpDlqQA68jq/L7zOdxwGpbnsgdNAHoLTJZclP 6IQNlG1QjbwXC6lyp3wNzcEnfZUk5rhwOnrg/lZQV5PrPXRjGbP7i09kC9by3mFVr2/b8w FoyKnVp9MacyktTPoFnevFfKcs5aTGl2ZAkexaN6dm1TN+MPEdt2TOgU0VPplg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731624016; a=rsa-sha256; cv=none; b=OjYwUC8m2P1mbQrR+VYzQmIyBaWjSk/wtodHlB5OXH3AZQr59vo/EinO87I6jYDQ9L7vQd x0H+OMntPsGbkBAIgARF3kUYRu1dcXb1RKoTMVcAH++NYerX7WcmSDatIUEIyzbEEiBm9t lbTi/8uwbbyFiPHV9p9DSy/CfDiBQBeSxr//QLU3OASycQzl4BRHWpwhqLEJHV7vIs5mrA jwbah/ysyZ9l78NUy+TXGZtZleoxyIeBZbAeTpl1LiEmqxUeICc1moWClqcq5AKdFljcrW gp+5QNX6szlwmJahU+nPHGGaN+a2loDzoqUDGQx00OQsZQPWOW9ora6oerhXBA== 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 4XqFTr4NbFzxS1; Thu, 14 Nov 2024 22:40:16 +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 4AEMeGBu070682; Thu, 14 Nov 2024 22:40:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AEMeGDc070673; Thu, 14 Nov 2024 22:40:16 GMT (envelope-from git) Date: Thu, 14 Nov 2024 22:40:16 GMT Message-Id: <202411142240.4AEMeGDc070673@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: 012bb7fdafb3 - stable/14 - release: Exclude container images from globs 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 012bb7fdafb30032f7a09212ffd6398eb4230b07 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=012bb7fdafb30032f7a09212ffd6398eb4230b07 commit 012bb7fdafb30032f7a09212ffd6398eb4230b07 Author: Colin Percival AuthorDate: 2024-11-14 22:30:44 +0000 Commit: Colin Percival CommitDate: 2024-11-14 22:40:07 +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. Fixes: d03c82c28da8 ("release: add optional OCI images") MFC after: 1 minute Sponsored by: Amazon (cherry picked from commit 47866cdcc7278faa27250dcea16374231c676050) --- 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