From nobody Thu Sep 18 04:41:55 2025 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 4cS2zS3gnRz67hMC; Thu, 18 Sep 2025 04:41:56 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cS2zR5zhpz3H7d; Thu, 18 Sep 2025 04:41:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758170515; 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=8YrNtrpbw1qcdVSacANmav0ZoEPIQceYTOpsf7QW++c=; b=HlFBJ3obiaNAlQrFd6O2AQ6+YWIBB22nJo4mLZWFY8acNMBMlT/xJrKHCzIGaQJi8nNGeS w/ED3NXJNmDOtVpYxV00eurO0PSD3ze0pFWZ7gXGoCUBDIzQO/QFJQhf9TnzAmVA8JTi9X 22pfwMD4qw7+FnBG7HGbu3TmCgXatKyj9/x5lntCQjvlhgg2rxAUKwygU16U7XZ6wuqNrl PuW0zVN3sHM4FfzwapYdmO9JVh3T15e91TxPcFGeoKPFYXOSyVpwS/6PGc4seVoiw3AOFz /NVQzkoMiHHYxnaC/6/reMOUXAFGO3c9FzT4+dDd3MmQN56qLdbaEqyrxFxilw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758170515; 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=8YrNtrpbw1qcdVSacANmav0ZoEPIQceYTOpsf7QW++c=; b=Xg2J7HuOrZ2Tio66k2zqLvrr9vxiuisQmamUau2B3ppLUoaIoel2CtU0ifEeuEPr7z28Zg wV2Eapw3HJoEsEDnJmA5x60Tg+kmvK5UbKxbNmKum33A1N+A4mWeEIA4yOXsMwK9tZvvEy NHyga2nyQ1Y00CD1HW09CZlJaMzMr9AvE1oC6dbDj2ODpNR0xCN0D68fojzt08Tjsq3JP1 JHWvQ8Jf4A7S/oxagxMAFeFEcJUNMk89tGoFe9suC1vGcJQGguAcosZ+sCvN5I8DLpbofJ M0qIB7nLgpEvIeEKmnUWFFEVNCW7jkHIDVaE3x3hp7Cz2PygXNhCypTB/OhQyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758170515; a=rsa-sha256; cv=none; b=otwYa5waOcrdqPAvszMG9v/+HdIWSb0Bh6l7R0lhB8hc33GeCiyZCKZ7MnFEeawZamcYhb p/xLgmxZMBLfLVw19hxXzyFZUgzUXnzEEzePJ90LrlubQ0BD0UefrK/Dlo7n/nM3otANhP YxH2kW1N0B2nNjlkesgIQCPJIiApoUAxlXBhIFv0OGmG15R+xD6nA7pJS7fj+ghtsUhq0V /qhA75UGN9v22wzZQAKwQUqxo8bbqrFR2BpFCngOut2sgc9HaiL6FMQt+HZnqBaq3z2FjU MRmCGU0Cp45WwgPlBfkAZyDwIcr5JywcviRefX8+NfTvjHa3qHrbLZZlCNbj2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cS2zR3TPBzwNq; Thu, 18 Sep 2025 04:41:55 +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 58I4fthX045829; Thu, 18 Sep 2025 04:41:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58I4ftxK045826; Thu, 18 Sep 2025 04:41:55 GMT (envelope-from git) Date: Thu, 18 Sep 2025 04:41:55 GMT Message-Id: <202509180441.58I4ftxK045826@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: 7c0bc6c703ee - main - release: Always dist sets on dvd1 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: 7c0bc6c703eeaea737d0dbc21996764967e4dc97 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=7c0bc6c703eeaea737d0dbc21996764967e4dc97 commit 7c0bc6c703eeaea737d0dbc21996764967e4dc97 Author: Colin Percival AuthorDate: 2025-09-15 00:39:42 +0000 Commit: Colin Percival CommitDate: 2025-09-18 04:40:55 +0000 release: Always dist sets on dvd1 In the !NOPKGBASE && !NODISTSETS case, we only want the pkgbase repo on disc1; but we want both packaging formats on dvd in order to allow for offline installs in both methods and also tools which ingest the dist sets from the dvd image. MFC after: 12 hours Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D52537 --- release/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/release/Makefile b/release/Makefile index e48527de160d..bc04a7974744 100644 --- a/release/Makefile +++ b/release/Makefile @@ -322,7 +322,6 @@ dvd: ${PKGBASE_REPO} echo "./usr/freebsd-dist type=dir uname=root gname=wheel mode=0755" >> ${.TARGET}/METALOG cp MANIFEST ${.TARGET}/usr/freebsd-dist echo "./usr/freebsd-dist/MANIFEST type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG -.if defined(NOPKGBASE) && !empty(NOPKGBASE) # Copy distfiles mkdir -p ${.TARGET}/usr/freebsd-dist for dist in $$(ls *.txz | grep -v container); do \ @@ -330,7 +329,6 @@ dvd: ${PKGBASE_REPO} echo "./usr/freebsd-dist/$${dist} type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG; \ done .endif -.endif .if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG)) # Install packages onto release media. ${PKG_INSTALL} pkg || true