diff options
Diffstat (limited to 'kernel.spec')
-rwxr-xr-x | kernel.spec | 46 |
1 files changed, 29 insertions, 17 deletions
diff --git a/kernel.spec b/kernel.spec index 69789743b..89811b238 100755 --- a/kernel.spec +++ b/kernel.spec @@ -64,7 +64,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc3.170 +%global distro_build 0.rc3.20210318git6417f03132a6.171 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -96,8 +96,6 @@ 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} @@ -107,13 +105,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.12.0 -%define pkgrelease 0.rc3.170 +%define pkgrelease 0.rc3.20210318git6417f03132a6.171 # This is needed to do merge window version magic %define patchlevel 12 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.170%{?buildid}%{?dist} +%define specrelease 0.rc3.20210318git6417f03132a6.171%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -130,7 +128,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 %{?_with_debug: 1} %{?!_with_debug: 0} +%define with_debug %{?_without_debug: 0} %{?!_without_debug: 1} # kernel-doc %define with_doc %{?_without_doc: 0} %{?!_without_doc: 1} # kernel-headers @@ -143,7 +141,7 @@ Summary: The Linux kernel # bpf tool %define with_bpftool %{?_without_bpftool: 0} %{?!_without_bpftool: 1} # kernel-debuginfo -%define with_debuginfo %{?_with_debuginfo: 1} %{?!_with_debuginfo: 0} +%define with_debuginfo %{?_without_debuginfo: 0} %{?!_without_debuginfo: 1} # 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) @@ -180,7 +178,7 @@ Summary: The Linux kernel %define with_cross %{?_with_cross: 1} %{?!_with_cross: 0} # # build a release kernel on rawhide -%define with_release %{?_without_release: 0} %{?!_without_release: 1} +%define with_release %{?_with_release: 1} %{?!_with_release: 0} # verbose build, i.e. no silent rules and V=1 %define with_verbose %{?_with_verbose: 1} %{?!_with_verbose: 0} @@ -198,12 +196,12 @@ 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 %{?_without_vanilla: 0} %{?!_without_vanilla: 1} +%define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0} # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 # The kernel tarball/base version %define kversion 5.12 @@ -270,7 +268,7 @@ Summary: The Linux kernel %endif %if %{nopatches} -#define variant -vanilla +%define variant -vanilla %endif %if !%{debugbuildsenabled} @@ -604,7 +602,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.12-rc3.tar.xz +Source0: linux-20210318git6417f03132a6.tar.xz Source1: Makefile.rhelver @@ -758,7 +756,6 @@ 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 @@ -1253,16 +1250,15 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.12-rc3 -c -mv linux-5.12-rc3 linux-%{KVERREL} +%setup -q -n kernel-20210318git6417f03132a6 -c +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 @@ -1590,6 +1586,7 @@ 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 @@ -2470,6 +2467,12 @@ fi\ # %define kernel_variant_posttrans() \ %{expand:%%posttrans %{?1:%{1}-}core}\ +%if 0%{!?fedora:1}\ +if [ -x %{_sbindir}/weak-modules ]\ +then\ + %{_sbindir}/weak-modules --add-kernel %{KVERREL}%{?1:+%{1}} || exit $?\ +fi\ +%endif\ /bin/kernel-install add %{KVERREL}%{?1:+%{1}} /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz || exit $?\ %{nil} @@ -2499,6 +2502,10 @@ 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 @@ -2710,6 +2717,7 @@ 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\ @@ -2756,6 +2764,10 @@ fi # # %changelog +* Thu Mar 18 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.12.0-0.rc3.20210318git6417f03132a6.171] +- Turn off weak-modules for Fedora (Justin M. Forbes) +- redhat: enable CONFIG_FW_LOADER_COMPRESS for ARK (Herton R. Krzesinski) [1939095] + * Mon Mar 15 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.12.0-0.rc3.170] - Fedora: filters: update to move dfl-emif to modules (Peter Robinson) - drop duplicate DEVFREQ_GOV_SIMPLE_ONDEMAND config (Peter Robinson) |