Commit cc1db7f34788 ("Updates for secure boot") and commit 8e8de459e7ba
("Forgot to remove dropped patches") removed the patches that added
Kconfig symbols EFI_SIGNATURE_LIST_PARSER and LOAD_UEFI_KEYS. Remove
these symbols from the configuration generation directory and from the
shipped .config files.
Signed-off-by: Paul Bolle <pebolle@xxxxxxxxxx>
---
configs/fedora/generic/CONFIG_EFI_SIGNATURE_LIST_PARSER | 1 -
configs/fedora/generic/CONFIG_LOAD_UEFI_KEYS | 1 -
configs/fedora/generic/x86/CONFIG_EFI_SIGNATURE_LIST_PARSER | 1 -
configs/fedora/generic/x86/CONFIG_LOAD_UEFI_KEYS | 1 -
kernel-aarch64-debug.config | 2 --
kernel-aarch64.config | 2 --
kernel-armv7hl-debug.config | 2 --
kernel-armv7hl-lpae-debug.config | 2 --
kernel-armv7hl-lpae.config | 2 --
kernel-armv7hl.config | 2 --
kernel-i686-debug.config | 2 --
kernel-i686.config | 2 --
kernel-ppc64le-debug.config | 2 --
kernel-ppc64le.config | 2 --
kernel-s390x-debug.config | 2 --
kernel-s390x.config | 2 --
kernel-x86_64-debug.config | 2 --
kernel-x86_64.config | 2 --
18 files changed, 32 deletions(-)
delete mode 100644 configs/fedora/generic/CONFIG_EFI_SIGNATURE_LIST_PARSER
delete mode 100644 configs/fedora/generic/CONFIG_LOAD_UEFI_KEYS
delete mode 100644 configs/fedora/generic/x86/CONFIG_EFI_SIGNATURE_LIST_PARSER
delete mode 100644 configs/fedora/generic/x86/CONFIG_LOAD_UEFI_KEYS
diff --git a/configs/fedora/generic/CONFIG_EFI_SIGNATURE_LIST_PARSER b/configs/fedora/generic/CONFIG_EFI_SIGNATURE_LIST_PARSER
deleted file mode 100644
index 4c9e08c11cbb..000000000000
--- a/configs/fedora/generic/CONFIG_EFI_SIGNATURE_LIST_PARSER
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_EFI_SIGNATURE_LIST_PARSER is not set
diff --git a/configs/fedora/generic/CONFIG_LOAD_UEFI_KEYS b/configs/fedora/generic/CONFIG_LOAD_UEFI_KEYS
deleted file mode 100644
index de1de5c257d8..000000000000
--- a/configs/fedora/generic/CONFIG_LOAD_UEFI_KEYS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_LOAD_UEFI_KEYS is not set
diff --git a/configs/fedora/generic/x86/CONFIG_EFI_SIGNATURE_LIST_PARSER b/configs/fedora/generic/x86/CONFIG_EFI_SIGNATURE_LIST_PARSER
deleted file mode 100644
index 9671a3c39b96..000000000000
--- a/configs/fedora/generic/x86/CONFIG_EFI_SIGNATURE_LIST_PARSER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EFI_SIGNATURE_LIST_PARSER=y
diff --git a/configs/fedora/generic/x86/CONFIG_LOAD_UEFI_KEYS b/configs/fedora/generic/x86/CONFIG_LOAD_UEFI_KEYS
deleted file mode 100644
index 22502e981748..000000000000
--- a/configs/fedora/generic/x86/CONFIG_LOAD_UEFI_KEYS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_LOAD_UEFI_KEYS=y
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 3d399c78ce20..5fed2fc5719a 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1637,7 +1637,6 @@ CONFIG_EFI_ARMSTUB_DTB_LOADER=y
# CONFIG_EFI_CAPSULE_LOADER is not set
CONFIG_EFI_PARTITION=y
CONFIG_EFI_PGT_DUMP=y
-# CONFIG_EFI_SIGNATURE_LIST_PARSER is not set
# CONFIG_EFI_TEST is not set
CONFIG_EFIVAR_FS=y
CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
@@ -3039,7 +3038,6 @@ CONFIG_LIRC=y
# CONFIG_LLC2 is not set
CONFIG_LLC=m
CONFIG_LMP91000=m
-# CONFIG_LOAD_UEFI_KEYS is not set
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKD=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 914f845a8445..fbfdc5d6bca0 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -1628,7 +1628,6 @@ CONFIG_EFI_ARMSTUB_DTB_LOADER=y
# CONFIG_EFI_CAPSULE_LOADER is not set
CONFIG_EFI_PARTITION=y
# CONFIG_EFI_PGT_DUMP is not set
-# CONFIG_EFI_SIGNATURE_LIST_PARSER is not set
# CONFIG_EFI_TEST is not set
CONFIG_EFIVAR_FS=y
CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
@@ -3020,7 +3019,6 @@ CONFIG_LIRC=y
# CONFIG_LLC2 is not set
CONFIG_LLC=m
CONFIG_LMP91000=m
-# CONFIG_LOAD_UEFI_KEYS is not set
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKD=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index f9edf01e0371..9b2e6f9e20bf 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1720,7 +1720,6 @@ CONFIG_EFI_ARMSTUB_DTB_LOADER=y
# CONFIG_EFI_CAPSULE_LOADER is not set
CONFIG_EFI_PARTITION=y
CONFIG_EFI_PGT_DUMP=y
-# CONFIG_EFI_SIGNATURE_LIST_PARSER is not set
# CONFIG_EFI_TEST is not set
CONFIG_EFIVAR_FS=y
CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
@@ -3173,7 +3172,6 @@ CONFIG_LIRC=y
# CONFIG_LLC2 is not set
CONFIG_LLC=m
CONFIG_LMP91000=m
-# CONFIG_LOAD_UEFI_KEYS is not set
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKD=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 00e3066a05a4..5223125dfc09 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -1633,7 +1633,6 @@ CONFIG_EFI_ARMSTUB_DTB_LOADER=y
# CONFIG_EFI_CAPSULE_LOADER is not set
CONFIG_EFI_PARTITION=y
CONFIG_EFI_PGT_DUMP=y
-# CONFIG_EFI_SIGNATURE_LIST_PARSER is not set
# CONFIG_EFI_TEST is not set
CONFIG_EFIVAR_FS=y
CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
@@ -3035,7 +3034,6 @@ CONFIG_LIRC=y
# CONFIG_LLC2 is not set
CONFIG_LLC=m
CONFIG_LMP91000=m
-# CONFIG_LOAD_UEFI_KEYS is not set
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKD=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index ab54de0d6bef..5161257c84c0 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -1625,7 +1625,6 @@ CONFIG_EFI_ARMSTUB_DTB_LOADER=y
# CONFIG_EFI_CAPSULE_LOADER is not set
CONFIG_EFI_PARTITION=y
# CONFIG_EFI_PGT_DUMP is not set
-# CONFIG_EFI_SIGNATURE_LIST_PARSER is not set
# CONFIG_EFI_TEST is not set
CONFIG_EFIVAR_FS=y
CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
@@ -3017,7 +3016,6 @@ CONFIG_LIRC=y
# CONFIG_LLC2 is not set
CONFIG_LLC=m
CONFIG_LMP91000=m
-# CONFIG_LOAD_UEFI_KEYS is not set
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKD=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 5649ae3e0a2a..1bb8609fb9a6 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1712,7 +1712,6 @@ CONFIG_EFI_ARMSTUB_DTB_LOADER=y
# CONFIG_EFI_CAPSULE_LOADER is not set
CONFIG_EFI_PARTITION=y
# CONFIG_EFI_PGT_DUMP is not set
-# CONFIG_EFI_SIGNATURE_LIST_PARSER is not set
# CONFIG_EFI_TEST is not set
CONFIG_EFIVAR_FS=y
CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
@@ -3155,7 +3154,6 @@ CONFIG_LIRC=y
# CONFIG_LLC2 is not set
CONFIG_LLC=m
CONFIG_LMP91000=m
-# CONFIG_LOAD_UEFI_KEYS is not set
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKD=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 8f5ba86bdc35..a49c7856ab85 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -1455,7 +1455,6 @@ CONFIG_EFI_PARTITION=y
CONFIG_EFI_PCDP=y
CONFIG_EFI_PGT_DUMP=y
CONFIG_EFI_RUNTIME_MAP=y
-CONFIG_EFI_SIGNATURE_LIST_PARSER=y
CONFIG_EFI_STUB=y
# CONFIG_EFI_TEST is not set
CONFIG_EFIVAR_FS=y
@@ -2899,7 +2898,6 @@ CONFIG_LIRC=y
# CONFIG_LLC2 is not set
CONFIG_LLC=m
CONFIG_LMP91000=m
-CONFIG_LOAD_UEFI_KEYS=y
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKD=m
diff --git a/kernel-i686.config b/kernel-i686.config
index 1d65fe70da29..f68d72171fc1 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -1445,7 +1445,6 @@ CONFIG_EFI_PARTITION=y
CONFIG_EFI_PCDP=y
# CONFIG_EFI_PGT_DUMP is not set
CONFIG_EFI_RUNTIME_MAP=y
-CONFIG_EFI_SIGNATURE_LIST_PARSER=y
CONFIG_EFI_STUB=y
# CONFIG_EFI_TEST is not set
CONFIG_EFIVAR_FS=y
@@ -2879,7 +2878,6 @@ CONFIG_LIRC=y
# CONFIG_LLC2 is not set
CONFIG_LLC=m
CONFIG_LMP91000=m
-CONFIG_LOAD_UEFI_KEYS=y
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKD=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index a56e3cd96ec4..c011c70df55b 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -1326,7 +1326,6 @@ CONFIG_EEPROM_LEGACY=m
CONFIG_EEPROM_MAX6875=m
CONFIG_EFI_PARTITION=y
CONFIG_EFI_PGT_DUMP=y
-# CONFIG_EFI_SIGNATURE_LIST_PARSER is not set
# CONFIG_EFI_TEST is not set
# CONFIG_EFS_FS is not set
CONFIG_EHEA=m
@@ -2678,7 +2677,6 @@ CONFIG_LIRC=y
# CONFIG_LLC2 is not set
CONFIG_LLC=m
CONFIG_LMP91000=m
-# CONFIG_LOAD_UEFI_KEYS is not set
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKD=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index b6eaee17c344..99cd546551c4 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -1316,7 +1316,6 @@ CONFIG_EEPROM_LEGACY=m
CONFIG_EEPROM_MAX6875=m
CONFIG_EFI_PARTITION=y
# CONFIG_EFI_PGT_DUMP is not set
-# CONFIG_EFI_SIGNATURE_LIST_PARSER is not set
# CONFIG_EFI_TEST is not set
# CONFIG_EFS_FS is not set
CONFIG_EHEA=m
@@ -2658,7 +2657,6 @@ CONFIG_LIRC=y
# CONFIG_LLC2 is not set
CONFIG_LLC=m
CONFIG_LMP91000=m
-# CONFIG_LOAD_UEFI_KEYS is not set
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKD=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index f0fc0d83150d..88efa4b3857d 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -1325,7 +1325,6 @@ CONFIG_EEPROM_LEGACY=m
CONFIG_EEPROM_MAX6875=m
CONFIG_EFI_PARTITION=y
CONFIG_EFI_PGT_DUMP=y
-# CONFIG_EFI_SIGNATURE_LIST_PARSER is not set
# CONFIG_EFI_TEST is not set
# CONFIG_EFS_FS is not set
# CONFIG_EMBEDDED is not set
@@ -2622,7 +2621,6 @@ CONFIG_LIRC=y
# CONFIG_LLC2 is not set
CONFIG_LLC=m
CONFIG_LMP91000=m
-# CONFIG_LOAD_UEFI_KEYS is not set
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKD=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 09c23c0cfdc7..ab30d0ef6682 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1315,7 +1315,6 @@ CONFIG_EEPROM_LEGACY=m
CONFIG_EEPROM_MAX6875=m
CONFIG_EFI_PARTITION=y
# CONFIG_EFI_PGT_DUMP is not set
-# CONFIG_EFI_SIGNATURE_LIST_PARSER is not set
# CONFIG_EFI_TEST is not set
# CONFIG_EFS_FS is not set
# CONFIG_EMBEDDED is not set
@@ -2602,7 +2601,6 @@ CONFIG_LIRC=y
# CONFIG_LLC2 is not set
CONFIG_LLC=m
CONFIG_LMP91000=m
-# CONFIG_LOAD_UEFI_KEYS is not set
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKD=m
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 874f87271268..f814179ab553 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -1502,7 +1502,6 @@ CONFIG_EFI_PARTITION=y
CONFIG_EFI_PCDP=y
CONFIG_EFI_PGT_DUMP=y
CONFIG_EFI_RUNTIME_MAP=y
-CONFIG_EFI_SIGNATURE_LIST_PARSER=y
CONFIG_EFI_STUB=y
# CONFIG_EFI_TEST is not set
CONFIG_EFIVAR_FS=y
@@ -2953,7 +2952,6 @@ CONFIG_LIRC=y
# CONFIG_LLC2 is not set
CONFIG_LLC=m
CONFIG_LMP91000=m
-CONFIG_LOAD_UEFI_KEYS=y
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKD=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index eccb4dc9efaa..11ce330b2afb 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -1492,7 +1492,6 @@ CONFIG_EFI_PARTITION=y
CONFIG_EFI_PCDP=y
# CONFIG_EFI_PGT_DUMP is not set
CONFIG_EFI_RUNTIME_MAP=y
-CONFIG_EFI_SIGNATURE_LIST_PARSER=y
CONFIG_EFI_STUB=y
# CONFIG_EFI_TEST is not set
CONFIG_EFIVAR_FS=y
@@ -2933,7 +2932,6 @@ CONFIG_LIRC=y
# CONFIG_LLC2 is not set
CONFIG_LLC=m
CONFIG_LMP91000=m
-CONFIG_LOAD_UEFI_KEYS=y
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_LOCKD=m
--
2.17.2
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
