From nobody Wed Sep 24 09:16:54 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 4cWrnz02NZz68mcw; Wed, 24 Sep 2025 09:16:55 +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 4cWrny1Bsjz3wbK; Wed, 24 Sep 2025 09:16:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758705414; 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=nXfJZOMZzszljjRjAnJWJF4cATDH+VxhRtGhfX7Usko=; b=H/SvonYVDtbtshdA4u4imFYDsRc84npXExDMMQbNVQYmhpxfyJNXXHsw0Xglu4sFT1RfUz mFwxqSbSFGmGagpG4yYJTwCEoLuYnK1Jb8pOEZk+RKnko5gDZspHJWse/AzVAJ8IoVpRzt fz/buv4yuntOWbrlnStU99Ilr8x+GCidR6h8RMbQkIIDP8VKF/t0+NvAXi+gCwl6IPN7RA quVZmJsv5yGgtrR96DCCtEmI9X6KUEqqZjPQP/53g5KJtzwa/1KL4cgZTsROWmFoHqsapp is2gCv8W4Kt9xsauIf8otKR0q2GuUkuvTFX6iPNZW5Y5NG6j1FPjnUZ8chCCng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758705414; 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=nXfJZOMZzszljjRjAnJWJF4cATDH+VxhRtGhfX7Usko=; b=Aj5GskUT97ftPn1Nd7kLW2HwMfdiBYF0+fGXbE3yimOsWdHEdeDIuQdNaPBuOk5dZTomY5 7/ZMFIpA71T8fDZmci2buwhrrgtCj1Wc/NVtIlS517df7fNyQrn4m5ewdBoJKaXvCvP2tE 0sJxocwYF4gBRjTXNvuVxDxGcN8EUBTWvJbUw94SDzvFLSus6jZ0kHKHB4Xa/cAy2D0J3T YS7LZCFbhD5s7Z6Xuq24NSHCcpUzFSd31957CyI/7U+xNs6GY80ResJNHxMzUCHBy3nFgO fpTim4uqlQ2jhum+O6q/F1CnEYVY9pnQaxDOHVXS/Jl+kyaDgDf8WIDdmaIE5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758705414; a=rsa-sha256; cv=none; b=HF8OK5c29c7oYY1ry2JmE1Dwswv3sVNmw+ODAN2b/DRdZFwiFggK0qRcZwZ930A128X7WU JApopWUc3y1gpu3rSLZ8VDatLxsoFmNqnbYrSLfmXRC6cgF0+iQzeQ+RuY+lruxQusSQ84 d8WfjIN+cGt+p5Y0da6Fh3BSii6o37tdPslGnINzmh7jGos1W/CBk1qkHs7weBenea+pae YKUq36uPY8oG8Q+ZRFHO9L92Igd6Xj9tHy0X81wQOCH2bKHmXXlnXsfbhDf7byyTrdMjSl O4kj/I+Fs7h6O/CClNe11n6encwlly47p/n/suIuFXaDt9F+SCkPQBCgh/tnTQ== 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 4cWrny0glxz9DV; Wed, 24 Sep 2025 09:16:54 +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 58O9GsSV001700; Wed, 24 Sep 2025 09:16:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58O9Gstq001696; Wed, 24 Sep 2025 09:16:54 GMT (envelope-from git) Date: Wed, 24 Sep 2025 09:16:54 GMT Message-Id: <202509240916.58O9Gstq001696@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: aba986215fc9 - main - release: Install pkg from the pkgbase repo 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aba986215fc99d09655d4dcfc5e37f8b1ac83edf Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=aba986215fc99d09655d4dcfc5e37f8b1ac83edf commit aba986215fc99d09655d4dcfc5e37f8b1ac83edf Author: Lexi Winter AuthorDate: 2025-09-23 22:37:26 +0000 Commit: Lexi Winter CommitDate: 2025-09-24 09:16:13 +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 --- release/Makefile | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/release/Makefile b/release/Makefile index 296ce83f6dac..491c343398b4 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 @@ -278,8 +288,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 @@ -333,7 +342,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