Module Name: src
Committed By: martin
Date: Mon Feb 24 18:02:03 UTC 2025
Modified Files:
src/distrib/sets: sets.subr
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/debug: mi
Log Message:
Provide a new attribute, efi_rt, derived from HAVE_EFI_RT, and use
that to mark sbin/efi.
To generate a diff of this commit:
cvs rdiff -u -r1.209 -r1.210 src/distrib/sets/sets.subr
cvs rdiff -u -r1.1360 -r1.1361 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.464 -r1.465 src/distrib/sets/lists/debug/mi
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.209 src/distrib/sets/sets.subr:1.210
--- src/distrib/sets/sets.subr:1.209 Thu Jul 11 17:27:25 2024
+++ src/distrib/sets/sets.subr Mon Feb 24 18:02:02 2025
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.209 2024/07/11 17:27:25 riastradh Exp $
+# $NetBSD: sets.subr,v 1.210 2025/02/24 18:02:02 martin Exp $
#
#
@@ -23,6 +23,7 @@
# HAVE_OPENSSL
# HAVE_SSP
# HAVE_UEFI
+# HAVE_EFI_RT
# TOOLCHAIN_MISSING
# OBJECT_FMT
# as well as:
@@ -257,7 +258,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.209 2024/07/11 17:27:25 riastradh Exp $
+# # $NetBSD: sets.subr,v 1.210 2025/02/24 18:02:02 martin Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
@@ -295,6 +296,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# nvmm ${HAVE_NVMM} != no
# openssl=<n> <n> = value of ${HAVE_OPENSSL}
# uefi ${HAVE_UEFI} != no
+# efi_rt ${HAVE_EFI_RT} != no
# xorg_server_ver=<n> <n> = value of ${HAVE_XORG_SERVER_VER}
# xorg_glamor ${HAVE_XORG_GLAMOR} != no
#
@@ -444,6 +446,9 @@ list_set_files()
if ("uefi" in wanted) {
wanted["uefi=" "'"${HAVE_UEFI}"'"] = 1
}
+ if ("efi_rt" in wanted) {
+ wanted["efi_rt=" "'"${HAVE_EFI_RT}"'"] = 1
+ }
if (("man" in wanted) && ("catpages" in wanted))
wanted[".cat"] = 1
if (("man" in wanted) && ("manpages" in wanted))
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1360 src/distrib/sets/lists/base/mi:1.1361
--- src/distrib/sets/lists/base/mi:1.1360 Mon Feb 24 18:00:12 2025
+++ src/distrib/sets/lists/base/mi Mon Feb 24 18:02:02 2025
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1360 2025/02/24 18:00:12 martin Exp $
+# $NetBSD: mi,v 1.1361 2025/02/24 18:02:02 martin Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -374,7 +374,7 @@
./sbin/dump_lfs base-sysutil-root
./sbin/dumpfs base-obsolete obsolete
./sbin/dumplfs base-obsolete obsolete
-./sbin/efi base-sysutil-root
+./sbin/efi base-sysutil-root eif_rt
./sbin/fastboot base-sysutil-root
./sbin/fasthalt base-sysutil-root
./sbin/fdiscard base-sysutil-root
Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.464 src/distrib/sets/lists/debug/mi:1.465
--- src/distrib/sets/lists/debug/mi:1.464 Mon Feb 24 13:51:21 2025
+++ src/distrib/sets/lists/debug/mi Mon Feb 24 18:02:02 2025
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.464 2025/02/24 13:51:21 christos Exp $
+# $NetBSD: mi,v 1.465 2025/02/24 18:02:02 martin Exp $
#
./etc/mtree/set.debug comp-sys-root
./usr/lib comp-sys-usr compatdir
@@ -352,7 +352,7 @@
./usr/libdata/debug/sbin/drvctl.debug comp-sysutil-debug debug
./usr/libdata/debug/sbin/dump.debug comp-sysutil-debug debug
./usr/libdata/debug/sbin/dump_lfs.debug comp-sysutil-debug debug
-./usr/libdata/debug/sbin/efi.debug comp-sysutil-debug debug
+./usr/libdata/debug/sbin/efi.debug comp-sysutil-debug debug,efi_rt
./usr/libdata/debug/sbin/fdisk.debug comp-sysutil-debug debug
./usr/libdata/debug/sbin/fsck.debug comp-sysutil-debug debug
./usr/libdata/debug/sbin/fsck_ext2fs.debug comp-ext2fs-debug debug
