From nobody Sat Nov 15 22:06:10 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 4d87PZ3Fbpz6H3wn; Sat, 15 Nov 2025 22:06:10 +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 4d87PZ2B28z43Fh; Sat, 15 Nov 2025 22:06:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763244370; 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=TQDXIiHwyQiP/qhsFftxm0WzavZT669voeJ7UqeNiNw=; b=R9o9Id5q5jQIzRHdPrU1L8AA/hVXcx1NQX8quAwk7i5QzDU3x94vSp3hcYJFUoMxwHldzh 3+5l/yxCAopbch8SxEI43MU4KD5S9XbUSomIj4Rf0GzUP76155YRwp0A/fT+BUZuFq7kA7 uoKd4lsRKYlzMC6YvWCWJjZstT9LHSr+kjwIpS1bYsrkqv22NOSgaOGpeifFtYkGTENq7f BfieHe4Q+PZKdIYFtOs8S4Xi4bUGAQo2ypLQrkSf9Hh7Dk0SEH9mQEZEDuobLb9wVJUvT0 n4knEwd3zeUl7YIvKQPwlRYySW+tBUZ4kcIxf1aJyECtf65fueDsQKGTFVCqcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763244370; 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=TQDXIiHwyQiP/qhsFftxm0WzavZT669voeJ7UqeNiNw=; b=iRhS5Y8ySkPwtE4Cg4w2Rm6fpKE4y5gqcV+CBHnfmHuS6izsh+hjlXZcR/9SOfNlG1sMXr CLaDSyJxDa0jQ3E/rgvfOUkVRcQECNsC0mlTs3E14clAo0pnGR8dVGnx8FddLBuUfpbBTb iO3A8oYaLNJD4aesVZ/91s0b/J7XBfcUNt1TEufmk4MUJ+lOaJt0KFmlwgw7Ld5dXELW8Y NOkDBPIaKbgdvx7egMeyTNF8atYp4WyH5ui21gJWyvnu60eea/hceRXBRY+TMuoTv34B/z 6c4bfRWlV4ftOkpiZ+Gy1lbvLreU0LoRb14ss3gAYiUlnst2+f2GXAGxl7fJ4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763244370; a=rsa-sha256; cv=none; b=CmMxd4Z1ERM4nd8rBKIeJbLxPOz7AKqpQy0NTcyffGy4oX4KBIxrDXZO3JI44IFyNdZTb6 s8B/d5WQZS5Zaf1P4Jai1WkmdUrIj89z3sp+4iOlnfugdRW54WITfoMOVF1tAv2GQ5ephQ My1p32prNTlKCqHqd/zLDcCD0WMyj4orBJf55mEcDgPEV8SwAxNlwOu1UKRC5/BQ18MGv8 ScUdhmmSClC15DDQW3C7fnpgFRxVWdwuh7Bs0UHwUvshAP0Dze1buCZOdzKgPrsLgZ7Lz5 HZulubitEiRrTyfCmU9Yf2RPWU3gvhe6ZVxyGnSfBMkh30G0cBRjnJNaE7bLlA== 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 4d87PZ1nV2z19RF; Sat, 15 Nov 2025 22:06:10 +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 5AFM6AZG010825; Sat, 15 Nov 2025 22:06:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AFM6APt010822; Sat, 15 Nov 2025 22:06:10 GMT (envelope-from git) Date: Sat, 15 Nov 2025 22:06:10 GMT Message-Id: <202511152206.5AFM6APt010822@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: e0c41af9256b - main - vmimage.subr: Enable FreeBSD-base repo if pkgbase 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e0c41af9256b5c5a6c97c85d468ff734e29f1bd5 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=e0c41af9256b5c5a6c97c85d468ff734e29f1bd5 commit e0c41af9256b5c5a6c97c85d468ff734e29f1bd5 Author: Colin Percival AuthorDate: 2025-11-15 22:00:16 +0000 Commit: Colin Percival CommitDate: 2025-11-15 22:05:58 +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) --- 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} \