From nobody Fri Oct 10 04:46:52 2025 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 4cjZ306CdBz6BGWN; Fri, 10 Oct 2025 04:46:52 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cjZ305ZGxz3D05; Fri, 10 Oct 2025 04:46:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760071612; 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=Q9UjtBVhbd5Bj39ENnbTTDqmNt9cSqiNmSQR0fxcXHE=; b=UBXfjp7QYzorVIMnoNuEMVAAdHHXANEFGU+9c1vT29KnTF+3DoEq8uj3Az9L/+3LddHSAg mj+ME+S68gRzz8Tts8kGqW06I6cQc77W2GN5TeYJc7lpMyDCjHimk7BY+emcjyNTw0cxRI s1L4aqH+xOU64TlDPXzgy8ix9gQo37K2auce8bbUFccN5VEsYb9HHn37mKTJpL4ZWFjeWI TP7PiSV+h2jwooOCn+6VpiCmvsj340bZqzRQe41B9mUOf5r4k8qFG0MwS1FW1grU3wpgyR /2v1nPbEM97xES2CE5Aw/w3ADphnX42qRa3fEzrTvO8PqvGFwqMFNyMG2jxapg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760071612; 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=Q9UjtBVhbd5Bj39ENnbTTDqmNt9cSqiNmSQR0fxcXHE=; b=q81qXOGVpjmnfSSaTlxeniyCSCZW4Mq3QjlPHWbg+D9rK514mDKJ3LQTaUGKd656ZaKhhj uGj7cRUaaYdnwJ6excdauYfUDiWaESdGD/fAyWIISoZBrlWC4l+l7Fg7qX/nGILUxeLWEu ZUGwBX2D8UlkQ+nwCJ3wjF9p9SCdRDf2q4dpdveSU4I2YSBu+2aXqKRL3mT4/kQ0q/ioyV d0rRg/7tXhDzYKLpmv3ZLAXPdHBqGXMkaiOYrKMWPHS/wAr1+VzdL+iZCMoQdbZCDx12Ux cR5Y01VOusKxIQIoaIeD1tD58lFMSazLoWF3AW9ATZq/3A9Y9hhrAIt/p3v2gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760071612; a=rsa-sha256; cv=none; b=crHYPJWXyrxlA9BcWZHpeHRhBR0RlQmex8R6bJuulwhp67UYVkIpP+5g6mU83rk8DiwopV Yaoxd4CxSpb/WMhKRpmVuYX52gis4aqxeOuNpmHhwbtlK0UT9tLsmky7hQiDSOieu5lNfl pGKWGV935ire36mGH5J+x9qUeQ+vSt49uBvdo01yNMbcNvGTxBvPA45ne2VLQdZcwheCAO QuLqF6Pin0iFzsw9jdI3meW9AsjV7T6WOKAq75LWP+6DfUYct++WA0S6LlT6dxhXUE/oLp 7BFBjrgieGBYzft0N8GGYkaTp7+mYtWvHfaqJiy+2bPmPnDT34p3FJIBhtzIJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cjZ304lZBznnp; Fri, 10 Oct 2025 04:46:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59A4kqAB098155; Fri, 10 Oct 2025 04:46:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59A4kq4o098152; Fri, 10 Oct 2025 04:46:52 GMT (envelope-from git) Date: Fri, 10 Oct 2025 04:46:52 GMT Message-Id: <202510100446.59A4kq4o098152@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: eba80e6577bd - stable/15 - EC2: Include LLDB in small and builder AMIs 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: eba80e6577bd436dfea036b230933ffebc4dc3d6 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=eba80e6577bd436dfea036b230933ffebc4dc3d6 commit eba80e6577bd436dfea036b230933ffebc4dc3d6 Author: Colin Percival AuthorDate: 2025-10-06 05:11:34 +0000 Commit: Colin Percival CommitDate: 2025-10-10 04:46:43 +0000 EC2: Include LLDB in small and builder AMIs I excluded lldb from the "small" and "builder" flavours of EC2 AMIs because on FreeBSD 14.x the lldb binary was 100 MB, as a result of statically linking in lots of LLVM code; but we now have libprivatellvm as a shared library and lldb is much smaller so there's no significant benefit to excluding it. Reviewed by: ivy MFC after: 3 days Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D52921 (cherry picked from commit 2b6c5f041f29523acd34c2a107772f04e3d1f6b3) --- release/tools/ec2-builder.conf | 7 +++---- release/tools/ec2-small.conf | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/release/tools/ec2-builder.conf b/release/tools/ec2-builder.conf index cf4276fc80ec..36837fd86f9c 100644 --- a/release/tools/ec2-builder.conf +++ b/release/tools/ec2-builder.conf @@ -7,17 +7,16 @@ export VMSIZE=8000m # Flags to installworld/kernel: We don't want debug symbols (kernel or -# userland), 32-bit libraries, tests, or the debugger. +# userland), 32-bit libraries, or tests. export INSTALLOPTS="WITHOUT_DEBUG_FILES=YES WITHOUT_KERNEL_SYMBOLS=YES \ - WITHOUT_LIB32=YES WITHOUT_TESTS=YES WITHOUT_LLDB=YES" + WITHOUT_LIB32=YES WITHOUT_TESTS=YES" # Equivalent to INSTALLOPTS for pkgbase vm_extra_filter_base_packages() { grep -v \ -e '.*-dbg$' \ -e '.*-lib32$' \ - -e '^FreeBSD-tests.*' \ - -e '^FreeBSD-lldb.*' + -e '^FreeBSD-tests.*' } # 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 32d02cbb79e4..9b64c215d8a5 100644 --- a/release/tools/ec2-small.conf +++ b/release/tools/ec2-small.conf @@ -10,17 +10,16 @@ export VMSIZE=5000m # Flags to installworld/kernel: We don't want debug symbols (kernel or -# userland), 32-bit libraries, tests, or the debugger. +# userland), 32-bit libraries, or tests. export INSTALLOPTS="WITHOUT_DEBUG_FILES=YES WITHOUT_KERNEL_SYMBOLS=YES \ - WITHOUT_LIB32=YES WITHOUT_TESTS=YES WITHOUT_LLDB=YES" + WITHOUT_LIB32=YES WITHOUT_TESTS=YES" # Equivalent to INSTALLOPTS for pkgbase vm_extra_filter_base_packages() { grep -v \ -e '.*-dbg$' \ -e '.*-lib32$' \ - -e '^FreeBSD-tests.*' \ - -e '^FreeBSD-lldb.*' + -e '^FreeBSD-tests.*' } # Packages to install into the image we're creating. In addition to packages