diff options
| -rwxr-xr-x | kernel.spec | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/kernel.spec b/kernel.spec index f85143867..074c47d9d 100755 --- a/kernel.spec +++ b/kernel.spec @@ -96,6 +96,8 @@ Summary: The Linux kernel %endif # define buildid .local +%define packager Thorsten Leemhuis https://fedoraproject.org/wiki/Kernel_Vanilla_Repositories +%define buildid .vanilla.1 %if 0%{?fedora} @@ -103,16 +105,17 @@ Summary: The Linux kernel %else %define primary_target rhel %endif +%define fedorabase 5.11.15 %define rpmversion 5.11.16 %define stableversion 5.11 -%define pkgrelease 100 +%define pkgrelease 150 # This is needed to do merge window version magic %define patchlevel 11 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 100%{?buildid}%{?dist} +%define specrelease 150%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -129,7 +132,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 @@ -142,7 +145,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) @@ -179,7 +182,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} @@ -197,7 +200,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). @@ -269,7 +272,7 @@ Summary: The Linux kernel %endif %if %{nopatches} -%define variant -vanilla +#define variant -vanilla %endif %if !%{debugbuildsenabled} @@ -619,6 +622,7 @@ Source1: Makefile.rhelver Source8: x509.genkey.rhel Source9: x509.genkey.fedora +# disabled for vanilla builds %if %{?released_kernel} Source10: redhatsecurebootca5.cer @@ -736,8 +740,8 @@ Source211: Module.kabi_dup_ppc64le Source212: Module.kabi_dup_s390x Source213: Module.kabi_dup_x86_64 -Source300: kernel-abi-whitelists-%{rpmversion}-%{distro_build}.tar.bz2 -Source301: kernel-kabi-dw-%{rpmversion}-%{distro_build}.tar.bz2 +Source300: kernel-abi-whitelists-%{fedorabase}-%{distro_build}.tar.bz2 +Source301: kernel-kabi-dw-%{fedorabase}-%{distro_build}.tar.bz2 # Sources for kernel-tools Source2000: cpupower.service @@ -1255,7 +1259,7 @@ ApplyOptionalPatch() mv linux-5.11.16 linux-%{KVERREL} cd linux-%{KVERREL} -cp -a %{SOURCE1} . +# cp -a %{SOURCE1} . %if !%{nopatches} @@ -1266,6 +1270,8 @@ ApplyOptionalPatch linux-kernel-test.patch # END OF PATCH APPLICATIONS +head Makefile + # Any further pre-build tree manipulations happen here. chmod +x scripts/checkpatch.pl |