From nobody Thu Nov 14 22:39:50 2024 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 4XqFTL3J6nz5dFDK; Thu, 14 Nov 2024 22:39: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 4XqFTL2lrWz4NQH; Thu, 14 Nov 2024 22:39:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731623990; 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=4QuREYRGittyrudJwYDhbKWMl5CMTTQJA6f1/eAuVmQ=; b=skGZcIle2J4ynAFxT3R37kyb/vHPcCtjNx1FSX7+TmlRhPikjS7w+nXQRm4wjHITVcCQos S/PD/JFtmZ8ytMwRthHCKY0tbJNAigGJGOiwBhmIBLbdo+cc22066kmLOGpbQhlZ5zO65C bef0z/lHvUTjsUgBfIa82a9mSzNubnNCXj8WL/XpLonSG30n/5rAoZcaRCwngJmS84Q3nm Xo1jHEiruNNhvyjb2Qy4lKU0EIwv5owf64WpFDXkeDrsKEvWYC9ZBRCCSytwhU3n7GRhI8 RFmfio1OYsk92yDaswFKROs+WtVUpL3rttdB/4Rpa5DBF6ph212NU2FJcyyJLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731623990; 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=4QuREYRGittyrudJwYDhbKWMl5CMTTQJA6f1/eAuVmQ=; b=VrbQHOQD4bc+KKcx23a8dlrJ43XWDKznMd5TK0JSKFg9PhOBS2IpwzG2F2Tm9+TNOD/ifp BmwsQ6qAHXGh1tiLkwN1dY9nD1cTFysvsDI6xwa0FhkZftm6Nmzk53FsFOxsxPbZ1+O1w9 NB+w96mIIF3iJonTvPkP0kfhRyGkJ537pVhK9FaxFO3GoUtLbSXdbyTt5+aL0oQYa3totn qLSUIU8MOa394013l6rFAs+Xzg+VOAcaCnvKpyB9v1ZFRXPPDzYlFZ5v0YXRXT6+BMVhFv IuMAGGkMp1WBB4pdbJ0mOnafdby12Z+CgD4eJZHnTSXNdsMJWdnAHUAllQO0zA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731623990; a=rsa-sha256; cv=none; b=gs3DB5baJNctN4gr1EbGUjEpyBNqny/Npr13E/oS6G/At/dshOKlQOiAH1mv2hbS2uIzCc RYuXusayB9YaXqbgz1tg18QjbGZqE79bcx1FooTZNOBc6Z/HtlrHhJWMH1+A4LlsrlHFD5 zm+7svCzM/jg4PpvcKvc3GSfN1E4p18Ol5WuhOlZvNTOBxEx6HpUbtzY+KoaBLjliu1mA2 vgNQMJMrCVml2Mybprdjw016wnHszZVzpnLAK+NNuvj0OJSqrv2Dj/V12Zvv2+vGKrTRO7 ZvazmgJlzik9W7I50QZrYtOJL7Sak0Xyv0Efhw1I9qCG+IKLw3DxAXQXzchzXA== 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 4XqFTL2MDdzxhL; Thu, 14 Nov 2024 22:39: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 4AEMdogM062447; Thu, 14 Nov 2024 22:39:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AEMdo6Q062444; Thu, 14 Nov 2024 22:39:50 GMT (envelope-from git) Date: Thu, 14 Nov 2024 22:39:50 GMT Message-Id: <202411142239.4AEMdo6Q062444@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 47866cdcc727 - main - release: Exclude container images from globs 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 47866cdcc7278faa27250dcea16374231c676050 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=47866cdcc7278faa27250dcea16374231c676050 commit 47866cdcc7278faa27250dcea16374231c676050 Author: Colin Percival AuthorDate: 2024-11-14 22:30:44 +0000 Commit: Colin Percival CommitDate: 2024-11-14 22:30:44 +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 --- release/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/release/Makefile b/release/Makefile index bd130082a9ce..e6b68a61ce2a 100644 --- a/release/Makefile +++ b/release/Makefile @@ -171,12 +171,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 @@ -243,12 +243,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 @@ -297,7 +297,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