From nobody Sun Nov 16 02:04:37 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 4d8Dhj4WMfz6GjTV; Sun, 16 Nov 2025 02:04:37 +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 4d8Dhj1SbQz3cM9; Sun, 16 Nov 2025 02:04:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258677; 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=i7giULDhcxpPD9+KMGV2n3MIKlh2y786cmYZZaS2e1I=; b=JSJ8JGHjI8XON+Qz7Nsrlb65WXknQw2wpzRGD4fLOpC0Q2X3WtLmsROXIYuNwkj63ZXsHt q2aSmWXg3I97yezpnYBAldmkmPIgHxhyK/HglyRVrejqeuI70DAFMs2q+cky+9vF3ylx76 NDPjkjdpsuPTGqykp6nSjj4nvPSAtlD+ySe24UEOfJz16FOBvtYHwZwHuCc0z0g2vVSRc6 mOqbKv7rCuGdFKKOZDBizc72X6tWbMGM2kuub9NVFKjafXGfUoMexaIzAZVYlVIzZcPnmB FvCHp9Q56dC1jvdZIdh4uPncnj0Ghl+zMk3GBmCauq+qLLQ8X5Aw51/OWSEfqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258677; 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=i7giULDhcxpPD9+KMGV2n3MIKlh2y786cmYZZaS2e1I=; b=GTZZ5VoahZYePPkX752ZzMugjeYWtiVJt7/o0i+ENedcewPMpoW0XGuO2TKVUXy1Qz4ArZ RAsDtQs3x+t9B/dhJNWC3JUpJ3YL1AgtJ5eBqh2/wcGjx/nxWHBiaonj1D7htmr7qSC11A 1Eb7RXgFiBoPIAUkgJ41RNxYdlMXsT9Zy2KcTZ2QjcWTb35DhffkF7673SuYG16FOYjK0k g8RT7oOyPfC7M2Zl3A0XOo1bYylKavFx0hDpNY/EbN9cNaDXNk+ZJNbdAOzW+jNGnkvQ4Q Ep0hZJ5ORmm75MqyVPxnB1p1Z/eucHXCAqwZ4hJwRfXwJPra425Bow8cqj/aNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763258677; a=rsa-sha256; cv=none; b=M1c/DBMNuIWKphW1rfybHE4LK/w2BGm3swCnnhiYnU4jgRLIM9LQSsHwfeZySMXwEATOZC MqBerGyO8V7uWvqm8PNvlOpp2F7YVqGPT0yavK2k1+BCl0zKBLt73uPYn65jFGOAmQg26O GUI360sMd8Y8rdjmHNlpVLUXK0zirBAbIN/LtWs2wubqfEN1RXVyU0xj1z3seOBsl49qvg xOOVfprOUZBPAE6q/f2CgxoHaRxa3ZDfF/rh9rq8cY9YSws8dTmxWaYGtFtnVLDfUHRT4V eg/Wf16ld8G8QPl+ZRi1qNPGnPsxx+RT1G/c2oSbdRd/VkVIKAvSp2liPzdPkA== 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 4d8Dhj0y17z34D; Sun, 16 Nov 2025 02:04:37 +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 5AG24bub061089; Sun, 16 Nov 2025 02:04:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG24bYA061086; Sun, 16 Nov 2025 02:04:37 GMT (envelope-from git) Date: Sun, 16 Nov 2025 02:04:37 GMT Message-Id: <202511160204.5AG24bYA061086@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: aade34058733 - stable/15 - vmimage.subr: Enable FreeBSD-base repo if pkgbase 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: aade340587336218b32285d50b0e86c463f273e1 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=aade340587336218b32285d50b0e86c463f273e1 commit aade340587336218b32285d50b0e86c463f273e1 Author: Colin Percival AuthorDate: 2025-11-15 22:00:16 +0000 Commit: Colin Percival CommitDate: 2025-11-16 02:04:15 +0000 vmimage.subr: Enable FreeBSD-base repo if pkgbase When creating a VM image using pkgbase, create a configuration file in /usr/local/etc/pkg/repos/FreeBSD.conf which enables the FreeBSD-base repository. (This repository is defined in /etc/pkg/FreeBSD.conf as being disabled by default.) Reported by: Mark Millard MFC after: immediately (needed for 15.0-RC1) (cherry picked from commit e0c41af9256b5c5a6c97c85d468ff734e29f1bd5) --- release/tools/vmimage.subr | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 482d279e5987..3455f11d9794 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -107,6 +107,10 @@ vm_install_base() { selected=$(vm_base_packages_list | vm_extra_filter_base_packages) $pkg_cmd install -U -r FreeBSD-base $selected metalog_add_data ./var/db/pkg/local.sqlite + mkdir -p ${DESTDIR}/usr/local/etc/pkg/repos + echo 'FreeBSD-base: { enabled: yes }' > ${DESTDIR}/usr/local/etc/pkg/repos/FreeBSD.conf + metalog_add_data /usr/local/etc/pkg/repos + metalog_add_data /usr/local/etc/pkg/repos/FreeBSD.conf else cd ${WORLDDIR} && \ make DESTDIR=${DESTDIR} ${INSTALLOPTS} \