summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2013-03-06 20:08:30 -0500
committerJosh Boyer <jwboyer@redhat.com>2013-03-06 20:08:30 -0500
commit2ff05084e67e2ce30f4714a38c34c8a1d5e9659d (patch)
tree45458ae62b807e112a51fc8b998bd5529c3b2061 /kernel.spec
parentbb07d251d0768dfb9dc837d2077e4dcdcb6f1a9d (diff)
downloadkernel-2ff05084e67e2ce30f4714a38c34c8a1d5e9659d.tar.gz
kernel-2ff05084e67e2ce30f4714a38c34c8a1d5e9659d.tar.xz
kernel-2ff05084e67e2ce30f4714a38c34c8a1d5e9659d.zip
Adjust secure-boot patchset to work with boot_params sanitizing
- Don't clear efi_info in boot_params (rhbz 918408)
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec11
1 files changed, 6 insertions, 5 deletions
diff --git a/kernel.spec b/kernel.spec
index 554845949..05966b430 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -658,7 +658,7 @@ Patch800: crash-driver.patch
# crypto/
# secure boot
-Patch1000: devel-pekey-secure-boot-20130227.patch
+Patch1000: devel-pekey-secure-boot-20130306.patch
# virt + ksm patches
@@ -1366,8 +1366,11 @@ ApplyPatch crash-driver.patch
# crypto/
+#rhbz 918408
+ApplyPatch x86-bootparams-dont-clear-efi_info.patch
+
# secure boot
-ApplyPatch devel-pekey-secure-boot-20130227.patch
+ApplyPatch devel-pekey-secure-boot-20130306.patch
# Assorted Virt Fixes
@@ -1438,9 +1441,6 @@ ApplyPatch intel_pstate-Fix-intel_pstate_init-error-path.patch
#rhbz 917984
ApplyPatch efi-fixes.patch
-#rhbz 918408
-ApplyPatch x86-bootparams-dont-clear-efi_info.patch
-
# END OF PATCH APPLICATIONS
%endif
@@ -2283,6 +2283,7 @@ fi
# || ||
%changelog
* Wed Mar 06 2013 Josh Boyer <jwboyer@redhat.com>
+- Adjust secure-boot patchset to work with boot_params sanitizing
- Don't clear efi_info in boot_params (rhbz 918408)
* Wed Mar 06 2013 Peter Robinson <pbrobinson@fedoraproject.org>