From nobody Fri Oct 3 16:53:51 2025 X-Original-To: dev-commits-src-branches@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 4cdZW35wRGz6BBmj; Fri, 03 Oct 2025 16:53:51 +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 4cdZW34d6Yz3Hhf; Fri, 03 Oct 2025 16:53:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759510431; 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=OMKSw/twE0qtLULsV5Ap/nn3Mk2bM1RRrmBDWdHMpMU=; b=pP/rIWjLE+fSnisozuhp5e+T24irpOt7aG8MoXUT2NEGcguw53s6koSjQEAT5O+MErv38J 0zHJOcMYxB/rFkWeUVkRVcf9ec6UMiUQ0xrqJJbeygKoMVolt6byn1xbPKZgy02Va8l20a DfsVRAn8bJpPAve/KSOU9hS6uaZEhThDjhAcYWKKx6qvQSSzuB/CX/tjbRpL5+Rk07H4Ls vyNDe9EIofB3W7GHUbc8mQr3oixXO5G0gHUkwyuRN8bPkHIQJBWUB6fftHMNuFIZeE3mA4 QhNXjQtL8do3xuYTID1n4ZGN7r6mKmGrhiwU5gg+bniITJgoLY0ivhTlxyqEqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759510431; 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=OMKSw/twE0qtLULsV5Ap/nn3Mk2bM1RRrmBDWdHMpMU=; b=Fl81UgZaLi9odooxu6sNuUmj3AXn+2VyZwALMCoym6dYNUuVoLRkSZK3phXWtcgDRgWO8u YeMN+hG0+92lIZRhZ65idcIIV49deWG0GafcK7VM/amwLIjePmeLlbUvvbQfl7VYapGpag 9IGGwUdmdpdKyr3qYAYg+YumpS824N9CegVyOipP1Nt0lgYaaqdp2E5Z5qsvvOBSOSdr3x VRcXHsNXLfwyotTuP9yZ/jbWXnsDiDhiyY89lrL0QuAGFOn2llK6mJH6myJYJDQCFPJGH8 FTfxInt0V3Kft8recWBNGx5Nc3YU8X7lZREAsuaoFJi0NGdkJy9qmFuBkQmlkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759510431; a=rsa-sha256; cv=none; b=KNT5SXyUEowbVTNEFvxc56o1B11YWecVyJm3lUSgE/i7++F6zefs9r4/2QlHSZRQaTzP+G vpqw+8Yliz9qf/w4JK2zUXiKxTcFkq7S2O6R03ve+PUN3Gv5GL31Oe8C9BkLYjzMx+mz4G VYbppIUiC2nuPrz350UKxE9N5LInH/z4CanuqJKEQLIH9udOD5dllaN+vHvqhSnHuuJNph vIXGCKKlT6W8x3MKk8LRgtVa8cU06QdDw4cs99dTah9z7DIJcm9hkGuDuYV02LXThSdjPQ g1/JXl8zeUxdDJ1Hfi/oK4XWuLHAkvPj64EiEVNYuXXAaz4i2ZZW+koj18QVSg== 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 4cdZW345HYz13QZ; Fri, 03 Oct 2025 16:53:51 +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 593Grp7u064481; Fri, 3 Oct 2025 16:53:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 593Grpxj064478; Fri, 3 Oct 2025 16:53:51 GMT (envelope-from git) Date: Fri, 3 Oct 2025 16:53:51 GMT Message-Id: <202510031653.593Grpxj064478@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: 2730e35e147c - stable/15 - release: Consolidate pkgbase-repo dependency List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 2730e35e147caaf1303bdc5ec7464a427d2480ea Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=2730e35e147caaf1303bdc5ec7464a427d2480ea commit 2730e35e147caaf1303bdc5ec7464a427d2480ea Author: Ed Maste AuthorDate: 2025-06-23 14:53:02 +0000 Commit: Colin Percival CommitDate: 2025-10-03 16:50:47 +0000 release: Consolidate pkgbase-repo dependency Use the same approach for pkgbase-repo-dir as for the packagesystem dependency. Reviewed by: Isaac Freund Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52884 (cherry picked from commit ac1408bd1d2d3f2bb2d8c77e91420fe9e66926ca) --- release/Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/release/Makefile b/release/Makefile index 04fbeff091e7..f7ce537cb4c4 100644 --- a/release/Makefile +++ b/release/Makefile @@ -201,6 +201,11 @@ disc1: packagesystem bootonly: packagesystem dvd: packagesystem .endif +.if !defined(NOPKGBASE) || empty(NOPKGBASE) +disc1: pkgbase-repo-dir +bootonly: pkgbase-repo-dir +dvd: pkgbase-repo-dir +.endif pkgbase-repo: mkdir -p pkgbase-repo @@ -214,7 +219,7 @@ pkgbase-repo-dir: pkgbase-repo ${.OBJDIR}/pkgbase-repo/${PKG_ABI}/latest \ > pkgbase-repo-dir/FreeBSD-base.conf -disc1: ${PKGBASE_REPO_DIR} +disc1: # Install system mkdir -p ${.TARGET} ( cd ${WORLDDIR} && ${IMAKE} installworld installkernel distribution \ @@ -278,7 +283,7 @@ disc1: ${PKGBASE_REPO_DIR} echo "./etc/rc.local type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG touch ${.TARGET} -bootonly: ${PKGBASE_REPO_DIR} +bootonly: # Install system mkdir -p ${.TARGET} ( cd ${WORLDDIR} && ${IMAKE} installworld installkernel distribution \ @@ -321,7 +326,7 @@ bootonly: ${PKGBASE_REPO_DIR} echo "./boot/loader.conf type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG echo "./etc/rc.local type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG -dvd: ${PKGBASE_REPO_DIR} +dvd: # Install system mkdir -p ${.TARGET} ( cd ${WORLDDIR} && ${IMAKE} installworld installkernel distribution \