aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Percival <cperciva@FreeBSD.org>2026-03-21 16:00:15 +0000
committerColin Percival <cperciva@FreeBSD.org>2026-03-21 16:10:25 +0000
commit4b29bf721ef09c399f3e4a4ab5ca9f549c5b1550 (patch)
tree902e8b6b9a05676204dc2c2615994e01d526c9d8
parentcfe0b7d37e552d78762c029f5b15e0f36d9d0d38 (diff)
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
-rw-r--r--release/tools/vmimage.subr7
1 files changed, 0 insertions, 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