From nobody Thu Sep 25 01:01:43 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 4cXFm83v4Fz68kP4; Thu, 25 Sep 2025 01:01:44 +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 4cXFm76h6Tz3bSP; Thu, 25 Sep 2025 01:01:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758762103; 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=r1VpuPF6lRfHx/SKVJXMnWIRoAUtnoU3/bfScjFRzSY=; b=WI/h/Mve1IIq83JL68hJqwXwk+IZaCnOONjHkjVandEK83feH7fdqK4wyidWwRZc+DuW4d 1obc5aIncSUDfxT433JXuZ0XI3SU97YcQYknJ5nBe/2Pe8I9beLzy6kDmEyAbAdTdqNkjV ONlLMqvgv6LDRhfsRICyUOz6HO/nOpaZCcCBsRs+VA57v1ZKuvrGUpY88FjXudZcmhsVYo 0292Klt8oTySGCynjmVb0zabJ6taedg5oyw4eN0h3BWhegD5wfLwDi5QJK9DJV3Sal/8Kl lT6jv4SFryqk7XhGmgReOA9tsH9VIunDBue9xwcdvo0QANLR/OEh5QV/kO0Zpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758762103; 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=r1VpuPF6lRfHx/SKVJXMnWIRoAUtnoU3/bfScjFRzSY=; b=Ix9tJB7+e2bbL0tc6aISagGckNhopBhLRWUb0hON9TgiGbGoYbF5hpmj6pTTX6P9AR+cR1 aGzvWnJw2xMgxlSIEaqUusodJXOxZ51Nh1Cq+ubbZ6+NOA+Ho6ttgfb6Huawu5Kl7FvOjh Bx+dAZXTRFLZngknLn5JEcWWIEmx4BDqRYDdahpdBA/2+N0MlHevOGtdBwUgVhx2oo4cbp gaw6FRAZM/8/CJJsSEJx7LWwtNEZCbQiRaM7q4TyHAnqYptupVuE07EXM/KXduxTn9QyJr Ght53men2PQaK246LSIgfeBiqszJMKwZiChFwM0/93CQYqRaNcH+bYxMXi3Jtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758762103; a=rsa-sha256; cv=none; b=EqvazRkw+qhwksP38Jinxt+3oaMPiSFkeCOea/oVZ5JegTlD6xGOdAQR8wZBW00+SM7i5G tozWdcM36p74PdTe4wEvBPacsZMNqVPNro1fYHdKnQlMr9zoCbQktftzGSrEDjN3woTHWK cXmtydU8jvU7c+LA2uvY9phHRX0Xmug6DKhynLgCc056QP55qKkadu2YN08YVwVVxhFii9 NHL1xkuQirHOOCQF2LJAs1jII6anfPwHUbeW1goZhXgZgneGpxKVUmbVVZBeO4xDj89S/3 FW5Sc9gvX46Nh5ZBuIQEem+ONBDkl2uob2Dij4n+eHqgmLh8BQti4oTybOl+qg== 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 4cXFm7682xzvr7; Thu, 25 Sep 2025 01:01:43 +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 58P11hHK087032; Thu, 25 Sep 2025 01:01:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58P11hKO087029; Thu, 25 Sep 2025 01:01:43 GMT (envelope-from git) Date: Thu, 25 Sep 2025 01:01:43 GMT Message-Id: <202509250101.58P11hKO087029@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: d500f1f015e3 - stable/15 - release: Install pkg from the pkgbase repo 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d500f1f015e3157cd2fe501686fc4343df087613 Auto-Submitted: auto-generated The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=d500f1f015e3157cd2fe501686fc4343df087613 commit d500f1f015e3157cd2fe501686fc4343df087613 Author: Lexi Winter AuthorDate: 2025-09-23 22:37:26 +0000 Commit: Lexi Winter CommitDate: 2025-09-25 01:00:41 +0000 release: Install pkg from the pkgbase repo If we're building pkgbase media, install the pkg package from the pkgbase repository we already created, not from pkg.freebsd.org. Aside from being more desirable, this also fixes make release for version/architecture combinations which are missing repository on pkg.f.o (which is nearly all of them at the time of writing). This doesn't yet work for bootonly, since we don't build the pkgbase repository there. For now, restore the old behaviour of attempting to install pkg from pkg.freebsd.org for bootonly. MFC after: 1 day Reviewed by: ifreund_freebsdfoundation.org, cperciva (previous version) Differential Revision: https://reviews.freebsd.org/D52637 (cherry picked from commit aba986215fc99d09655d4dcfc5e37f8b1ac83edf) --- release/Makefile | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/release/Makefile b/release/Makefile index 13aaefd4db8d..73ab2b7cb250 100644 --- a/release/Makefile +++ b/release/Makefile @@ -79,11 +79,16 @@ VOLUME_LABEL= ${REVISION:C/[.-]/_/g}_${BRANCH:C/[.-]/_/g}_${TARGET_ARCH} PKG_ENV+= INSTALL_AS_USER=yes PKG_ENV+= ASSUME_ALWAYS_YES=yes PKG_ARGS+= -o METALOG=METALOG -PKG_ARGS+= -r ${.TARGET} -o REPOS_DIR=${.CURDIR}/pkg_repos +PKG_ARGS+= -r ${.TARGET} +PKG_REPO_ARGS= -o REPOS_DIR=${.CURDIR}/pkg_repos +PKGBASE_REPO_ARGS=-o REPOS_DIR=${.OBJDIR}/pkgbase-repo-conf # Pass -f to make sure pkg writes to the METALOG even if the package # is already installed from a previous build -PKG_INSTALL= env ${PKG_ENV} ${PKG_CMD} ${PKG_ARGS} install -f -PKG_CLEAN= env ${PKG_ENV} ${PKG_CMD} ${PKG_ARGS} clean -a +PKG_INSTALL= env ${PKG_ENV} ${PKG_CMD} ${PKG_ARGS} ${PKG_REPO_ARGS} install -f +PKG_CLEAN= env ${PKG_ENV} ${PKG_CMD} ${PKG_ARGS} ${PKG_REPO_ARGS} clean -a +# This installs from the pkgbase repo we created during build. +PKGBASE_INSTALL=env ${PKG_ENV} ${PKG_CMD} ${PKG_ARGS} ${PKGBASE_REPO_ARGS} install -f +PKGBASE_CLEAN= env ${PKG_ENV} ${PKG_CMD} ${PKG_ARGS} ${PKGBASE_REPO_ARGS} clean -a .endif .if !defined(VOLUME_LABEL) || empty(VOLUME_LABEL) @@ -238,7 +243,12 @@ disc1: ${PKGBASE_REPO} .endif .if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG)) # Install packages onto release media. +.if !defined(NOPKGBASE) || empty(NOPKGBASE) + ${PKGBASE_INSTALL} pkg + ${PKGBASE_CLEAN} +.else ${PKG_INSTALL} pkg +.endif ${PKG_INSTALL} wifi-firmware-kmod-release || true ${PKG_CLEAN} || true .endif @@ -277,8 +287,7 @@ bootonly: echo "./usr/freebsd-dist/MANIFEST type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG .endif .if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG)) -# Install packages onto release media. - ${PKG_INSTALL} pkg + ${PKG_INSTALL} pkg || true ${PKG_INSTALL} wifi-firmware-iwlwifi-kmod wifi-firmware-rtw88-kmod || true ${PKG_CLEAN} || true .endif @@ -331,7 +340,12 @@ dvd: ${PKGBASE_REPO} .endif .if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG)) # Install packages onto release media. +.if !defined(NOPKGBASE) || empty(NOPKGBASE) + ${PKGBASE_INSTALL} pkg + ${PKGBASE_CLEAN} +.else ${PKG_INSTALL} pkg +.endif ${PKG_INSTALL} wifi-firmware-kmod-release || true ${PKG_CLEAN} || true .endif