Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 21 Mar 2026 16:10:34 +0000
From:      Colin Percival <cperciva@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 4b29bf721ef0 - main - Revert "vmimage.subr: pkg autoremove after pkg install"
Message-ID:  <69bec2fa.2573b.5656ea87@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by cperciva:

URL: https://cgit.FreeBSD.org/src/commit/?id=4b29bf721ef09c399f3e4a4ab5ca9f549c5b1550

commit 4b29bf721ef09c399f3e4a4ab5ca9f549c5b1550
Author:     Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2026-03-21 16:00:15 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2026-03-21 16:10:25 +0000

    Revert "vmimage.subr: pkg autoremove after pkg install"
    
    This reverts commit 6a13aeac3c1f98db7cf156f24a4d6bc8d3c321f6.
    
    The "bogus dependencies being installed" issue was traced down to pkg
    confusion surrounding libclang_rt.asan-i386.so linking to a 32-bit
    libgcc_s.so.1, and a more minimal workaround of "install clibs-lib32"
    has been applied, so this hack is no longer required.
    
    MFC after:      3 days
    Sponsored by:   Amazon
---
 release/tools/vmimage.subr | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr
index 97bf52205c93..56acbc359936 100644
--- a/release/tools/vmimage.subr
+++ b/release/tools/vmimage.subr
@@ -213,13 +213,6 @@ vm_extra_install_packages() {
 		    -r ${DESTDIR} \
 		    install -y -r ${PKG_REPO_NAME} $pkg
 	done
-	INSTALL_AS_USER=yes \
-	    ${PKG_CMD} \
-	    -o ABI=${PKG_ABI} \
-	    -o REPOS_DIR=${PKG_REPOS_DIR} \
-	    -o PKG_DBDIR=${DESTDIR}/var/db/pkg \
-	    -r ${DESTDIR} \
-	    autoremove -y
 	if [ -n "${NOPKGBASE}" ]; then
 		metalog_add_data ./var/db/pkg/local.sqlite
 	fi


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69bec2fa.2573b.5656ea87>