diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2013-08-30 11:32:36 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2013-08-30 11:32:55 -0400 |
| commit | c9d9c5a37e289235f8897d43c5c4f1dcfc5e7a90 (patch) | |
| tree | e2dc3f3af01ec47895411bd40d3e59f8b869496e /kernel.spec | |
| parent | 6db14169b396af2e6f3dd567ce536cd869614e58 (diff) | |
| download | kernel-c9d9c5a37e289235f8897d43c5c4f1dcfc5e7a90.tar.gz kernel-c9d9c5a37e289235f8897d43c5c4f1dcfc5e7a90.tar.xz kernel-c9d9c5a37e289235f8897d43c5c4f1dcfc5e7a90.zip | |
Rework Secure Boot support to use the secure_modules approach
- Drop pekey
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/kernel.spec b/kernel.spec index 4f2f07658..cc05f5ef7 100644 --- a/kernel.spec +++ b/kernel.spec @@ -62,7 +62,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 1 +%global baserelease 4 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -647,8 +647,10 @@ Patch800: crash-driver.patch # crypto/ # secure boot -Patch1000: devel-pekey-secure-boot-20130820.patch -Patch1001: devel-sysrq-secure-boot-20130717.patch +Patch1000: secure-modules.patch +Patch1001: modsign-uefi.patch +Patch1002: sb-hibernate.patch +Patch1003: sysrq-secure-boot.patch # virt + ksm patches @@ -1371,8 +1373,10 @@ ApplyPatch crash-driver.patch # crypto/ # secure boot -ApplyPatch devel-pekey-secure-boot-20130820.patch -ApplyPatch devel-sysrq-secure-boot-20130717.patch +ApplyPatch secure-modules.patch +ApplyPatch modsign-uefi.patch +ApplyPatch sb-hibernate.patch +ApplyPatch sysrq-secure-boot.patch # Assorted Virt Fixes @@ -2243,6 +2247,10 @@ fi # ||----w | # || || %changelog +* Fri Aug 30 2013 Josh Boyer <jwboyer@fedoraproject.org> +- Rework Secure Boot support to use the secure_modules approach +- Drop pekey + * Thu Aug 29 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.11.0-0.rc7.git2.1 - Linux v3.11-rc7-24-gc95389b - Add mei patches that fix various s/r issues (rhbz 994824 989373) |