From nobody Thu Nov 07 02:54:21 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 4XkRVk1HT8z5cDRc; Thu, 07 Nov 2024 02:54:22 +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 4XkRVk0SqSz4nnb; Thu, 7 Nov 2024 02:54:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730948062; 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=MPZn8jPwMGS3jRsvsEFAnkW1s/xwAFe69RsU3hmYPfw=; b=iVllwIpLJuZeVOJUKI18wQITkJwF/wy7osZ0BM085ncv3TpOq7yGUaE9EKQOOKfmI6ozv5 8kCb1FT05BUcqXc45vmfowVsgRihSx6EJzupDXuedxi2nDxyxsT9gaZEaUemzrvs1N9b7w 0BbPm4yQ5faP6EGawTYwMuaU5RKWlAkqzqjvTfPRS25H/RilAugBpvE65X/XSSM5TSfrPd ybz+wDbvYcygL935GvYvVy90VhlyPNGSO+4YugWA7N9I2tTWRFzUIuWHByFonnvDXidoOi D/UazTlyl2xU+vGca8nlsiUMbjVyEP33jitcmYBWJ1RFPdWJkwqx1DBsmPPLTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730948062; 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=MPZn8jPwMGS3jRsvsEFAnkW1s/xwAFe69RsU3hmYPfw=; b=YzGpu7DV3cycgjpcYNGvFXQ0+BMjPCB6aAEPO3HQdMFZNhS7pe5cTIFkvVK7q9C8PCOsMo ytCy0U0YYKR/PWw1N76ruaxdDOuxYweMl3jt5td1rNM87wUkPVx2Dc0hZ1xlbfjt7UvJWb Ra2jfUlT+5CA7oTHlhPC4vkPcawLmotZxlp2jEnwOMiEAaL4wbVYXEZD0MiCTXbrcfkJjc Ee+SsbrwhpQvEnMFWuQ5gJJPKRMSMWuWD4gsoTa4eq5e8dzOErS+okgZ8zhjZ//HanGSe7 ABVkdgsl7pYogAoOq8VUk9pPrENOMqD3G2e0T61lp88npys3eFk8v1C3KMx1vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730948062; a=rsa-sha256; cv=none; b=bVwoiVcrLqni5MSXDBETv8Z8CAZ0vIg/Jo9KHUcREnz3cRLIDyqSW6nLwgsumjAmYjS6NO 3frteqKP0xrJFKL5Y2BKdhwSYFGtb3OYK5/EOg0pGBeKQEQkWac0vXk5M06fv/o1NJF6Lv /2btCldO1I1Glm4hsW0YzsdUYTkk0kEtieYLYqcIZoOwia+LjfW4+VTeAL5ILh0PMSQbg+ 4Y7nKaEyysnyrczf+jLqmiVH62mlvyPa0y3IrG8WW3ZMav4iNqEmkE+Xb4/Hj74nTEQ8eS 22IeUY77b7kSFPNgNVum3wgMET4vID5r3aWoAK4WFBmDzO9MG2GmhRZKLi4Jjw== 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 4XkRVj70gDzRdS; Thu, 7 Nov 2024 02:54:21 +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 4A72sLvO041045; Thu, 7 Nov 2024 02:54:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A72sLsS041042; Thu, 7 Nov 2024 02:54:21 GMT (envelope-from git) Date: Thu, 7 Nov 2024 02:54:21 GMT Message-Id: <202411070254.4A72sLsS041042@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: c5fc8587ab14 - releng/14.2 - 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/releng/14.2 X-Git-Reftype: branch X-Git-Commit: c5fc8587ab142dcb90324b83d25eaab68b410c58 Auto-Submitted: auto-generated The branch releng/14.2 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c5fc8587ab142dcb90324b83d25eaab68b410c58 commit c5fc8587ab142dcb90324b83d25eaab68b410c58 Author: Colin Percival AuthorDate: 2024-11-05 21:35:17 +0000 Commit: Colin Percival CommitDate: 2024-11-07 02:53:58 +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. Approved by: re (implicit, release build fixes) Sponsored by: Amazon MFC after: 2 days (cherry picked from commit cdfd0600dc8882f0a0d0e6d9a1cdcf926edba6d6) (cherry picked from commit ba7844e4c91505e397396ab981a0032699b0cd70) --- 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