From bec3eecd962faab7187b56c0505fc1a5942879ed Mon Sep 17 00:00:00 2001 From: Julio Faracco Date: Mar 18 2022 19:19:47 +0000 Subject: [redhat] Update sources for linux-5.14.0-72.37.el9.tar.xz Changes included into this commit: .kernel-automotive.metadata SOURCES/Makefile.rhelver SOURCES/kernel-automotive-aarch64-debug-rhel.config SOURCES/kernel-automotive-aarch64-rhel.config SOURCES/kernel-automotive-x86_64-debug-rhel.config SOURCES/kernel-automotive-x86_64-rhel.config SPECS/kernel.spec SOURCES/.gitignore Signed-off-by: Julio Faracco --- diff --git a/.kernel-automotive.metadata b/.kernel-automotive.metadata index 0b0509d..773ca61 100644 --- a/.kernel-automotive.metadata +++ b/.kernel-automotive.metadata @@ -1 +1 @@ -3c56974f9b14460e311eaf02c9f6c76287616039 SOURCES/linux-5.14.0-71.36.el9.tar.xz +e888073f5cc0149d919cc667bd12da63da2fecb5 SOURCES/linux-5.14.0-72.37.el9.tar.xz diff --git a/SOURCES/Makefile.rhelver b/SOURCES/Makefile.rhelver index fc5ce10..bd5ddf4 100644 --- a/SOURCES/Makefile.rhelver +++ b/SOURCES/Makefile.rhelver @@ -12,14 +12,14 @@ RHEL_MINOR = 1 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 71 +RHEL_RELEASE = 72 # # Automotive Release # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -AUTOMOTIVEBUILD:=.36 +AUTOMOTIVEBUILD:=.37 # # Early y+1 numbering @@ -51,4 +51,4 @@ ifneq ("$(ZSTREAM)", "yes") endif endif -RTBUILD:=.71 +RTBUILD:=.72 diff --git a/SOURCES/kernel-automotive-aarch64-debug-rhel.config b/SOURCES/kernel-automotive-aarch64-debug-rhel.config index 4679c32..d2890c8 100644 --- a/SOURCES/kernel-automotive-aarch64-debug-rhel.config +++ b/SOURCES/kernel-automotive-aarch64-debug-rhel.config @@ -2453,7 +2453,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 @@ -5846,7 +5845,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m # CONFIG_SURFACE_AGGREGATOR 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_SKIP_SYNC is not set CONFIG_SUSPEND=y diff --git a/SOURCES/kernel-automotive-aarch64-rhel.config b/SOURCES/kernel-automotive-aarch64-rhel.config index c348dcd..7b80989 100644 --- a/SOURCES/kernel-automotive-aarch64-rhel.config +++ b/SOURCES/kernel-automotive-aarch64-rhel.config @@ -2437,7 +2437,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 @@ -5822,7 +5821,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m # CONFIG_SURFACE_AGGREGATOR 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_SKIP_SYNC is not set CONFIG_SUSPEND=y diff --git a/SOURCES/kernel-automotive-x86_64-debug-rhel.config b/SOURCES/kernel-automotive-x86_64-debug-rhel.config index 89776a0..baa2158 100644 --- a/SOURCES/kernel-automotive-x86_64-debug-rhel.config +++ b/SOURCES/kernel-automotive-x86_64-debug-rhel.config @@ -2295,7 +2295,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 @@ -5481,7 +5481,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_SKIP_SYNC is not set CONFIG_SUSPEND=y diff --git a/SOURCES/kernel-automotive-x86_64-rhel.config b/SOURCES/kernel-automotive-x86_64-rhel.config index a60708c..cd5d90f 100644 --- a/SOURCES/kernel-automotive-x86_64-rhel.config +++ b/SOURCES/kernel-automotive-x86_64-rhel.config @@ -2279,7 +2279,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 @@ -5458,7 +5458,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_SKIP_SYNC is not set CONFIG_SUSPEND=y diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index d8395f3..c263ed2 100755 --- a/SPECS/kernel.spec +++ b/SPECS/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.36.el9 +%define pkgrelease 72.37.el9 # This is needed to do merge window version magic %define patchlevel 14 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 71.36%{?buildid}%{?dist} +%define specrelease 72.37%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -277,7 +277,7 @@ Summary: The Linux kernel %endif %if %{with_automotive} -%global automotivebuild .36 +%global automotivebuild .37 %define with_doc 0 %define with_headers 0 %define with_cross_headers 0 @@ -700,7 +700,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.14.0-71.36.el9.tar.xz +Source0: linux-5.14.0-72.37.el9.tar.xz Source1: Makefile.rhelver @@ -764,6 +764,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} @@ -872,7 +874,8 @@ Provides: kernel-drm-nouveau = 16\ Provides: %{name}-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\ @@ -1407,8 +1410,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14.0-71.36.el9 -c -mv linux-5.14.0-71.36.el9 linux-%{KVERREL} +%setup -q -n kernel-5.14.0-72.37.el9 -c +mv linux-5.14.0-72.37.el9 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -1530,6 +1533,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 @@ -2304,6 +2319,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: