From nobody Wed Nov 06 22:46:38 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 4XkL0v0t3cz5bxTs; Wed, 06 Nov 2024 22:46:39 +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 4XkL0v0Lrqz4J3T; Wed, 6 Nov 2024 22:46:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730933199; 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=8BtkITJEYb7rgXSDsexpeHtK2e7/1+q/10leS9yNGC4=; b=yiaW/1wKYQGaRmvB9D3QMO8tzcdx6zuuhUbFzgjvpwxZpx5yAL4KN/P9QbotB2L6J/Gbjp dOU8Z8J8Z9VrgRWhsjDF3ht/Jjk8PjKIxZg/EPj4C4netE457zzKMoNMc/QAw1JILroj4a CB4KW17pavkEBwEk/rgntqpsgA/FJSBpKyz1N4ZJil2cSUITJP2kK9+a4C5duNkPI9EgkY m5xqazWqURd2o5tdNn/49jk/Eb5knwZS5tKI9bfvHGE/5n4DKyCcOvtU1+TVHElhU6AhpJ LKQxCzC2Gd8/AcuAsVIMlsaPzeMhWlwQQJwzL5sYuBn6Y4oEtt9DgH+H4UVCpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730933199; 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=8BtkITJEYb7rgXSDsexpeHtK2e7/1+q/10leS9yNGC4=; b=gjuzPEQjaA3mxcxXWtSaGXIviaerGPQT4kTDw2hspjn4OTGOe4RwRH0h3ibi4DyRBv0xpG zsjNxRdbTi5fmb1YxagS15xqhsD9Pw5IzocLsfWsVJMv7odv1hbQh29ptkTLNBbmBxcCqC CMfwIt/GUCFX+OFbrF7YoBTRcCKTzZ0ZgssokRVZN7KFFY4mXmpwH7PWTEDjS/32IycJs3 dMJfZTIq9emCmaeQ4YfsNuLH791cFMxoZgfbTa/rM4DRO3p9rmsK3iB+d3+e4nbAchrPTt /n6+AavxPc7jIM4KZVOj18sk7QO3nJy2I0Op4ocUrwO1ZcWzaHs89yToomVGwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730933199; a=rsa-sha256; cv=none; b=qtlABDPci+mCrALa98t23nSPx1HPZSR8l4FwnWDpgCx+zZhfetdaemUgI4NFm6gqoSQIzX hUzyedW4GHQPnmDW0U9Eh0kmv51qAaP5nUhm9/RAlE5LjtIOMQU+OIaC8+byNt7PkYzE0P iuRKP/wPPGdQ2aZ7uYWS1MTukdNL3RlCJRGc3SAeyzWgsW5l3/FFi7fo6zAHFtXiX4MwHt GJ+86JjagnFcCR5Fk/J/xJyvjC8fHXR4DvGkREbahcEaHpKGWgVhOHRq7g+ur+7DNyfEC1 gUBQNPoQ1aoWXT7V6yc1Ou8jjkHmF74WIgyzR0eiuz13a2RXYQNJXrZZHCo+7g== 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 4XkL0t73pPzKND; Wed, 6 Nov 2024 22:46:38 +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 4A6Mkcwi078555; Wed, 6 Nov 2024 22:46:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A6Mkc4H078552; Wed, 6 Nov 2024 22:46:38 GMT (envelope-from git) Date: Wed, 6 Nov 2024 22:46:38 GMT Message-Id: <202411062246.4A6Mkc4H078552@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: ba7844e4c915 - stable/14 - release: Include -dbg files in dvd image 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: ba7844e4c91505e397396ab981a0032699b0cd70 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=ba7844e4c91505e397396ab981a0032699b0cd70 commit ba7844e4c91505e397396ab981a0032699b0cd70 Author: Colin Percival AuthorDate: 2024-11-05 21:35:17 +0000 Commit: Colin Percival CommitDate: 2024-11-06 22:46:28 +0000 release: Include -dbg files in dvd image 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'). 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. Sponsored by: Amazon MFC after: 2 days (cherry picked from commit cdfd0600dc8882f0a0d0e6d9a1cdcf926edba6d6) --- release/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/Makefile b/release/Makefile index 9ca32e168fe7..3ae3a28a1104 100644 --- a/release/Makefile +++ b/release/Makefile @@ -245,12 +245,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=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); \ do echo "./usr/freebsd-dist/$${dist} type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG; \ done .endif