diff options
-rw-r--r-- | Makefile.rhelver | 2 | ||||
-rw-r--r-- | kernel-aarch64-debug-rhel.config | 2 | ||||
-rw-r--r-- | kernel-aarch64-rhel.config | 2 | ||||
-rw-r--r-- | kernel-ppc64le-debug-rhel.config | 2 | ||||
-rw-r--r-- | kernel-ppc64le-rhel.config | 2 | ||||
-rw-r--r-- | kernel-s390x-debug-rhel.config | 2 | ||||
-rw-r--r-- | kernel-s390x-rhel.config | 2 | ||||
-rw-r--r-- | kernel-s390x-zfcpdump-rhel.config | 2 | ||||
-rw-r--r-- | kernel-x86_64-debug-rhel.config | 2 | ||||
-rw-r--r-- | kernel-x86_64-rhel.config | 2 | ||||
-rwxr-xr-x | kernel.spec | 46 | ||||
-rw-r--r-- | patch-5.12.0-redhat.patch | 18 | ||||
-rw-r--r-- | sources | 6 |
13 files changed, 51 insertions, 39 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index 9b69d64ce..a9b93933e 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 170 +RHEL_RELEASE = 171 # # Early y+1 numbering diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 48022a439..b9c684871 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -1726,7 +1726,7 @@ CONFIG_FUTEX=y # CONFIG_FW_CACHE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=y -# CONFIG_FW_LOADER_COMPRESS is not set +CONFIG_FW_LOADER_COMPRESS=y # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set CONFIG_FW_LOADER_USER_HELPER=y CONFIG_FW_LOADER=y diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index a8f672ce3..367ece2b0 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -1710,7 +1710,7 @@ CONFIG_FUTEX=y # CONFIG_FW_CACHE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=y -# CONFIG_FW_LOADER_COMPRESS is not set +CONFIG_FW_LOADER_COMPRESS=y # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set CONFIG_FW_LOADER_USER_HELPER=y CONFIG_FW_LOADER=y diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index f13c50c65..ae84b352a 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -1590,7 +1590,7 @@ CONFIG_FUTEX=y # CONFIG_FW_CACHE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=y -# CONFIG_FW_LOADER_COMPRESS is not set +CONFIG_FW_LOADER_COMPRESS=y # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set CONFIG_FW_LOADER_USER_HELPER=y CONFIG_FW_LOADER=y diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 223c4179d..af3730c42 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -1574,7 +1574,7 @@ CONFIG_FUTEX=y # CONFIG_FW_CACHE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=y -# CONFIG_FW_LOADER_COMPRESS is not set +CONFIG_FW_LOADER_COMPRESS=y # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set CONFIG_FW_LOADER_USER_HELPER=y CONFIG_FW_LOADER=y diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 3ee8fbc80..ca88a5d86 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -1590,7 +1590,7 @@ CONFIG_FUTEX=y # CONFIG_FW_CACHE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=y -# CONFIG_FW_LOADER_COMPRESS is not set +CONFIG_FW_LOADER_COMPRESS=y # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set CONFIG_FW_LOADER_USER_HELPER=y CONFIG_FW_LOADER=y diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 9b6d7d555..041fd97d4 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -1574,7 +1574,7 @@ CONFIG_FUTEX=y # CONFIG_FW_CACHE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=y -# CONFIG_FW_LOADER_COMPRESS is not set +CONFIG_FW_LOADER_COMPRESS=y # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set CONFIG_FW_LOADER_USER_HELPER=y CONFIG_FW_LOADER=y diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 15c47108c..1b5200090 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -1586,7 +1586,7 @@ CONFIG_FUTEX=y # CONFIG_FW_CACHE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=y -# CONFIG_FW_LOADER_COMPRESS is not set +CONFIG_FW_LOADER_COMPRESS=y # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set CONFIG_FW_LOADER_USER_HELPER=y CONFIG_FW_LOADER=y diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 2b3558709..4da09c0ca 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -1693,7 +1693,7 @@ CONFIG_FUTEX=y # CONFIG_FW_CACHE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=y -# CONFIG_FW_LOADER_COMPRESS is not set +CONFIG_FW_LOADER_COMPRESS=y # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set CONFIG_FW_LOADER_USER_HELPER=y CONFIG_FW_LOADER=y diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 808dae08b..5d90e6ac7 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -1677,7 +1677,7 @@ CONFIG_FUTEX=y # CONFIG_FW_CACHE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=y -# CONFIG_FW_LOADER_COMPRESS is not set +CONFIG_FW_LOADER_COMPRESS=y # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set CONFIG_FW_LOADER_USER_HELPER=y CONFIG_FW_LOADER=y 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) diff --git a/patch-5.12.0-redhat.patch b/patch-5.12.0-redhat.patch index e4f89e857..5c9542c00 100644 --- a/patch-5.12.0-redhat.patch +++ b/patch-5.12.0-redhat.patch @@ -1325,11 +1325,11 @@ index 90fcddb76f46..f22d7b2608ce 100644 { 0 } }; diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c -index 38369766511c..ceaa197c7547 100644 +index f135a10f582b..99b17b05cab1 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c -@@ -83,7 +83,9 @@ MODULE_DESCRIPTION("Driver for HP Smart Array Controller version " \ - MODULE_SUPPORTED_DEVICE("HP Smart Array Controllers"); +@@ -82,7 +82,9 @@ MODULE_DESCRIPTION("Driver for HP Smart Array Controller version " \ + HPSA_DRIVER_VERSION); MODULE_VERSION(HPSA_DRIVER_VERSION); MODULE_LICENSE("GPL"); +#ifndef CONFIG_RHEL_DIFFERENCES @@ -1338,7 +1338,7 @@ index 38369766511c..ceaa197c7547 100644 static int hpsa_simple_mode; module_param(hpsa_simple_mode, int, S_IRUGO|S_IWUSR); -@@ -145,10 +147,12 @@ static const struct pci_device_id hpsa_pci_device_id[] = { +@@ -144,10 +146,12 @@ static const struct pci_device_id hpsa_pci_device_id[] = { {PCI_VENDOR_ID_HP_3PAR, 0x0075, 0x1590, 0x007D}, {PCI_VENDOR_ID_HP_3PAR, 0x0075, 0x1590, 0x0088}, {PCI_VENDOR_ID_HP, 0x333f, 0x103c, 0x333f}, @@ -1535,10 +1535,10 @@ index 7bd9a4a04ad5..124a65ba4c40 100644 }; MODULE_DEVICE_TABLE(pci, qla4xxx_pci_tbl); diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c -index c53f456fbd09..ea190660c86e 100644 +index a1dacb6e993e..2d751d13a3eb 100644 --- a/drivers/scsi/smartpqi/smartpqi_init.c +++ b/drivers/scsi/smartpqi/smartpqi_init.c -@@ -8313,6 +8313,18 @@ static const struct pci_device_id pqi_pci_id_table[] = { +@@ -8312,6 +8312,18 @@ static const struct pci_device_id pqi_pci_id_table[] = { PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f, 0x19e5, 0xd22c) }, @@ -1557,7 +1557,7 @@ index c53f456fbd09..ea190660c86e 100644 { PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f, PCI_VENDOR_ID_ADAPTEC2, 0x0110) -@@ -8453,6 +8465,10 @@ static const struct pci_device_id pqi_pci_id_table[] = { +@@ -8452,6 +8464,10 @@ static const struct pci_device_id pqi_pci_id_table[] = { PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f, PCI_VENDOR_ID_ADVANTECH, 0x8312) }, @@ -1735,10 +1735,10 @@ index fb7f3193753d..0f91ae3361e6 100644 * * @perf_event_open: diff --git a/include/linux/module.h b/include/linux/module.h -index 59f094fa6f74..28468e91a6a6 100644 +index da4b6fbe8ebe..293730daf96b 100644 --- a/include/linux/module.h +++ b/include/linux/module.h -@@ -372,6 +372,7 @@ struct module { +@@ -369,6 +369,7 @@ struct module { struct module_attribute *modinfo_attrs; const char *version; const char *srcversion; @@ -1,3 +1,3 @@ -SHA512 (linux-5.12-rc3.tar.xz) = 82eff8c34200814cacac68e4613b60a8ec6eebae4cd92f2df22e8ca986742508feabb5539de0e3f96d41bd3aa90cd66035df3ef0af0e7d16c2ea599b66df5dfe -SHA512 (kernel-abi-whitelists-5.12.0-0.rc3.170.tar.bz2) = f0f02b9c740bbce593fb8bb4be813113d2f86e9161b4c34457df63923c951ada1ba0c511a38e452701e96758353e87489b1dba6c14b282631f93e781a5225c9d -SHA512 (kernel-kabi-dw-5.12.0-0.rc3.170.tar.bz2) = 9e113cd418971b7e3a9bf81ba0b60edd79f70394c0de51446d6d0aad0c5f8146f86b55f718a2cecab02e018f08f011306142771981e5ae10d3926e85d7f3617b +SHA512 (linux-20210318git6417f03132a6.tar.xz) = 83ed3ba48702e8342d86968abe6d7ee54d60c006d5fb3e0a614d955134f761e3e186eda912051b1f4cca66621d5189ca3ccb70246547837510672927f476c273 +SHA512 (kernel-abi-whitelists-5.12.0-0.rc3.20210318git6417f03132a6.171.tar.bz2) = d3a47c4dbffa9ac1a2ef65b34fdad638d553da136ed1c3213387db0403094de80fcedec99acddf555cec6d453fabc67a11f5f82349a3de3bb9805a7515d23a8e +SHA512 (kernel-kabi-dw-5.12.0-0.rc3.20210318git6417f03132a6.171.tar.bz2) = 65023579b6585d82b66589bad12e3bece4c2f77836764b98561c2c7b4a8ad92b256f4ab72809c81d03c1ed9e945598d6b896866d33bd9c00c6a80651cbe4375b |