From nobody Sun Nov 16 02:04:38 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 4d8Dhk6j4Gz6GjWN; Sun, 16 Nov 2025 02:04:38 +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 4d8Dhk2LpNz3cXR; Sun, 16 Nov 2025 02:04:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258678; 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=88xaUj+qulwnYgZktUosWffLJiQmDtdBDRYHlpQs0PM=; b=Zmu28vOH3NYMoP0gxFtbbcDDNzM+OB3aZCN4BGd2uMbtgf/T1JNP5RQPoZekNs/QIw0ZPb dToSw/Swg3UlAvteKscb081T6fKcosMvdb7ZkNuriz29eK6tpfLOkU0Hl9V0oDuUIsuhW7 1SnonmIJwmCtW6/qVXjdj+FzRB8IY1WFPAh54vOfhCbW1Jl0JNrBXIAa1Y9UJBBe8qLd+n 6TXpfHUXj3DLnxmJiMhbtn4PHmf0BCWH5xEBlMQKa3biocvmfDjT9UMXrErpX8Dxnox8As 56P1PtKZF28pYbrLHKKpV7Bdyg9ioFCLGcOo4l7q83FHeOCcBVsi6j6ex/qHzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258678; 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=88xaUj+qulwnYgZktUosWffLJiQmDtdBDRYHlpQs0PM=; b=KzaF6KD1DBOvZSuJBk9DMB8bG3p2eqkUm446FsctDO4plyrQGgarH2mDz8gepo1sKw7vru 08fH0T86JOFaowjQR8iuy1oEbLbfzsy1SLSVEEG7Btv94GhjyZ+WvT1V0oRPnEqw3ciDDb HjwL/KpBg4ks2pSNxJFx1wgHlS2hNDdBsqaZRJr+kQ95/uQXGoSbjFa/1zHivn8cP4txeW FcWpDkX+RS9PuNyu9ccMTFlBI98DITfI8LlW24+Hc9U0rCvXURFf+0uxc/cumq9eHJqYtw pgrTlSIWiSLDWBCZB9ZRkkkiTL1XdCfLMm/F53CZ1Y4Mq++rL3TZyHqAcwGTOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763258678; a=rsa-sha256; cv=none; b=T5Avsb8/MDNSlPpGfWAXijoUO2M42E/Ky3OFbmTUIzAuDJQnKhBCPOIg7c1wiDDAvUK+NH 2WZz7liCvuDLrtdrnu7Zn8a014S22NeYpS+aCSl+c4NXIgaG/HtHCYz4kmoh6kbnpo60ZT Np3iYtmVwlRsQAYMGXU4Yk68cGk8SaqnVq5UxfD9VOdIY+wnrPJU6KWsjd4IGccs0tk3SW E19SHCDx1ZLK5IPKcIea0RI5r1HZ0cP7MRoEzfFEtXZU8jjkn2ONN9uVq899qZr8K36ULl XzmBQ22v5LM+oBFy4sRMX7SOwOEyG3jqhigTN15a6gxCR7Sx2d+Ve+hF6kZPEA== 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 4d8Dhk1s8mz3MX; Sun, 16 Nov 2025 02:04:38 +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 5AG24cpY061134; Sun, 16 Nov 2025 02:04:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG24cHA061131; Sun, 16 Nov 2025 02:04:38 GMT (envelope-from git) Date: Sun, 16 Nov 2025 02:04:38 GMT Message-Id: <202511160204.5AG24cHA061131@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: 9600598a5c01 - stable/15 - vmimage.subr: autoremove -y 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: 9600598a5c011c161813f929be53c3748a6a0f01 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=9600598a5c011c161813f929be53c3748a6a0f01 commit 9600598a5c011c161813f929be53c3748a6a0f01 Author: Colin Percival AuthorDate: 2025-11-16 00:39:58 +0000 Commit: Colin Percival CommitDate: 2025-11-16 02:04:15 +0000 vmimage.subr: autoremove -y Running 'pkg autoremove' without -y results in VM image builds failing when (bogusly installed) packages are removed. Fixes: 6a13aeac3c1f ("vmimage.subr: pkg autoremove after pkg install") MFC after: immediately (needed for 15.0-RC1) (cherry picked from commit 509dfd369046ee45b724d119c9eed43228fbb894) --- release/tools/vmimage.subr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 3455f11d9794..7035b107ae22 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -223,7 +223,7 @@ vm_extra_install_packages() { -o REPOS_DIR=${PKG_REPOS_DIR} \ -o PKG_DBDIR=${DESTDIR}/var/db/pkg \ -r ${DESTDIR} \ - autoremove + autoremove -y if [ -n "${NOPKGBASE}" ]; then metalog_add_data ./var/db/pkg/local.sqlite fi @@ -239,7 +239,7 @@ vm_extra_install_packages() { /usr/sbin/pkg install -y ${p} done chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \ - /usr/sbin/pkg autoremove + /usr/sbin/pkg autoremove -y fi return 0