From nobody Sat Mar 21 16:10:32 2026 X-Original-To: dev-commits-src-main@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 4fdPY50wrlz6VfJk for ; Sat, 21 Mar 2026 16:10:33 +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 4fdPY50TBKz3c44 for ; Sat, 21 Mar 2026 16:10:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774109433; 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=88AUtlBER41eM6fPxh3GJWk9d9AWn9dPVpHU6DBrVao=; b=WarXyT/jOI7DA7fQ0tKRAGM3SO7nr/AYXS4DzrJ01gwiJvCzb2TuVgnAzmvdF3rM/idglV OVt/ZFLFLnPZ4ePKuepGIGWOLe9UuIhVhFSRrg02ElHUn3XhYNNUCpXzMzJHS6mWXrWGqJ zEhIioG2t0gkF1GdOTT94MIXKyHCdryMSBfCtg9hNRAhM8GTUcaA/ljQcHtze6bMd373mG 6mB/os9gITD8ENOyXT3vl93XcrejfADp3kZCG6TsjKpw+yintdoGD1BY3ISj73ZW+r7vUA uM1pTobdyWNBoNlX5t76MhFWK/Gu1j53U3a/3YaqzFCzsiBqVmt5Jnf+9o0iSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774109433; a=rsa-sha256; cv=none; b=OrIqR44xaL9AX/XoiZGPSkBN6Pc4MpWNln5Z2d8aouvx2M/ZRZ1WAmif9nyUtVSjfwIKl9 VM5leulWp6OKHpGpq63DoFQ/rQtM4H7MnBBCuKvtHv/JBh4XyDJZur3qUukjk5Q7FBWPqu 8LroA4Os1093J8pMe+AYWV1m7x4TvFqK8Q23FnOivD1PvBSf1yPbtlr6JGH7A5nyk+4Die PlzRI9wFAYxfJkXZS2xpQ/404jJZ0l7WvP11CrmrV6xSMO1+Tm/DlGnhji+jeYOqBVHf8y p0S83dOWs1FQ8LXAIKLJrN0/N9wsMtPzaEjJu4ipqAZ8Nr4PR5JA9VehhI+w5g== 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=1774109433; 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=88AUtlBER41eM6fPxh3GJWk9d9AWn9dPVpHU6DBrVao=; b=sgjgIqDZM7k0iFSCObJuIZl8sL93M5FfycviLk9F/U3JG3C1FGuYvWKnKxOOXuzKHM9780 iMKONw7ji5RBMjw4gOopvDl8KoLhYK80W3Jggigv4ddHfPut21+tQWLvtR9VJG8EgXhms8 0//GJEKv5P/0Re+sWW//2slf46b7kX2K8q2luSDFSCOlAZrzyxKH+mIOfSrU5ltu3STRCJ vc1l81Tdjm5LtwhzlYspS62yvXmld534rDl6jk4Ia0xhLaqidyJY3sRjs4Z3Lf/v4JkXqx p+JqsU6ec/rvM+fEGmUfXzwCCfH2PEKhyCEaatmaeJoHqtIauW6kj4AS4Ga+bA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fdPY472fRz45D for ; Sat, 21 Mar 2026 16:10:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 247d7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Mar 2026 16:10:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: cfe0b7d37e55 - main - EC2: Add clibs-lib32 pkg to small/builder images List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: cfe0b7d37e552d78762c029f5b15e0f36d9d0d38 Auto-Submitted: auto-generated Date: Sat, 21 Mar 2026 16:10:32 +0000 Message-Id: <69bec2f8.247d7.ef68596@gitrepo.freebsd.org> The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=cfe0b7d37e552d78762c029f5b15e0f36d9d0d38 commit cfe0b7d37e552d78762c029f5b15e0f36d9d0d38 Author: Colin Percival AuthorDate: 2026-03-20 00:24:55 +0000 Commit: Colin Percival CommitDate: 2026-03-21 16:09:03 +0000 EC2: Add clibs-lib32 pkg to small/builder images The FreeBSD-clang package on amd64 contains libclang_rt.asan-i386.so, which links to the 32-bit version of libgcc_s.so.1. It is not clear if that file belongs in FreeBSD-clang or if it should be placed into a different package. For unknown reasons, pkg *sometimes* recognizes this and decides that it needs to install a package to supply libgcc_s.so.1:32. In particular, when we initially install the VM with 'pkg install [long list of FreeBSD-* packages]', pkg does not recognize that it wants this; but the *next* time 'pkg install' runs, it decides that it needs libgcc_s.so.1:32 -- even though that particular library is not needed by the particular package we're trying to install -- and goes looking for it... and ends up picking gcc12-devel as a provider. Later in the EC2 image building process, we run 'pkg autoremove' (which was added during 15.0 to get rid of the "bogus dependencies" which were added while installing other packages) and pkg is once again confused: It decides that gcc12-devel is an automatic port which is not required by anything else, but upon determining that it should be removed it then determines that FreeBSD-clang depends upon a port which is being removed and deletes FreeBSD-clang as well. It's not clear what is breaking in pkg, but as a temporary workaround add the FreeBSD-clibs-lib32 package to the "small" and "builder" EC2 image flavours in order to satisfy the libgcc_s.so.1 demand. This commit should be reverted if libclang_rt.asan-i386.so moves out of FreeBSD-clang, (i.e. if it becomes possible to install a 32-bit-free amd64 system) or when the pkg issue is resolved (i.e. pkg consistently recognizes the shared library dependency and installs clibs-lib32 automatically as a FreeBSD-clang dependency). MFC after: 3 days Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D55978 --- release/tools/ec2-builder.conf | 1 + release/tools/ec2-small.conf | 1 + 2 files changed, 2 insertions(+) diff --git a/release/tools/ec2-builder.conf b/release/tools/ec2-builder.conf index 3b0344f9eb9a..a272ea49a426 100644 --- a/release/tools/ec2-builder.conf +++ b/release/tools/ec2-builder.conf @@ -17,6 +17,7 @@ vm_extra_filter_base_packages() { -e '.*-dbg$' \ -e '.*-lib32$' \ -e '^FreeBSD-set-tests' + echo FreeBSD-clibs-lib32 } # Packages to install into the image we're creating. In addition to packages diff --git a/release/tools/ec2-small.conf b/release/tools/ec2-small.conf index 6564a59c2cf6..c1a05f98356f 100644 --- a/release/tools/ec2-small.conf +++ b/release/tools/ec2-small.conf @@ -20,6 +20,7 @@ vm_extra_filter_base_packages() { -e '.*-dbg$' \ -e '.*-lib32$' \ -e '^FreeBSD-set-tests' + echo FreeBSD-clibs-lib32 } # Packages to install into the image we're creating. In addition to packages