Date: Wed, 6 Nov 2024 21:59:50 +0000 From: Jessica Clarke <jrtc27@freebsd.org> To: Colin Percival <cperciva@FreeBSD.org> Cc: "src-committers@freebsd.org" <src-committers@FreeBSD.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@FreeBSD.org>, "dev-commits-src-main@freebsd.org" <dev-commits-src-main@FreeBSD.org> Subject: Re: git: cdfd0600dc88 - main - release: Include -dbg files in dvd image Message-ID: <AC04E86B-4A7D-4832-BBAE-CE91843B85D2@freebsd.org> In-Reply-To: <202411052139.4A5Ldkj3078621@gitrepo.freebsd.org> References: <202411052139.4A5Ldkj3078621@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 5 Nov 2024, at 21:39, Colin Percival <cperciva@FreeBSD.org> wrote: >=20 > The branch main has been updated by cperciva: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dcdfd0600dc8882f0a0d0e6d9a1cdcf92= 6edba6d6 >=20 > commit cdfd0600dc8882f0a0d0e6d9a1cdcf926edba6d6 > Author: Colin Percival <cperciva@FreeBSD.org> > AuthorDate: 2024-11-05 21:35:17 +0000 > Commit: Colin Percival <cperciva@FreeBSD.org> > CommitDate: 2024-11-05 21:39:38 +0000 >=20 > release: Include -dbg files in dvd image >=20 > In 2016, commit 8834318685bc reworked the code for excluding -dbg > files from install media, and in the process accidentally broke it > for dvd images ('grep -v' should have been 'grep -vE'). >=20 > FreeBSD Update builds later began to depend on this, and in any = case > since DVD images are intended as "include everything" images = there's > no point excluding those; so remove the (broken) filtering from DVD > image builds. Ah, my bad, I found this a couple of years ago downstream[1] but should have upstreamed the second half of that commit (which also went one further than this commit and removed the now-pointless $$(ls ...). Jess [1] = https://github.com/CTSRD-CHERI/cheribsd/commit/7cd4d52c6df917ec4dc8aa74ad2= 88de83441d8c8 > Sponsored by: Amazon > MFC after: 2 days > --- > release/Makefile | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) >=20 > diff --git a/release/Makefile b/release/Makefile > index 6f59647ff5db..9f19b150ae65 100644 > --- a/release/Makefile > +++ b/release/Makefile > @@ -241,12 +241,12 @@ dvd: packagesystem > -DDB_FROM_SRC ) > # Copy distfiles > mkdir -p ${.TARGET}/usr/freebsd-dist > - for dist in MANIFEST $$(ls *.txz | grep -v -- '(${base = ${_ALL_libcompats}:L:ts|})-dbg'); \ > + for dist in MANIFEST $$(ls *.txz); \ > do cp $${dist} ${.TARGET}/usr/freebsd-dist; \ > done > .if defined(NO_ROOT) > echo "./usr/freebsd-dist type=3Ddir uname=3Droot gname=3Dwheel = mode=3D0755" >> ${.TARGET}/METALOG > - for dist in MANIFEST $$(ls *.txz | grep -vE -- '(${base = ${_ALL_libcompats}:L:ts|})-dbg'); \ > + for dist in MANIFEST $$(ls *.txz); \ > do echo "./usr/freebsd-dist/$${dist} type=3Dfile uname=3Droot = gname=3Dwheel mode=3D0644" >> ${.TARGET}/METALOG; \ > done > .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?AC04E86B-4A7D-4832-BBAE-CE91843B85D2>