Revert "vmimage.subr: pkg autoremove after pkg install"
This reverts commit 6a13aeac3c.
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
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user