From nobody Sat Sep 20 23:28:02 2025 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 4cTlsv1PmQz68ZGw; Sat, 20 Sep 2025 23:28:03 +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 4cTlst3fwHz3g6P; Sat, 20 Sep 2025 23:28:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758410882; 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=2QCJmv1VwI4OALre7ZQyKBdzNuk/CgOqVkQjqB2MVuU=; b=PBcwz/SHGjaremGVhNbvjbZFAEW3Yxgj1G6/oO3krK7HNxYC81DFO0qlUlO63F9lStX49b TCprzUvyVv2aBEP7PPAuzX4+fiBitjX4amPgjasHRbqpQ2DXdbjpzlKUERhgoez1p07RbT LmtxSMihqrymr2dIJdMjN2PT2TONKpWSjUL+ueVB0ItlfLqci0oNUGWVCt8Sv3icwflWIF QCtEmNvYll8aOoOEF0x8jueGOR6t6zp0lHZHhhhY9Dj4M7erD1yu62VqIHma91n7WCdOhh xp87o6iAZKl/PNSrkvE+qbuz3iWl3cblTmqkKxTRyXdU8iYDSCZumS9GBap3Eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758410882; 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=2QCJmv1VwI4OALre7ZQyKBdzNuk/CgOqVkQjqB2MVuU=; b=jUDmW+6a7x9qhxbryCrkUMpekmvIj+fZpqhwIxq34Lk9zSZoK/dPJ4T89F5ZwnbbPFSOtJ RzeDjDFRmk7nB8hGrQAa3jepQL7fG3SqzhzlmJnU9yAWq8Sj0UGtW5YI4GVF9zBXoo2kJi hGCCtAUi7Drvjq602upgkpRZFEjiyurRKPFVHkh0+8Nvj5E9lLsBnKYz1eLRnaCTvpdnnM aVTsm+5FGLf5OWjsaR3VOO8SGfXDt+TE62I4iJOtulnTYdrN/5j4/Zmksj7gYcxh9FGhMR IJKYwHX9uql5oTKCIn19yS7rA32E+FmurjGc4CRJaswv0hhIQpDKOk38UEc6Ow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758410882; a=rsa-sha256; cv=none; b=VOOPspvleESyCoXep+vt7UrZZp+9Vm+8wkBuDacN4s8jHxBX67fQd/cLQotsgLLXQT6w1d BgscptY0XNUMUnHvximePfxW9UYN3Mypx/A58W8f88HzdIraQyeaUuKWbBI6Dv0YJ0bxev d7xdZ3NEmAGcHVZOVOOfcezGRv4MaH2yyGezXpZtFwC0amiim8lBntit4WAnXP60Cvq3Pi +FNlBnNBZzoab3FYjzQ16wqxVZMeHsI6TY+/Q9LHcC1xUohsre3JlMDd+EZ/jvlGtBIMtY 483UW3szR2OQga/yvH8fPqfyQR0yOT3YGyaa/RoWokeQMQ7m2etWI5Edsn05kQ== 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 4cTlst3DsQzpry; Sat, 20 Sep 2025 23:28:02 +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 58KNS2bF072953; Sat, 20 Sep 2025 23:28:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58KNS2DY072950; Sat, 20 Sep 2025 23:28:02 GMT (envelope-from git) Date: Sat, 20 Sep 2025 23:28:02 GMT Message-Id: <202509202328.58KNS2DY072950@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: 7ca9dc8864de - stable/15 - release: Always dist sets on dvd1 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/15 X-Git-Reftype: branch X-Git-Commit: 7ca9dc8864de2ec9efa51a40631714d09bbdc2e7 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=7ca9dc8864de2ec9efa51a40631714d09bbdc2e7 commit 7ca9dc8864de2ec9efa51a40631714d09bbdc2e7 Author: Colin Percival AuthorDate: 2025-09-15 00:39:42 +0000 Commit: Colin Percival CommitDate: 2025-09-20 13:50:56 +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 (cherry picked from commit 7c0bc6c703eeaea737d0dbc21996764967e4dc97) --- release/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/release/Makefile b/release/Makefile index 7c3eb87c9938..50f69565a638 100644 --- a/release/Makefile +++ b/release/Makefile @@ -320,7 +320,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 \ @@ -328,7 +327,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