git: c11fe9fbf450 - stable/15 - Revert "vmimage.subr: pkg autoremove after pkg install"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 24 Mar 2026 02:47:44 UTC
The branch stable/15 has been updated by cperciva:
URL: https://cgit.FreeBSD.org/src/commit/?id=c11fe9fbf45061f56bed316101ca7a8dc4ed8254
commit c11fe9fbf45061f56bed316101ca7a8dc4ed8254
Author: Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2026-03-21 16:00:15 +0000
Commit: Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2026-03-23 17:29:01 +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
(cherry picked from commit 4b29bf721ef09c399f3e4a4ab5ca9f549c5b1550)
---
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