From nobody Fri Oct 3 14:31:13 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 4cdWLT4sfHz69vvc; Fri, 03 Oct 2025 14:31:13 +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 4cdWLT4QNNz3ny6; Fri, 03 Oct 2025 14:31:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759501873; 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=ptl/fWuQHYf5jv4IAp+lQlMVcfhYY1WOfCa0JYcAkiQ=; b=Q+VmPdgSI5H6CKqSAf05396FiRc7aghs+am+D5XXfJcrLhqr2Ppg3bpKimSclu1nQU6cDb QfXlSlauU+xIiZ/4fbH3Tfff4YML2x456cunklaPQc72Q/bGXreIBUdHCIWT4efnhTRTwR 8uuKikn6uTeiXHaF8XJrLhLrqW7cNqvKcoZO7ZOS1JT8aF6ugXs0W7hD6ULOy4ydGLVowF VghQGH1HoOCrJ5oB60xzyWm0+FUonvBpAC3+gNpfWaljgaWtqXtoexcQL8IEDIQNKZJOvU umFrBNzzt1HtU6ABeskCLL0/QaO5BhFKbpe3ZrVOR49PKxD9+3CAZnoCXwzxzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759501873; 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=ptl/fWuQHYf5jv4IAp+lQlMVcfhYY1WOfCa0JYcAkiQ=; b=hk7eJi/PL6p3xwHUAngPQWvcYBM8i5gs5JDKa9xaDhjWu3UtpNjdvk4fqZf1XseMijISwj CFIqGN8hQhXpTm5dWAXDV3E3QgJr8OGrv8QSJzvlcDB6K/lvboOu5Z8C51vmBWQcgbmtff 8BnftaprvNxw99IH5n+UG/hLKdGwAhHgnNqoFAAQxNte7SR4VY4g3rVVqYytw+6tQyOg9k fWQlYRL4XOdrI5o/RrN1JRqcf/BwdomlumYlAh9AHCA598nLiZYri3QxKWXioErl2GoYcE b9MfcxBAQEwa5DEjagljhLUoUpw6DVdIsw2ucH3LfC4lnrjdIwwRn4nbF9qQZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759501873; a=rsa-sha256; cv=none; b=SULK9k0ZV/oiEZGPs84UIbf4zZzdytp7jNhXmikwyQZBWod1WjmxoRvCAQvjvTge+wPVh1 dvC7C4TcJ3bYWl/iFjNpvYZ3/5nESz/m/Ob0RL/GOaF7M0qrI99Pezso74+tarZ0wnPF/6 yDb7KSCsEn1mXTyp4RHsYl/sU3usCTciKnMh+4Jodi2Wi1ovKPI/CH++7d8b8W2+/Mo/CS M5DjdaKaaJPRdefBA3W6w4DZQhfTuasIJwPH1U5PcGci4EHbpRn4Bp81gNFGUMPhGf09Yc 16YysrqwjJ13CJpp+lcdJtQt4MF9EuvW/ploLTHOztXy1ZocsBH4pH2K4of1Ww== 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 4cdWLT41WszydF; Fri, 03 Oct 2025 14:31:13 +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 593EVDJG093049; Fri, 3 Oct 2025 14:31:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 593EVDb4093046; Fri, 3 Oct 2025 14:31:13 GMT (envelope-from git) Date: Fri, 3 Oct 2025 14:31:13 GMT Message-Id: <202510031431.593EVDb4093046@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: ac1408bd1d2d - main - release: Consolidate pkgbase-repo dependency 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ac1408bd1d2d3f2bb2d8c77e91420fe9e66926ca Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ac1408bd1d2d3f2bb2d8c77e91420fe9e66926ca commit ac1408bd1d2d3f2bb2d8c77e91420fe9e66926ca Author: Ed Maste AuthorDate: 2025-06-23 14:53:02 +0000 Commit: Ed Maste CommitDate: 2025-10-03 14:30:52 +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 --- release/Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/release/Makefile b/release/Makefile index 70e5795bae0f..76a99ffdf3f3 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 \ @@ -279,7 +284,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 \ @@ -323,7 +328,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 \