From 043d16bb7748f419ec62913774632933c1933acb Mon Sep 17 00:00:00 2001 From: Patrick Talbert Date: Tue, 15 Mar 2022 13:30:59 +0000 Subject: [PATCH] kernel-5.14.0-72.el9 * Tue Mar 15 2022 Patrick Talbert [5.14.0-72.el9] - spec: Fix separate tools build (Jiri Olsa) [2054579] - redhat: use centos x509.genkey file if building under centos (Herton R. Krzesinski) [2029952] Resolves: rhbz#2029952, rhbz#2054579 Signed-off-by: Patrick Talbert --- Makefile.rhelver | 2 +- Module.kabi_aarch64 | 29 ------------------ Module.kabi_ppc64le | 31 ------------------- Module.kabi_s390x | 28 ------------------ Module.kabi_x86_64 | 31 ------------------- kernel-aarch64-debug-rhel.config | 3 +- kernel-aarch64-rhel.config | 3 +- kernel-ppc64le-debug-rhel.config | 3 +- kernel-ppc64le-rhel.config | 3 +- kernel-s390x-debug-rhel.config | 3 +- kernel-s390x-rhel.config | 3 +- kernel-s390x-zfcpdump-rhel.config | 3 +- kernel-x86_64-debug-rhel.config | 4 +-- kernel-x86_64-rhel.config | 4 +-- kernel.spec | 49 ++++++++++++++++++++++++++----- sources | 6 ++-- x509.genkey.centos | 16 ++++++++++ 17 files changed, 73 insertions(+), 148 deletions(-) create mode 100644 x509.genkey.centos diff --git a/Makefile.rhelver b/Makefile.rhelver index 8c0409a..3059e33 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 1 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 71 +RHEL_RELEASE = 72 # # Early y+1 numbering diff --git a/Module.kabi_aarch64 b/Module.kabi_aarch64 index d32379e..e69de29 100644 --- a/Module.kabi_aarch64 +++ b/Module.kabi_aarch64 @@ -1,29 +0,0 @@ -0x63c4d61f __bitmap_weight vmlinux EXPORT_SYMBOL -0x68f31cbd __list_add_valid vmlinux EXPORT_SYMBOL -0x6b2dc060 dump_stack vmlinux EXPORT_SYMBOL -0x3854774b kstrtoll vmlinux EXPORT_SYMBOL -0x449ad0a7 memcmp vmlinux EXPORT_SYMBOL -0x4829a47e memcpy vmlinux EXPORT_SYMBOL -0x5a9f1d63 memmove vmlinux EXPORT_SYMBOL -0x27864d57 memparse vmlinux EXPORT_SYMBOL -0xdcb764ad memset vmlinux EXPORT_SYMBOL -0x0b742fd7 simple_strtol vmlinux EXPORT_SYMBOL -0x61b7b126 simple_strtoull vmlinux EXPORT_SYMBOL -0x656e4a6e snprintf vmlinux EXPORT_SYMBOL -0x3c3ff9fd sprintf vmlinux EXPORT_SYMBOL -0xbcab6ee6 sscanf vmlinux EXPORT_SYMBOL -0x349cba85 strchr vmlinux EXPORT_SYMBOL -0xe2d5255a strcmp vmlinux EXPORT_SYMBOL -0xe914e41e strcpy vmlinux EXPORT_SYMBOL -0xf9c0b663 strlcat vmlinux EXPORT_SYMBOL -0x5792f848 strlcpy vmlinux EXPORT_SYMBOL -0x98cf60b3 strlen vmlinux EXPORT_SYMBOL -0x5a921311 strncmp vmlinux EXPORT_SYMBOL -0x9166fada strncpy vmlinux EXPORT_SYMBOL -0x24428be5 strncpy_from_user vmlinux EXPORT_SYMBOL -0xa916b694 strnlen vmlinux EXPORT_SYMBOL -0x9f984513 strrchr vmlinux EXPORT_SYMBOL -0x85df9b6c strsep vmlinux EXPORT_SYMBOL -0x1e6d26a8 strstr vmlinux EXPORT_SYMBOL -0x9ea53d7f vsnprintf vmlinux EXPORT_SYMBOL -0xac94e86b vsprintf vmlinux EXPORT_SYMBOL diff --git a/Module.kabi_ppc64le b/Module.kabi_ppc64le index 5b02d1b..e69de29 100644 --- a/Module.kabi_ppc64le +++ b/Module.kabi_ppc64le @@ -1,31 +0,0 @@ -0x63c4d61f __bitmap_weight vmlinux EXPORT_SYMBOL -0x68f31cbd __list_add_valid vmlinux EXPORT_SYMBOL -0x13c49cc2 _copy_from_user vmlinux EXPORT_SYMBOL -0x6b10bee1 _copy_to_user vmlinux EXPORT_SYMBOL -0x6b2dc060 dump_stack vmlinux EXPORT_SYMBOL -0x3854774b kstrtoll vmlinux EXPORT_SYMBOL -0x1c3e02e4 memcmp vmlinux EXPORT_SYMBOL -0x4829a47e memcpy vmlinux EXPORT_SYMBOL -0x5a9f1d63 memmove vmlinux EXPORT_SYMBOL -0x27864d57 memparse vmlinux EXPORT_SYMBOL -0xdcb764ad memset vmlinux EXPORT_SYMBOL -0x0b742fd7 simple_strtol vmlinux EXPORT_SYMBOL -0x61b7b126 simple_strtoull vmlinux EXPORT_SYMBOL -0x656e4a6e snprintf vmlinux EXPORT_SYMBOL -0x3c3ff9fd sprintf vmlinux EXPORT_SYMBOL -0xbcab6ee6 sscanf vmlinux EXPORT_SYMBOL -0x349cba85 strchr vmlinux EXPORT_SYMBOL -0xe2d5255a strcmp vmlinux EXPORT_SYMBOL -0xe914e41e strcpy vmlinux EXPORT_SYMBOL -0xf9c0b663 strlcat vmlinux EXPORT_SYMBOL -0x5792f848 strlcpy vmlinux EXPORT_SYMBOL -0x98cf60b3 strlen vmlinux EXPORT_SYMBOL -0x5a921311 strncmp vmlinux EXPORT_SYMBOL -0x9166fada strncpy vmlinux EXPORT_SYMBOL -0x24428be5 strncpy_from_user vmlinux EXPORT_SYMBOL -0xa916b694 strnlen vmlinux EXPORT_SYMBOL -0x9f984513 strrchr vmlinux EXPORT_SYMBOL -0x85df9b6c strsep vmlinux EXPORT_SYMBOL -0x1e6d26a8 strstr vmlinux EXPORT_SYMBOL -0x9ea53d7f vsnprintf vmlinux EXPORT_SYMBOL -0xac94e86b vsprintf vmlinux EXPORT_SYMBOL diff --git a/Module.kabi_s390x b/Module.kabi_s390x index de0f9a5..e69de29 100644 --- a/Module.kabi_s390x +++ b/Module.kabi_s390x @@ -1,28 +0,0 @@ -0x63c4d61f __bitmap_weight vmlinux EXPORT_SYMBOL -0x68f31cbd __list_add_valid vmlinux EXPORT_SYMBOL -0x6b2dc060 dump_stack vmlinux EXPORT_SYMBOL -0x3854774b kstrtoll vmlinux EXPORT_SYMBOL -0x2fa5a500 memcmp vmlinux EXPORT_SYMBOL -0x236c8c64 memcpy vmlinux EXPORT_SYMBOL -0xa3a5be95 memmove vmlinux EXPORT_SYMBOL -0x27864d57 memparse vmlinux EXPORT_SYMBOL -0xde0bdcff memset vmlinux EXPORT_SYMBOL -0x0b742fd7 simple_strtol vmlinux EXPORT_SYMBOL -0x61b7b126 simple_strtoull vmlinux EXPORT_SYMBOL -0x98de1c15 snprintf vmlinux EXPORT_SYMBOL -0x3c3ff9fd sprintf vmlinux EXPORT_SYMBOL -0xbcab6ee6 sscanf vmlinux EXPORT_SYMBOL -0x349cba85 strchr vmlinux EXPORT_SYMBOL -0xe2d5255a strcmp vmlinux EXPORT_SYMBOL -0xe914e41e strcpy vmlinux EXPORT_SYMBOL -0x6d1ea6ec strlcat vmlinux EXPORT_SYMBOL -0x672144bd strlcpy vmlinux EXPORT_SYMBOL -0x25ec1b28 strlen vmlinux EXPORT_SYMBOL -0x85abc85f strncmp vmlinux EXPORT_SYMBOL -0xad4aee39 strncpy vmlinux EXPORT_SYMBOL -0x9b8d07aa strnlen vmlinux EXPORT_SYMBOL -0x9f984513 strrchr vmlinux EXPORT_SYMBOL -0x85df9b6c strsep vmlinux EXPORT_SYMBOL -0x1e6d26a8 strstr vmlinux EXPORT_SYMBOL -0x9c0821ea vsnprintf vmlinux EXPORT_SYMBOL -0xac94e86b vsprintf vmlinux EXPORT_SYMBOL diff --git a/Module.kabi_x86_64 b/Module.kabi_x86_64 index 3507a82..e69de29 100644 --- a/Module.kabi_x86_64 +++ b/Module.kabi_x86_64 @@ -1,31 +0,0 @@ -0x63c4d61f __bitmap_weight vmlinux EXPORT_SYMBOL -0x68f31cbd __list_add_valid vmlinux EXPORT_SYMBOL -0x13c49cc2 _copy_from_user vmlinux EXPORT_SYMBOL -0x6b10bee1 _copy_to_user vmlinux EXPORT_SYMBOL -0x6b2dc060 dump_stack vmlinux EXPORT_SYMBOL -0x3854774b kstrtoll vmlinux EXPORT_SYMBOL -0x449ad0a7 memcmp vmlinux EXPORT_SYMBOL -0x69acdf38 memcpy vmlinux EXPORT_SYMBOL -0xb0e602eb memmove vmlinux EXPORT_SYMBOL -0x27864d57 memparse vmlinux EXPORT_SYMBOL -0xfb578fc5 memset vmlinux EXPORT_SYMBOL -0x0b742fd7 simple_strtol vmlinux EXPORT_SYMBOL -0x61b7b126 simple_strtoull vmlinux EXPORT_SYMBOL -0x656e4a6e snprintf vmlinux EXPORT_SYMBOL -0x3c3ff9fd sprintf vmlinux EXPORT_SYMBOL -0xbcab6ee6 sscanf vmlinux EXPORT_SYMBOL -0x349cba85 strchr vmlinux EXPORT_SYMBOL -0xe2d5255a strcmp vmlinux EXPORT_SYMBOL -0xe914e41e strcpy vmlinux EXPORT_SYMBOL -0xf9c0b663 strlcat vmlinux EXPORT_SYMBOL -0x5792f848 strlcpy vmlinux EXPORT_SYMBOL -0x754d539c strlen vmlinux EXPORT_SYMBOL -0x5a921311 strncmp vmlinux EXPORT_SYMBOL -0x9166fada strncpy vmlinux EXPORT_SYMBOL -0x8522d6bc strncpy_from_user vmlinux EXPORT_SYMBOL -0xa916b694 strnlen vmlinux EXPORT_SYMBOL -0x9f984513 strrchr vmlinux EXPORT_SYMBOL -0x85df9b6c strsep vmlinux EXPORT_SYMBOL -0x1e6d26a8 strstr vmlinux EXPORT_SYMBOL -0x9ea53d7f vsnprintf vmlinux EXPORT_SYMBOL -0xac94e86b vsprintf vmlinux EXPORT_SYMBOL diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index abd2a5f..c6ce575 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -2227,7 +2227,6 @@ CONFIG_INTEL_IDXD=m # CONFIG_INTEL_LDMA is not set # CONFIG_INTEL_MEI_HDCP is not set # CONFIG_INTEL_MEI_TXE is not set -CONFIG_INTEL_PCH_THERMAL=m # CONFIG_INTEL_PMC_CORE is not set # CONFIG_INTEL_PMT_CLASS is not set # CONFIG_INTEL_PMT_CRASHLOG is not set @@ -5374,7 +5373,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m # CONFIG_SURFACE3_WMI is not set # CONFIG_SURFACE_GPE is not set # CONFIG_SURFACE_HOTPLUG is not set -CONFIG_SURFACE_PLATFORMS=y +# CONFIG_SURFACE_PLATFORMS is not set # CONFIG_SURFACE_PRO3_BUTTON is not set CONFIG_SUSPEND=y CONFIG_SWAP=y diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index cc3527a..d5e7a59 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -2211,7 +2211,6 @@ CONFIG_INTEL_IDXD=m # CONFIG_INTEL_LDMA is not set # CONFIG_INTEL_MEI_HDCP is not set # CONFIG_INTEL_MEI_TXE is not set -CONFIG_INTEL_PCH_THERMAL=m # CONFIG_INTEL_PMC_CORE is not set # CONFIG_INTEL_PMT_CLASS is not set # CONFIG_INTEL_PMT_CRASHLOG is not set @@ -5350,7 +5349,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m # CONFIG_SURFACE3_WMI is not set # CONFIG_SURFACE_GPE is not set # CONFIG_SURFACE_HOTPLUG is not set -CONFIG_SURFACE_PLATFORMS=y +# CONFIG_SURFACE_PLATFORMS is not set # CONFIG_SURFACE_PRO3_BUTTON is not set CONFIG_SUSPEND=y CONFIG_SWAP=y diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index d32fdcf..74054b4 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -2053,7 +2053,6 @@ CONFIG_INTEL_IDXD=m # CONFIG_INTEL_LDMA is not set # CONFIG_INTEL_MEI_HDCP is not set # CONFIG_INTEL_MEI_TXE is not set -CONFIG_INTEL_PCH_THERMAL=m # CONFIG_INTEL_PMC_CORE is not set # CONFIG_INTEL_PMT_CLASS is not set # CONFIG_INTEL_PMT_CRASHLOG is not set @@ -5149,7 +5148,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m # CONFIG_SURFACE3_WMI is not set # CONFIG_SURFACE_GPE is not set # CONFIG_SURFACE_HOTPLUG is not set -CONFIG_SURFACE_PLATFORMS=y +# CONFIG_SURFACE_PLATFORMS is not set # CONFIG_SURFACE_PRO3_BUTTON is not set CONFIG_SUSPEND_FREEZER=y CONFIG_SUSPEND=y diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index c8441cf..713d817 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -2037,7 +2037,6 @@ CONFIG_INTEL_IDXD=m # CONFIG_INTEL_LDMA is not set # CONFIG_INTEL_MEI_HDCP is not set # CONFIG_INTEL_MEI_TXE is not set -CONFIG_INTEL_PCH_THERMAL=m # CONFIG_INTEL_PMC_CORE is not set # CONFIG_INTEL_PMT_CLASS is not set # CONFIG_INTEL_PMT_CRASHLOG is not set @@ -5129,7 +5128,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m # CONFIG_SURFACE3_WMI is not set # CONFIG_SURFACE_GPE is not set # CONFIG_SURFACE_HOTPLUG is not set -CONFIG_SURFACE_PLATFORMS=y +# CONFIG_SURFACE_PLATFORMS is not set # CONFIG_SURFACE_PRO3_BUTTON is not set CONFIG_SUSPEND_FREEZER=y CONFIG_SUSPEND=y diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index c82fdd4..5401440 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -2037,7 +2037,6 @@ CONFIG_INTEL_IDXD=m # CONFIG_INTEL_LDMA is not set # CONFIG_INTEL_MEI_HDCP is not set # CONFIG_INTEL_MEI_TXE is not set -CONFIG_INTEL_PCH_THERMAL=m # CONFIG_INTEL_PMC_CORE is not set # CONFIG_INTEL_PMT_CLASS is not set # CONFIG_INTEL_PMT_CRASHLOG is not set @@ -5096,7 +5095,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m # CONFIG_SURFACE3_WMI is not set # CONFIG_SURFACE_GPE is not set # CONFIG_SURFACE_HOTPLUG is not set -CONFIG_SURFACE_PLATFORMS=y +# CONFIG_SURFACE_PLATFORMS is not set # CONFIG_SURFACE_PRO3_BUTTON is not set CONFIG_SUSPEND=y CONFIG_SWAP=y diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 918627c..a09c41b 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -2021,7 +2021,6 @@ CONFIG_INTEL_IDXD=m # CONFIG_INTEL_LDMA is not set # CONFIG_INTEL_MEI_HDCP is not set # CONFIG_INTEL_MEI_TXE is not set -CONFIG_INTEL_PCH_THERMAL=m # CONFIG_INTEL_PMC_CORE is not set # CONFIG_INTEL_PMT_CLASS is not set # CONFIG_INTEL_PMT_CRASHLOG is not set @@ -5076,7 +5075,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m # CONFIG_SURFACE3_WMI is not set # CONFIG_SURFACE_GPE is not set # CONFIG_SURFACE_HOTPLUG is not set -CONFIG_SURFACE_PLATFORMS=y +# CONFIG_SURFACE_PLATFORMS is not set # CONFIG_SURFACE_PRO3_BUTTON is not set CONFIG_SUSPEND=y CONFIG_SWAP=y diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index cc98516..ac50ebc 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -2033,7 +2033,6 @@ CONFIG_INTEL_IDXD=m # CONFIG_INTEL_LDMA is not set # CONFIG_INTEL_MEI_HDCP is not set # CONFIG_INTEL_MEI_TXE is not set -CONFIG_INTEL_PCH_THERMAL=m # CONFIG_INTEL_PMC_CORE is not set # CONFIG_INTEL_PMT_CLASS is not set # CONFIG_INTEL_PMT_CRASHLOG is not set @@ -5101,7 +5100,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m # CONFIG_SURFACE3_WMI is not set # CONFIG_SURFACE_GPE is not set # CONFIG_SURFACE_HOTPLUG is not set -CONFIG_SURFACE_PLATFORMS=y +# CONFIG_SURFACE_PLATFORMS is not set # CONFIG_SURFACE_PRO3_BUTTON is not set CONFIG_SUSPEND=y # CONFIG_SWAP is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 4b787cf..8bb07e1 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -2199,7 +2199,7 @@ CONFIG_INTEL_MEI_ME=m CONFIG_INTEL_MEI_WDT=m # CONFIG_INTEL_MENLOW is not set CONFIG_INTEL_OAKTRAIL=m -# CONFIG_INTEL_PCH_THERMAL is not set +CONFIG_INTEL_PCH_THERMAL=m CONFIG_INTEL_PMC_CORE=m CONFIG_INTEL_PMT_CLASS=m CONFIG_INTEL_PMT_CRASHLOG=m @@ -5330,7 +5330,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m # CONFIG_SURFACE3_WMI is not set # CONFIG_SURFACE_GPE is not set # CONFIG_SURFACE_HOTPLUG is not set -CONFIG_SURFACE_PLATFORMS=y +# CONFIG_SURFACE_PLATFORMS is not set # CONFIG_SURFACE_PRO3_BUTTON is not set CONFIG_SUSPEND=y CONFIG_SWAP=y diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index eafafac..b7cbc06 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -2183,7 +2183,7 @@ CONFIG_INTEL_MEI_ME=m CONFIG_INTEL_MEI_WDT=m # CONFIG_INTEL_MENLOW is not set CONFIG_INTEL_OAKTRAIL=m -# CONFIG_INTEL_PCH_THERMAL is not set +CONFIG_INTEL_PCH_THERMAL=m CONFIG_INTEL_PMC_CORE=m CONFIG_INTEL_PMT_CLASS=m CONFIG_INTEL_PMT_CRASHLOG=m @@ -5307,7 +5307,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m # CONFIG_SURFACE3_WMI is not set # CONFIG_SURFACE_GPE is not set # CONFIG_SURFACE_HOTPLUG is not set -CONFIG_SURFACE_PLATFORMS=y +# CONFIG_SURFACE_PLATFORMS is not set # CONFIG_SURFACE_PRO3_BUTTON is not set CONFIG_SUSPEND=y CONFIG_SWAP=y diff --git a/kernel.spec b/kernel.spec index c6ac268..51cd29e 100755 --- a/kernel.spec +++ b/kernel.spec @@ -79,7 +79,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 -%global distro_build 71 +%global distro_build 72 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -123,13 +123,13 @@ Summary: The Linux kernel %define kversion 5.14 %define rpmversion 5.14.0 -%define pkgrelease 71.el9 +%define pkgrelease 72.el9 # This is needed to do merge window version magic %define patchlevel 14 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 71%{?buildid}%{?dist} +%define specrelease 72%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -678,7 +678,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.14.0-71.el9.tar.xz +Source0: linux-5.14.0-72.el9.tar.xz Source1: Makefile.rhelver @@ -740,6 +740,8 @@ Source37: filter-aarch64.sh.rhel Source38: filter-ppc64le.sh.rhel Source39: filter-s390x.sh.rhel Source40: filter-modules.sh.rhel + +Source41: x509.genkey.centos %endif %if 0%{?include_fedora} @@ -839,7 +841,8 @@ Provides: kernel-drm-nouveau = 16\ Provides: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\ Requires(pre): %{kernel_prereq}\ Requires(pre): %{initrd_prereq}\ -Requires(pre): linux-firmware >= 20150904-56.git6ebf5d57\ +Requires(pre): ((linux-firmware >= 20150904-56.git6ebf5d57) if linux-firmware)\ +Recommends: linux-firmware\ Requires(preun): systemd >= 200\ Conflicts: xfsprogs < 4.3.0-1\ Conflicts: xorg-x11-drv-vmmouse < 13.0.99\ @@ -1345,8 +1348,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14.0-71.el9 -c -mv linux-5.14.0-71.el9 linux-%{KVERREL} +%setup -q -n kernel-5.14.0-72.el9 -c +mv linux-5.14.0-72.el9 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -1460,6 +1463,18 @@ done cp %{SOURCE82} . RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target} +# We may want to override files from the primary target in case of building +# against a flavour of it (eg. centos not rhel), thus override it here if +# necessary +if [ "%{primary_target}" == "rhel" ]; then +%if 0%{?centos} + echo "Updating scripts/sources to centos version" + RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh centos +%else + echo "Not updating scripts/sources to centos version" +%endif +fi + # end of kernel config %endif @@ -2216,6 +2231,14 @@ popd # in the source tree. We installed them previously to $RPM_BUILD_ROOT/usr # but there's no way to tell the Makefile to take them from there. %{make} %{?_smp_mflags} headers_install + +# If we re building only tools without kernel, we need to generate config +# headers and prepare tree for modules building. The modules_prepare target +# will cover both. +if [ ! -f include/generated/autoconf.h ]; then + %{make} %{?_smp_mflags} modules_prepare +fi + %{make} %{?_smp_mflags} ARCH=$Arch V=1 M=samples/bpf/ # Prevent bpf selftests to build bpftool repeatedly: @@ -2945,6 +2968,10 @@ fi # # %changelog +* Tue Mar 15 2022 Patrick Talbert [5.14.0-72.el9] +- spec: Fix separate tools build (Jiri Olsa) [2054579] +- redhat: use centos x509.genkey file if building under centos (Herton R. Krzesinski) [2029952] + * Tue Mar 08 2022 Patrick Talbert [5.14.0-71.el9] - CI: Build coverage RPMs on c9s environment (Veronika Kabatova) - md: use default_groups in kobj_type (Nigel Croxon) [2042797] @@ -2972,6 +2999,14 @@ fi - md: add error handling support for add_disk() (Nigel Croxon) [2042797] - redhat: Bump RHEL_MINOR for 9.1 (Patrick Talbert) +* Tue Mar 08 2022 Herton R. Krzesinski [5.14.0-70.1.1.el9_0] +- Revert 8dffe2b6 "Merge: kabi: add lib ACKed symbols" (Čestmír Kalina) [2059972] +- include/linux/kernel.h: fix function name for mark_hardware_unmaintained() if !CONFIG_RHEL_DIFFERENCES (Ewan D. Milne) [2059687] +- scsi: sd: Mark ZBC host-managed SCSI disks as unmaintained (Ewan D. Milne) [2059687] +- spec: make linux-firmware weak(er) dependency (Jan Stancek) [2031113] +- redhat/configs: Enable CONFIG_INTEL_PCH_THERMAL for x86 (David Arcari) [2058186] +- redhat/configs: Disable CONFIG_SURFACE_PLATFORMS (David Arcari) [2056609] + * Thu Feb 24 2022 Herton R. Krzesinski [5.14.0-70.el9] - stmmac/intel: mark driver as tech preview (Mark Salter) [2045594] - net: stmmac: Add GFP_DMA32 for rx buffers if no 64 capability (Mark Salter) [2045594] diff --git a/sources b/sources index 6586940..5ddfff5 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.14.0-71.el9.tar.xz) = d2dd71d0b27e74169f04ec4a6bd58535e7423409982c8ee4c6b07823c1dbe2ec94dabc9dfeb065464b555dc457297d9b7e40e643e3b952fae255f9eab3045f53 -SHA512 (kernel-abi-stablelists-5.14.0-71.tar.bz2) = 8a5669bebeb75a42e80b4667a36c67a08790252513d990cdc37248d9c1bf3d683bdb83f0de65af3dc1ef3185a982f718e4269bfc3ab6b8fc95ae9a2ab9d24197 -SHA512 (kernel-kabi-dw-5.14.0-71.tar.bz2) = b07e3d6617cc434bf03eb165691b8b64418260e0a97bf3da3959aa03d142ff345c94b4a0f0856246d2b2c6a6a713fd6495e9f2cb73244cf4cfc5a4b7525e7674 +SHA512 (linux-5.14.0-72.el9.tar.xz) = a15f0ebc463fab16009872f0cdce150617e862ab2c1dc700647376e301b8edb79798ad2b48b625d1c71f323c985ccaea83b414240557ba6bc0b0b422c144ea2a +SHA512 (kernel-abi-stablelists-5.14.0-72.tar.bz2) = f99b4f0a59abd3dcbeb568705c182a4bb5b3cf862651dba766ca8c20fb5a27e4a2b15ab2244cd11b3d37f838c627b2c0e4aaa4ebcd06a197837f7a2426c990af +SHA512 (kernel-kabi-dw-5.14.0-72.tar.bz2) = b07e3d6617cc434bf03eb165691b8b64418260e0a97bf3da3959aa03d142ff345c94b4a0f0856246d2b2c6a6a713fd6495e9f2cb73244cf4cfc5a4b7525e7674 diff --git a/x509.genkey.centos b/x509.genkey.centos new file mode 100644 index 0000000..c91af3b --- /dev/null +++ b/x509.genkey.centos @@ -0,0 +1,16 @@ +[ req ] +default_bits = 3072 +distinguished_name = req_distinguished_name +prompt = no +x509_extensions = myexts + +[ req_distinguished_name ] +O = The CentOS Project +CN = CentOS Stream kernel signing key +emailAddress = security@centos.org + +[ myexts ] +basicConstraints=critical,CA:FALSE +keyUsage=digitalSignature +subjectKeyIdentifier=hash +authorityKeyIdentifier=keyid