summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2021-01-04 12:38:23 -0600
committerJustin M. Forbes <jforbes@fedoraproject.org>2021-01-04 12:38:23 -0600
commitcce64069888d52c5365655bb58dbf4845619c5d3 (patch)
treeba377b8cf7dd7ffa87ad05dbb56fcacb0f99263b /kernel.spec
parenta7f5e8cd7c841fb737893128d30ccc29d52cf4e2 (diff)
downloadkernel-cce64069888d52c5365655bb58dbf4845619c5d3.tar.gz
kernel-cce64069888d52c5365655bb58dbf4845619c5d3.tar.xz
kernel-cce64069888d52c5365655bb58dbf4845619c5d3.zip
Merge fixup for secureboot
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to 'kernel.spec')
-rwxr-xr-xkernel.spec2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index a4c366a2d..5849c4b4f 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -741,6 +741,7 @@ Source4000: README.rst
%if !%{nopatches}
Patch1: patch-%{rpmversion}-redhat.patch
+Patch2: secureboot_merge_fix.patch
%endif
# empty final patch to facilitate testing of kernel patches
@@ -1244,6 +1245,7 @@ cp -a %{SOURCE1} .
%if !%{nopatches}
ApplyOptionalPatch patch-%{rpmversion}-redhat.patch
+ApplyOptionalPatch secureboot_merge_fix.patch
%endif
ApplyOptionalPatch linux-kernel-test.patch