summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-03-19 06:44:40 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2021-03-19 09:17:29 +0100
commit7a0b860e797574adb251fba567ae1e031a313639 (patch)
tree2bdcae67e4a950ab1ffa22009ca413358ce9ce74
parentabf3f82e6d224bce79909d87e8b336534c7b85d2 (diff)
downloadkernel-7a0b860e797574adb251fba567ae1e031a313639.tar.gz
kernel-7a0b860e797574adb251fba567ae1e031a313639.tar.xz
kernel-7a0b860e797574adb251fba567ae1e031a313639.zip
-rwxr-xr-xkernel.spec16
1 files changed, 10 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec
index 89811b238..1d66ba863 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -96,6 +96,8 @@ Summary: The Linux kernel
%endif
# define buildid .local
+%define packager Thorsten 'knurd' Leemhuis https://fedoraproject.org/wiki/Kernel_Vanilla_Repositories
+%define buildid .vanilla.1
%if 0%{?fedora}
@@ -128,7 +130,7 @@ Summary: The Linux kernel
# kernel PAE (only valid for ARM (lpae))
%define with_pae %{?_without_pae: 0} %{?!_without_pae: 1}
# kernel-debug
-%define with_debug %{?_without_debug: 0} %{?!_without_debug: 1}
+%define with_debug %{?_with_debug: 1} %{?!_with_debug: 0}
# kernel-doc
%define with_doc %{?_without_doc: 0} %{?!_without_doc: 1}
# kernel-headers
@@ -141,7 +143,7 @@ Summary: The Linux kernel
# bpf tool
%define with_bpftool %{?_without_bpftool: 0} %{?!_without_bpftool: 1}
# kernel-debuginfo
-%define with_debuginfo %{?_without_debuginfo: 0} %{?!_without_debuginfo: 1}
+%define with_debuginfo %{?_with_debuginfo: 1} %{?!_with_debuginfo: 0}
# Want to build a the vsdo directories installed
%define with_vdso_install %{?_without_vdso_install: 0} %{?!_without_vdso_install: 1}
# kernel-zfcpdump (s390 specific kernel for zfcpdump)
@@ -178,7 +180,7 @@ Summary: The Linux kernel
%define with_cross %{?_with_cross: 1} %{?!_with_cross: 0}
#
# build a release kernel on rawhide
-%define with_release %{?_with_release: 1} %{?!_with_release: 0}
+%define with_release %{?_without_release: 0} %{?!_without_release: 1}
# verbose build, i.e. no silent rules and V=1
%define with_verbose %{?_with_verbose: 1} %{?!_with_verbose: 0}
@@ -196,7 +198,7 @@ Summary: The Linux kernel
%define with_ipaclones %{?_without_ipaclones: 0} %{?!_without_ipaclones: 1}
# Want to build a vanilla kernel build without any non-upstream patches?
-%define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0}
+%define with_vanilla %{?_without_vanilla: 0} %{?!_without_vanilla: 1}
# Set debugbuildsenabled to 1 for production (build separate debug kernels)
# and 0 for rawhide (all kernels are debug kernels).
@@ -268,7 +270,7 @@ Summary: The Linux kernel
%endif
%if %{nopatches}
-%define variant -vanilla
+#define variant -vanilla
%endif
%if !%{debugbuildsenabled}
@@ -756,6 +758,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
@@ -1254,11 +1257,12 @@ ApplyOptionalPatch()
mv linux-20210318git6417f03132a6 linux-%{KVERREL}
cd linux-%{KVERREL}
-cp -a %{SOURCE1} .
+# cp -a %{SOURCE1} .
%if !%{nopatches}
ApplyOptionalPatch patch-%{rpmversion}-redhat.patch
+ApplyOptionalPatch secureboot_merge_fix.patch
%endif
ApplyOptionalPatch linux-kernel-test.patch