From nobody Tue Nov 05 21:39:46 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 4XjhZB5WXNz5bdTP; Tue, 05 Nov 2024 21:39:46 +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 4XjhZB4zqxz4dbW; Tue, 5 Nov 2024 21:39:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730842786; 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=uRXxdeo02SRl5Wl4uDB9jIlnZSNgXe7LBNNWaqfv/dw=; b=o1fMy7ttD7TYt18CTEMRMzlYezHaa0CZXj5PjxDc9WcMa95SWB5mqi/OyTEWjweFQXGBY2 7Fz7O5usTL3eimK/95JWKtZxAuIIVPTKcXfiLdq5wmjmIud68joUt13lYp8GkpyDp9Mc7x q/9gv/c3GoDabsm2arH5ocMQiGKPAPeBF5oOC38s/Zu41GVabND1PNiRH8M6RR2Bu35evx FcibRsXjrfXNQZS3+K19h0XBvSY1q8M+8hPFlMC0a0UwPeJ4SncJ8Vo/doBY53WIZVOmWj wh2ZGLaOo9J0zhaSYnt2NsOK7U9KAcbEQy2SELT5IvgZZsiL3pekbxYB0xETgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730842786; 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=uRXxdeo02SRl5Wl4uDB9jIlnZSNgXe7LBNNWaqfv/dw=; b=xDjTe1ld5Zi74KLCdUcqq9doma2sWFxYcMtQt+gDM1iFkAzMuCAETeOMLhHw9Ec2hhXq8F 0k9hvVXJni7xeZTzJ61Ls437SKGKoFayXOCkgiXrz/lV5ngf5NEIkBpPra7vD7SMPw73Qy BFYkxzdBeEWbJNmVUojbKY+JqRHDox5YTYIGhaR+UjcwxuAA+e30OHlI5WE2/enXqypkcG X0JaZH86jXZDm4itOmUnVvxHejP3QEEXpII3WTQ7Ig+SJKuGdngK6xljHQFNACq6amRNFX gsaf99ezdPx1YJqG6niAsqNlZHKL2BaJ1XQ/D6I9u5dW8hB3t6Ak87vXGlMEig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730842786; a=rsa-sha256; cv=none; b=Tw8h1LpFhcmh/D/aChVXKEq/e7fpeI3iM7xRRHecrfp0XQyjx9Uck3JlyVcbs/pK9pkIQL 9OLjlkNDHXDhrxl63SG2IjD6DO+B5cAuMezyPZ/QwXe8orfu5viebi4HTQctI56wJzaRHj Lq+JdgVUw7V2sSioAUAuWCMpmCUAU4gF9LzfUEwr52Rr9DNSkNh2tKxb26ttyW8HquEfFs oepdlpKNR7bsmtsuI/Agr+wl0+GrPj/IkMB3/9JRob6+9xE2t4CPHqhfA/jQPdYm94b4CA hdtac1OpgukmVNAPfZKc5XaZiT3GEsi2ZKLoug2Yl+9/siXQwOLL52EqH/bnpw== 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 4XjhZB4Zk6zZbR; Tue, 5 Nov 2024 21:39:46 +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 4A5Ldkdc078624; Tue, 5 Nov 2024 21:39:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A5Ldkj3078621; Tue, 5 Nov 2024 21:39:46 GMT (envelope-from git) Date: Tue, 5 Nov 2024 21:39:46 GMT Message-Id: <202411052139.4A5Ldkj3078621@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: cdfd0600dc88 - main - release: Include -dbg files in dvd image 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: cdfd0600dc8882f0a0d0e6d9a1cdcf926edba6d6 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=cdfd0600dc8882f0a0d0e6d9a1cdcf926edba6d6 commit cdfd0600dc8882f0a0d0e6d9a1cdcf926edba6d6 Author: Colin Percival AuthorDate: 2024-11-05 21:35:17 +0000 Commit: Colin Percival CommitDate: 2024-11-05 21:39:38 +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 --- release/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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=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