From nobody Sun Nov 16 03:12:08 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 4d8GBd29J0z6Gpvg; Sun, 16 Nov 2025 03:12:09 +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 4d8GBc5Hg9z3nM9; Sun, 16 Nov 2025 03:12:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262728; 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=JQrYREIeA7IiI3k2oQvti5SsrGXfxUpospyHGIkYGls=; b=HB2TRtBhlZ2/UuTSPeoyiz3ZOZXPFCTLRK4R2QxRauqn5td3VQFbru6kIdpc3Ge2Xvrbl9 JJQCA+7HmCCw0fQqRWhje+AfFXhOqzpL0Asyx2P3xauUM4FDWQo//fPbyYuBd7QqoaAp04 A89vOouBcymh7MW6jExuOwq+0IoXLoE7GlGuZPcgCEVNZVoNonegwpy0v556sTqjkLzsuf 1UQHUsNrzfJzrJaYTYnRDxaXcxi0woBXIM8Q1dxEmb9xr5S1+RBU0sftRgtzN2pS73EFtj VZEXAlESwpiK76URV/jHZLi2Q7TrwDdS5950YK6jITvvRaP4ea33L+UoateTwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262728; 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=JQrYREIeA7IiI3k2oQvti5SsrGXfxUpospyHGIkYGls=; b=nNvW6qpmgmjCzSgErZyl2yQmhV1fMayQf5X+p/LkyTdtmAO618uxCy/rijIBjzyy/ylZsX P/UjXGLHV7NoPJEaEji9jNCdOH04mdg9zcpGKvp+M5esuxBWh7vWVEqAYay6Wbbp1CBynN SIrWhet6Oqo67gNHE84JU7GAbXVYT8C8ND6MYTYj8FbcvKF2NLC14y/dNivsVTwFYFgUU3 /vSlBXgFvlHw/qY8YOLU8j6BTHrg+eAa0wchOj0BdNd4wJd72NrwMo8RT4WnBawGKrLFyO j3m4iCHv5Gv9QC2476VHiD/KKdZLoFd76j+7mh2kgpg9gTl8TNGoS1I7Kj5ZkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763262728; a=rsa-sha256; cv=none; b=UJOOukCFxV62BPnKR23fTD1KaFoWZQmZScsbSOrTOjUUj8bUio28dBbhcmmbS9zDjTtE75 zKP1OW5hRHG4N/wFCYMhKTt5UwOihr8v4kdpthRjnZzhixiOxZUUButCVqaj5pjihrYD1h Q36pS2aWQwbFUGWz0nH/4DWNC+RMYYHs9uohKBIvuVYnJ4WAViqgZEUC9VKoRhEnBl/fTl /gaLeBLbeWKeAW4eNeROJrVP4lR7QntBHiRmeV4Cgf0tXiBEJl1NhxKn0q+b1CmT7RwJuQ baQMoCVAE5G6J83ourCTWU/JCaAATURQ2NuK6wzUcFqYR99SwGwZCVoBfF6oAg== 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 4d8GBc4D9Pz52L; Sun, 16 Nov 2025 03:12:08 +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 5AG3C8Wc094475; Sun, 16 Nov 2025 03:12:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG3C8w8094472; Sun, 16 Nov 2025 03:12:08 GMT (envelope-from git) Date: Sun, 16 Nov 2025 03:12:08 GMT Message-Id: <202511160312.5AG3C8w8094472@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: 6ac6550a91f1 - releng/15.0 - 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 6ac6550a91f1df265a36c368052d908c3294e348 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=6ac6550a91f1df265a36c368052d908c3294e348 commit 6ac6550a91f1df265a36c368052d908c3294e348 Author: Colin Percival AuthorDate: 2025-11-16 00:39:58 +0000 Commit: Colin Percival CommitDate: 2025-11-16 03:11:23 +0000 vmimage.subr: autoremove -y Running 'pkg autoremove' without -y results in VM image builds failing when (bogusly installed) packages are removed. Approved by: re (cperciva) Fixes: 6a13aeac3c1f ("vmimage.subr: pkg autoremove after pkg install") MFC after: immediately (needed for 15.0-RC1) (cherry picked from commit 509dfd369046ee45b724d119c9eed43228fbb894) (cherry picked from commit 9600598a5c011c161813f929be53c3748a6a0f01) --- 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