diff options
| -rwxr-xr-x | kernel.spec | 39 | ||||
| -rw-r--r-- | sources | 2 |
2 files changed, 20 insertions, 21 deletions
diff --git a/kernel.spec b/kernel.spec index 6a30a38e2..99799b150 100755 --- a/kernel.spec +++ b/kernel.spec @@ -62,7 +62,7 @@ Summary: The Linux kernel # For rawhide and/or a kernel built from an rc or git snapshot, # released_kernel should be 0. # For a stable, released kernel, released_kernel should be 1. -%global released_kernel 0 +%global released_kernel 1 %global distro_build 300 @@ -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} @@ -107,11 +109,13 @@ Summary: The Linux kernel %define rpmversion 5.11.1 %define pkgrelease 300 +%define vanillabaseversion 5.11.1 + # This is needed to do merge window version magic %define patchlevel 11 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 300%{?buildid}%{?dist} +%define specrelease 350%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -128,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 @@ -141,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) @@ -178,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} @@ -196,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). @@ -268,7 +272,7 @@ Summary: The Linux kernel %endif %if %{nopatches} -%define variant -vanilla +#define variant -vanilla %endif %if !%{debugbuildsenabled} @@ -618,7 +622,9 @@ Source1: Makefile.rhelver Source8: x509.genkey.rhel Source9: x509.genkey.fedora -%if %{?released_kernel} +# disabled for vanilla builds +#if %{?released_kernel} +%if 0 Source10: redhatsecurebootca5.cer Source11: redhatsecurebootca1.cer @@ -756,6 +762,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,15 +1261,17 @@ ApplyOptionalPatch() mv linux-5.11.1 linux-%{KVERREL} cd linux-%{KVERREL} -cp -a %{SOURCE1} . +# cp -a %{SOURCE1} . -%if !%{nopatches} +%if !%{nopatches} ApplyOptionalPatch patch-%{rpmversion}-redhat.patch +ApplyOptionalPatch secureboot_merge_fix.patch %endif ApplyOptionalPatch linux-kernel-test.patch +head Makefile # END OF PATCH APPLICATIONS # Any further pre-build tree manipulations happen here. @@ -1586,7 +1595,6 @@ BuildKernel() { (cd $RPM_BUILD_ROOT/lib/modules/$KernelVer ; ln -s build source) # dirs for additional modules per module-init-tools, kbuild/modules.txt mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/updates - mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/weak-updates # CONFIG_KERNEL_HEADER_TEST generates some extra files in the process of # testing so just delete find . -name *.h.s -delete @@ -2467,10 +2475,6 @@ fi\ # %define kernel_variant_posttrans() \ %{expand:%%posttrans %{?1:%{1}-}core}\ -if [ -x %{_sbindir}/weak-modules ]\ -then\ - %{_sbindir}/weak-modules --add-kernel %{KVERREL}%{?1:+%{1}} || exit $?\ -fi\ /bin/kernel-install add %{KVERREL}%{?1:+%{1}} /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz || exit $?\ %{nil} @@ -2500,10 +2504,6 @@ fi}\ %define kernel_variant_preun() \ %{expand:%%preun %{?1:%{1}-}core}\ /bin/kernel-install remove %{KVERREL}%{?1:+%{1}} /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz || exit $?\ -if [ -x %{_sbindir}/weak-modules ]\ -then\ - %{_sbindir}/weak-modules --remove-kernel %{KVERREL}%{?1:+%{1}} || exit $?\ -fi\ %{nil} %kernel_variant_preun @@ -2715,7 +2715,6 @@ fi /lib/modules/%{KVERREL}%{?3:+%{3}}/source\ /lib/modules/%{KVERREL}%{?3:+%{3}}/updates\ /lib/modules/%{KVERREL}%{?3:+%{3}}/bls.conf\ -/lib/modules/%{KVERREL}%{?3:+%{3}}/weak-updates\ %{_datadir}/doc/kernel-keys/%{KVERREL}%{?3:+%{3}}\ %if %{1}\ /lib/modules/%{KVERREL}%{?3:+%{3}}/vdso\ @@ -1,3 +1,3 @@ -SHA512 (linux-5.11.1.tar.xz) = 64e737d1604737825cb48544b59d756b54707b14e5677cf779592a16f9edc8cc98f76269142ddfe317e9ef032fe95909be02a7dddedf3ae44d4b545a66a404c4 +SHA512 (linux-5.11.1.tar.xz) = 615ec7d06f6ed78a2b283857b5abb7c161ce80d48a9fd1626ed49ba816b28de0023d6a420f8ef0312931bfeed0ab3f8ec1b489baf0dc99d90a35c58252e76561 SHA512 (kernel-abi-whitelists-5.11.1-300.tar.bz2) = 98885f435526b3b3e530fee1b7d1e3be5b2facb794fb294ef6defdfeccd1668d4db65cbf271bbd8bb1d25c3fc184278170a2ab8c79098feb4af4922f57e586ff SHA512 (kernel-kabi-dw-5.11.1-300.tar.bz2) = 3d22e0cda145467de5e12caaa5b22b6b3ab49205d0be632c092ac44a11f36aaa82e3d84bd97d01eef643e05174079b4c292830bad78ae6d4fa55b4f25fa3f675 |