diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-06-23 08:38:16 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-06-23 08:38:16 +0200 |
commit | 6d3bc6ea36caa7ca9093fde47cec767fdff96291 (patch) | |
tree | 689c37ba12666912888d329ade52ed35c4fb0c38 /efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch | |
parent | 5cd3738dff6bc2ec9590abe115b120c624ce59d5 (diff) | |
parent | f18819a92bcc92cc7c1311339c0146ec02172ba0 (diff) | |
download | kernel-4.7.0-0.rc4.git1.1.vanilla.knurd.1.fc23.tar.gz kernel-4.7.0-0.rc4.git1.1.vanilla.knurd.1.fc23.tar.xz kernel-4.7.0-0.rc4.git1.1.vanilla.knurd.1.fc23.zip |
Merge remote-tracking branch 'origin/master'kernel-4.7.0-0.rc4.git1.1.vanilla.knurd.1.fc25kernel-4.7.0-0.rc4.git1.1.vanilla.knurd.1.fc24kernel-4.7.0-0.rc4.git1.1.vanilla.knurd.1.fc23kernel-4.7.0-0.rc4.git1.1.vanilla.knurd.1.fc22
Diffstat (limited to 'efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch')
-rw-r--r-- | efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch b/efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch deleted file mode 100644 index 095bea782..000000000 --- a/efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 0081083434db41c15b72eced975da0bd9b80566b Mon Sep 17 00:00:00 2001 -From: Josh Boyer <jwboyer@fedoraproject.org> -Date: Tue, 27 Aug 2013 13:28:43 -0400 -Subject: [PATCH 12/20] efi: Make EFI_SECURE_BOOT_SIG_ENFORCE depend on EFI - -The functionality of the config option is dependent upon the platform being -UEFI based. Reflect this in the config deps. - -Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org> ---- - arch/x86/Kconfig | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig -index 14db458f4774..f6ff0a86d841 100644 ---- a/arch/x86/Kconfig -+++ b/arch/x86/Kconfig -@@ -1735,7 +1735,8 @@ config EFI_MIXED - If unsure, say N. - - config EFI_SECURE_BOOT_SIG_ENFORCE -- def_bool n -+ def_bool n -+ depends on EFI - prompt "Force module signing when UEFI Secure Boot is enabled" - ---help--- - UEFI Secure Boot provides a mechanism for ensuring that the --- -2.4.3 - |