From nobody Sun Nov 16 03:12:07 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 4d8GBc2mqxz6GpvX; Sun, 16 Nov 2025 03:12:08 +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 4d8GBb5Bbwz3nM3; Sun, 16 Nov 2025 03:12:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262727; 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=q7l+lIJLdttoIF1y1QRFnw4Fg9HdkvpNfqG2zZMsIjY=; b=YhQ3psgwvakCCXkDJvC1vDjXUiKsfU+Pu3n46Lr0krcNnuKcbFdMzCwa4fPuFLd7xFXWwK RmdgWmWxA6zgFyzfcPof6DC40eg6SpzbDVEfzhPcmU+tVapZWTpMCsMCpu52meq5TynEpN CwNID6Le5mpCU71xfybQO3mGFy57ytT/whxHrLtODmvK/mb5bwuuSo98JEaJuASKLRrn7+ 3M3g2SEBqkcGgymXqkerChkxIfWIs9kzzmIRUCCqbsMDK4QTlWPzMwN3sG47mwPLY4ZAQe fqRwoRySnjgPFHdlvhDtzPFwQ+I2pVdPePPkMYolHE6PJIy4Az1V/QwUuKcL7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262727; 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=q7l+lIJLdttoIF1y1QRFnw4Fg9HdkvpNfqG2zZMsIjY=; b=c+MNaazM1hDsNz16H5SDxFePjIrJrhTLud1xFGynlC05TL0czRGvyxH5YrccL8yAJeYQZS yO4aNJUQpDUMZlZ7oBXxZTZHnalQYqgtsnjcokyE4W1Cxj9mON6nhZ+5JfoGqynwho8H6H fxAvgpUn9ml6D6deeKHungubbbmT6i6UgHMWxd24wVDb3B+i6OEv50nw9SGFoCg93ROtzg BRnRRZWsD570VVcVY47LN4/REfrG6zD9PngWOBbJ0HIGN1wfxbthNfLvg0qEshJa4rNRHh pLkbe47LfihTZE+0buM7B3iDZf6ORkeROym9JmlkF/fwppILnZ/51ANiKgAHag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763262727; a=rsa-sha256; cv=none; b=oJiA2zRFGF72iHhEj9mX0nevJABi2XXnditA7KayQrUgerTbX0dP+KgEKtkF+oI1XE8jVz Tm7fjLySSPQQf9pu01PtEuIROCTUNwTuMo8Dvf5sMBSiguS7HgYAx5usjtnUFm/SnYuL9o 80FsixpfzBbdOxaAIV1qCsDzro3VtjTX/ol7Fob2jejTIt8ykxL+6J4w4VK6b72OqLeA4t BIN8KEtg83ABn5Lf9yrrnZZIpjNOoVU/prXUEWlP2lLSnIonzJTreT7OoGnpUYh3vl5clk RarDtqJdxzUW+hkNyR6aYxINKY06s+uKdP04eXGn6LODRPmHjxDAUXQyC8Zwyw== 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 4d8GBb4G9Cz5qR; Sun, 16 Nov 2025 03:12:07 +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 5AG3C79W094436; Sun, 16 Nov 2025 03:12:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG3C7tp094433; Sun, 16 Nov 2025 03:12:07 GMT (envelope-from git) Date: Sun, 16 Nov 2025 03:12:07 GMT Message-Id: <202511160312.5AG3C7tp094433@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: 93c5db9e9cd5 - releng/15.0 - 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 93c5db9e9cd59d6f158812b07cb64a93d9685164 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=93c5db9e9cd59d6f158812b07cb64a93d9685164 commit 93c5db9e9cd59d6f158812b07cb64a93d9685164 Author: Colin Percival AuthorDate: 2025-11-15 22:00:16 +0000 Commit: Colin Percival CommitDate: 2025-11-16 03:11:20 +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.) Approved by: re (cperciva) Reported by: Mark Millard MFC after: immediately (needed for 15.0-RC1) (cherry picked from commit e0c41af9256b5c5a6c97c85d468ff734e29f1bd5) (cherry picked from commit aade340587336218b32285d50b0e86c463f273e1) --- 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} \