From nobody Tue Jan 27 23:15:53 2026 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 4f11VK4fbTz6PddG for ; Tue, 27 Jan 2026 23:15:53 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f11VK2lL0z3P81 for ; Tue, 27 Jan 2026 23:15:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769555753; 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=CMfZokU72P6Zw+JY/QyUNqL9XhnqYsBOl/FmSYtOEpc=; b=NViio50aft1YBGpzP5w9hS3GjjVhOltbxlL/W/ScxHl8x+1T3WRIWkimOFBv+0Q5ytAzAf ICM8+MnntU2P8Vwsv17ylm6sDZKJmd+90UEHVECYkDD2cVoEklkeZ6L4ZdiORb27nXyf0s 4trzqCyAppdQynSfZsGM+2ZeeuXXlsvtRdH8ZtjK6Q0cnJdUC7GbzhxSGiqQtyueOXS9N6 FvbjgY9V6VZA0C4lDdYO7VdvPU3xNaYFioSh4QtvLG5CiXvJACzdubDWY3CifYCO/kfwuF RooZmZBg5bRurem42td1myONQQUpjs1XTANMB5j5tMq08P15yd/jtgks0KxyPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769555753; 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=CMfZokU72P6Zw+JY/QyUNqL9XhnqYsBOl/FmSYtOEpc=; b=Hn/6sCQIrss7pRrGFe5dM/I1IFOG5NxR6SlfUG0z3smEbzawGp5J3s65k4fhxdYdM4nDJ9 iRDT72hDgBIvdQfrr+5mHJuEOUUjVuhZMoy4KVIs2+qxRA4IkJ/Hcl7SfcEOAo6Dm/nE1w qLf3uQzp7hFlZJa+x5GNJA/rC2c5S2EdHxyoVzCHtPSK6ED//YzrFB3ghVs1M/2syEcCr0 jfkLeu1o37znzfKj0Ii1TXHHoteFIgDxVL9ukITdNnjKQziAA7S1EV4vnQ2i36LEww0vYB vhPoJ+1xisbe7F/QnaSKXrG10Ppm7uqVH+io1Si6s2E92VUV/BxP8pSdU304HQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769555753; a=rsa-sha256; cv=none; b=ZeGZUx0cLMpd43a8LdgqzOWs/2+dIt7ERcnYylzLog7D9N8Ue+zahlBAtEE403wDcVHpm7 k8FKVw23FT17LRjRjwJ9DxXqOCtuDx1tH6452cHDHYU47hgsO18w5Obp3E5wFtuXYTl7qj Dx+zZ5k82V9XzPRyAKZBC80syev6Q9xs8dYT20eA1tTxZN1ynVhKZJhsD9zfNhk9F5cW5x GryKw+5Ba9xGImAv2coFnxojMl8D/Pa8w2k57EgTG4q9PD2pood/hmwjlbyTzWMG0WTZCf J6dVsD9LXx9piA0lels8nUKqZb1vHzlqBiHWjN56WhtWr+scbuGqJ869RU7DhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f11VK1bHNzBwc for ; Tue, 27 Jan 2026 23:15:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 424e3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 27 Jan 2026 23:15:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: c8d759230a0e - stable/15 - vmimage.subr: Install pkg on pkgbase images 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: c8d759230a0e4449615b9185f2d86969f3792ba2 Auto-Submitted: auto-generated Date: Tue, 27 Jan 2026 23:15:53 +0000 Message-Id: <69794729.424e3.3cb7bfa1@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c8d759230a0e4449615b9185f2d86969f3792ba2 commit c8d759230a0e4449615b9185f2d86969f3792ba2 Author: Colin Percival AuthorDate: 2026-01-24 20:12:14 +0000 Commit: Colin Percival CommitDate: 2026-01-27 23:15:40 +0000 vmimage.subr: Install pkg on pkgbase images When building VM and Cloud images with a packaged base system, install the pkg package; this makes it possible for the base system to be updated without installing pkg from the FreeBSD-ports repository. Sponsored by: Amazon (cherry picked from commit f0ecf357aad984ac3b175f41027baac06d886f16) --- release/tools/vmimage.subr | 3 +++ 1 file changed, 3 insertions(+) diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 0ca9ba267ce0..f7fc9906c049 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -84,6 +84,9 @@ vm_base_packages_list() { echo FreeBSD-set-lib32-dbg esac echo FreeBSD-set-tests + # Also install pkg, since systems with a packaged base system should + # have the tools to upgrade themselves. + echo pkg } vm_extra_filter_base_packages() {