From nobody Tue Mar 24 02:47:44 2026 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 4ffvbN5ws2z6VxYr for ; Tue, 24 Mar 2026 02:47:44 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ffvbN5BKPz47F0 for ; Tue, 24 Mar 2026 02:47:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774320464; 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=XXKXHG/aZ1h+JdTvmGXyEQV+bVoefCLtezw1DuOn5S4=; b=cwQ72/842U+CgGuJp5JTgAVBFrLTsJrjGRaPnfBJeA6Ag3fihL1haFtpL84QQvfTXMjllg pgPa/1Bm5k48ixqGRLBBfETG1cq8Cvwooy4P6iPyswYfUwrZeBbC0L+zsWNPzfvS14GleO GFSVvQ82C4rjFfWwHsP9WAH8wuO4yywshhtU5UCsZIOz2xI40LP4T7/oc7koJ5TT2isy9d Jg495o2YqqUZpUCbXthqpG9nU4gtza3K4qvqiwDdr1uCYRjHC91o5UVR+99wkLMTufn69b rW43gpSeolkaC4ovP/jAr/xMbigRNxT49LwqC6zADY45PoqoWZXWCdRmzmbUVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774320464; a=rsa-sha256; cv=none; b=S+jrh4XXAzT4PboXZlNt14NWz42su9tdktL5YzznMpTXzgOniqSJsKoaQ3np4AnIg5eunT OHbbpv5zuyzw2fyWEvXGPQ29kUCYxiWzsZuOvU9mijT7gPFTSy69qWqfCP2bTWylENe/Xz Y8uGt66AtOR/mEsfGzBtZe1Wmd13DmB9UOTCwDYSGnQlGl25P9fyWe+kIH7GiEbbr+V+hC hjw0atsR8gp4sKOfmuMydf1JegGoDPrYzahi47F8AcSb/qIx+KzD67g+qsNbu4VWl+vmyc a3qGnMOQAZN9r1o2PpRMiZeFrS+lOUm59dKIZMnCKx/uArUuQdCjweH6+aRcZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774320464; 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=XXKXHG/aZ1h+JdTvmGXyEQV+bVoefCLtezw1DuOn5S4=; b=CACaq5VuXTSeMilvLq57F1OSnbZOpWdAul9NrLG9QmYTbtcyx5p59Siw4lhWZHGIilHkGf vqoiyvREo3OI4wRmKM5iW8BpDqRvDb4Hgj4A+WrEqywBKmK6Gck4w8LeZefascTgNsKHpQ kxsgc5GEUJZPLLh1CAQVb/+awfM2J+PGmfCuyrC32dPRkfdXPxyDH5xB8LBR17mWo/ju7W w6I9Z/tnwTyOT0f4JS86k2pQor1ftSR068RjezkG9iMHE49+Td7IvyP68kRZt0dUVSyivI Due6mcd8K6a/KttoMowFm/7CNhCboFpQol3QqMAK3EzOV/p4f7XW1ZoZNVLPAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ffvbN4l1Pz1DrJ for ; Tue, 24 Mar 2026 02:47:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21536 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Mar 2026 02:47:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: c11fe9fbf450 - stable/15 - Revert "vmimage.subr: pkg autoremove after pkg install" 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/stable/15 X-Git-Reftype: branch X-Git-Commit: c11fe9fbf45061f56bed316101ca7a8dc4ed8254 Auto-Submitted: auto-generated Date: Tue, 24 Mar 2026 02:47:44 +0000 Message-Id: <69c1fb50.21536.1103805c@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c11fe9fbf45061f56bed316101ca7a8dc4ed8254 commit c11fe9fbf45061f56bed316101ca7a8dc4ed8254 Author: Colin Percival AuthorDate: 2026-03-21 16:00:15 +0000 Commit: Colin Percival 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