git: 2b6c5f041f29 - main - EC2: Include LLDB in small and builder AMIs

The branch main has been updated by cperciva:

URL: https://cgit.FreeBSD.org/src/commit/?id=2b6c5f041f29523acd34c2a107772f04e3d1f6b3

commit 2b6c5f041f29523acd34c2a107772f04e3d1f6b3
Author:     Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2025-10-06 05:11:34 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2025-10-06 19:40:01 +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
---
 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