From d0cec25c97c85b8839894e0e107b17826140da38 Mon Sep 17 00:00:00 2001 From: Scott Weaver Date: Tue, 12 Sep 2023 08:27:19 -0400 Subject: [PATCH] kernel-5.14.0-365.el9 * Tue Sep 12 2023 Scott Weaver [5.14.0-365.el9] - redhat/self-test: Remove rpmlint test (Prarit Bhargava) - redhat: shellcheck script fixes (Prarit Bhargava) - redhat/self-test: Clean up tests that do not work in CS9/RHEL9 (Prarit Bhargava) - redhat/self-test/data: Rework data (Prarit Bhargava) - redhat/kernel.spec.template: update compression variables to support zstd (Brian Masney) [RHEL-2376] - kernel.spec.template: Add global compression variables (Brian Masney) [RHEL-2376] - platform/x86/intel/tpmi: Add debugfs interface (David Arcari) [2177011] - platform/x86/intel/tpmi: Read feature control status (David Arcari) [2177011] - redhat/configs: enable CONFIG_INTEL_TPMI (David Arcari) [2177011] - platform/x86/intel/tpmi: Prevent overflow for cap_offset (David Arcari) [2177011] - platform/x86/intel: tpmi: Remove hardcoded unit and offset (David Arcari) [2177011] - platform/x86/intel: tpmi: Revise the comment of intel_vsec_add_aux (David Arcari) [2177011] - platform/x86/intel: tpmi: Fix double free in tpmi_create_device() (David Arcari) [2177011] - platform/x86/intel/tpmi: Fix double free reported by Smatch (David Arcari) [2177011] - platform/x86/intel/tpmi: ADD tpmi external interface for tpmi feature drivers (David Arcari) [2177011] - platform/x86/intel/tpmi: Process CPU package mapping (David Arcari) [2177011] - platform/x86/intel: Intel TPMI enumeration driver (David Arcari) [2177011] Resolves: rhbz#2177011, RHEL-2376 Signed-off-by: Scott Weaver --- Makefile.rhelver | 2 +- kernel-x86_64-debug-rhel.config | 1 + kernel-x86_64-rhel.config | 1 + kernel-x86_64-rt-debug-rhel.config | 1 + kernel-x86_64-rt-rhel.config | 1 + kernel.spec | 37 ++++++++++++++++++++++++------ mod-sign.sh | 2 +- process_configs.sh | 4 +++- sources | 6 ++--- update_scripts.sh | 2 +- 10 files changed, 43 insertions(+), 14 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 773136f..0a049a8 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 4 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 364 +RHEL_RELEASE = 365 # # ZSTREAM diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index f727dd6..f5dea74 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -2420,6 +2420,7 @@ CONFIG_INTEL_TH_MSU=m CONFIG_INTEL_TH_PCI=m CONFIG_INTEL_TH_PTI=m CONFIG_INTEL_TH_STH=m +CONFIG_INTEL_TPMI=m CONFIG_INTEL_TURBO_MAX_3=y CONFIG_INTEL_TXT=y CONFIG_INTEL_UNCORE_FREQ_CONTROL=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 404b3eb..2029e49 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -2404,6 +2404,7 @@ CONFIG_INTEL_TH_MSU=m CONFIG_INTEL_TH_PCI=m CONFIG_INTEL_TH_PTI=m CONFIG_INTEL_TH_STH=m +CONFIG_INTEL_TPMI=m CONFIG_INTEL_TURBO_MAX_3=y CONFIG_INTEL_TXT=y CONFIG_INTEL_UNCORE_FREQ_CONTROL=m diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index 6aa26ce..497f333 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -2473,6 +2473,7 @@ CONFIG_INTEL_TH_MSU=m CONFIG_INTEL_TH_PCI=m CONFIG_INTEL_TH_PTI=m CONFIG_INTEL_TH_STH=m +CONFIG_INTEL_TPMI=m CONFIG_INTEL_TURBO_MAX_3=y CONFIG_INTEL_TXT=y CONFIG_INTEL_UNCORE_FREQ_CONTROL=m diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index d384132..912e8dc 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -2457,6 +2457,7 @@ CONFIG_INTEL_TH_MSU=m CONFIG_INTEL_TH_PCI=m CONFIG_INTEL_TH_PTI=m CONFIG_INTEL_TH_STH=m +CONFIG_INTEL_TPMI=m CONFIG_INTEL_TURBO_MAX_3=y CONFIG_INTEL_TXT=y CONFIG_INTEL_UNCORE_FREQ_CONTROL=m diff --git a/kernel.spec b/kernel.spec index 34f2ffd..0cb696d 100755 --- a/kernel.spec +++ b/kernel.spec @@ -130,8 +130,12 @@ Summary: The Linux kernel %global efiuki 0 %endif +# Default compression algorithm +%global compression xz +%global compression_flags --compress +%global compext xz %if %{zipmodules} -%global zipsed -e 's/\.ko$/\.ko.xz/' +%global zipsed -e 's/\.ko$/\.ko.%compext/' # for parallel xz processes, replace with 1 to go back to single process %endif @@ -161,15 +165,15 @@ Summary: The Linux kernel # define buildid .local %define specversion 5.14.0 %define patchversion 5.14 -%define pkgrelease 364 +%define pkgrelease 365 %define kversion 5 -%define tarfile_release 5.14.0-364.el9 +%define tarfile_release 5.14.0-365.el9 # This is needed to do merge window version magic %define patchlevel 14 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 364%{?buildid}%{?dist} +%define specrelease 365%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 5.14.0-364.el9 +%define kabiversion 5.14.0-365.el9 # # End of genspec.sh variables @@ -649,7 +653,7 @@ Provides: installonlypkg(kernel) # List the packages used during the kernel build # BuildRequires: kmod, bash, coreutils, tar, git-core, which -BuildRequires: bzip2, xz, findutils, gzip, m4, perl-interpreter, perl-Carp, perl-devel, perl-generators, make, diffutils, gawk +BuildRequires: bzip2, xz, findutils, gzip, m4, perl-interpreter, perl-Carp, perl-devel, perl-generators, make, diffutils, gawk, %compression BuildRequires: gcc, binutils, redhat-rpm-config, hmaccalc, bison, flex, gcc-c++ BuildRequires: net-tools, hostname, bc, elfutils-devel BuildRequires: dwarves @@ -2841,7 +2845,7 @@ find Documentation -type d | xargs chmod u+w fi \ if [ "%{zipmodules}" -eq "1" ]; then \ echo "Compressing kernel modules ..." \ - find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -n 16 -P${RPM_BUILD_NCPUS} -r xz; \ + find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -n 16 -P${RPM_BUILD_NCPUS} -r %compression %compression_flags; \ fi \ %{nil} @@ -3755,6 +3759,25 @@ fi # # %changelog +* Tue Sep 12 2023 Scott Weaver [5.14.0-365.el9] +- redhat/self-test: Remove rpmlint test (Prarit Bhargava) +- redhat: shellcheck script fixes (Prarit Bhargava) +- redhat/self-test: Clean up tests that do not work in CS9/RHEL9 (Prarit Bhargava) +- redhat/self-test/data: Rework data (Prarit Bhargava) +- redhat/kernel.spec.template: update compression variables to support zstd (Brian Masney) [RHEL-2376] +- kernel.spec.template: Add global compression variables (Brian Masney) [RHEL-2376] +- platform/x86/intel/tpmi: Add debugfs interface (David Arcari) [2177011] +- platform/x86/intel/tpmi: Read feature control status (David Arcari) [2177011] +- redhat/configs: enable CONFIG_INTEL_TPMI (David Arcari) [2177011] +- platform/x86/intel/tpmi: Prevent overflow for cap_offset (David Arcari) [2177011] +- platform/x86/intel: tpmi: Remove hardcoded unit and offset (David Arcari) [2177011] +- platform/x86/intel: tpmi: Revise the comment of intel_vsec_add_aux (David Arcari) [2177011] +- platform/x86/intel: tpmi: Fix double free in tpmi_create_device() (David Arcari) [2177011] +- platform/x86/intel/tpmi: Fix double free reported by Smatch (David Arcari) [2177011] +- platform/x86/intel/tpmi: ADD tpmi external interface for tpmi feature drivers (David Arcari) [2177011] +- platform/x86/intel/tpmi: Process CPU package mapping (David Arcari) [2177011] +- platform/x86/intel: Intel TPMI enumeration driver (David Arcari) [2177011] + * Fri Sep 08 2023 Scott Weaver [5.14.0-364.el9] - arm64: dts: qcom: sa8775p: add the PMU node (Lucas Karpinski) [RHEL-1730] - scsi: st: Add third party poweron reset handling (John Meneghini) [2210024] diff --git a/mod-sign.sh b/mod-sign.sh index c5f0c89..535bd59 100755 --- a/mod-sign.sh +++ b/mod-sign.sh @@ -19,7 +19,7 @@ NPROC=$(nproc) [ -z "$NPROC" ] && NPROC=1 # NB: this loop runs 2000+ iterations. Try to be fast. -echo "$modules" | xargs -r -n16 -P $NPROC sh -c " +echo "$modules" | xargs -r -n16 -P "$NPROC" sh -c " for mod; do ./scripts/sign-file sha256 $MODSECKEY $MODPUBKEY \$mod rm -f \$mod.sig \$mod.dig diff --git a/process_configs.sh b/process_configs.sh index 2db76ea..22d1e2c 100755 --- a/process_configs.sh +++ b/process_configs.sh @@ -311,12 +311,14 @@ function process_configs() process_config "$cfg" "$count" fi process_config "$cfg" "$count" & + # shellcheck disable=SC2004 waitpids[${count}]=$! ((count++)) while [ "$(jobs | grep -c Running)" -ge "$RHJOBS" ]; do :; done done + # shellcheck disable=SC2048 for pid in ${waitpids[*]}; do - wait ${pid} + wait "${pid}" done rm "$SCRIPT_DIR"/*.config*.old diff --git a/sources b/sources index 852ef5f..e529a7e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.14.0-364.el9.tar.xz) = 0bf95f123b45c19b89801e4651aea1c6469cbe9bb5ce730dbe34767882f7ae60d6d4e3bb357a49ca00393d2e03cde023d4f8ecbe134a93c4f0b51d109de84f08 -SHA512 (kernel-abi-stablelists-5.14.0-364.el9.tar.bz2) = a427271491eeaa1898ade39deea27f3a0e149ab24ef8ce53c534f9ee3d1e33ba634df25bd71fad0373577639a59a4642dfa17abbd4bab01b06d561d77987c4f2 -SHA512 (kernel-kabi-dw-5.14.0-364.el9.tar.bz2) = df42afdca90719e0b6116d90aaed09a5322a3272eee3618f74f543ad4f1129aa4ce065cac0bbfb9ad2988f59f1205c17b75841d6f956627800d7dbdec94ab481 +SHA512 (linux-5.14.0-365.el9.tar.xz) = c366137d17ac127c2bf6f4c6f99ff11c5120945772d105872382d2f43d74515668a0cd40fc7881487cd38a536b669f9f2c46ae3889bb61ce4661deba74c52024 +SHA512 (kernel-abi-stablelists-5.14.0-365.el9.tar.bz2) = 6d73468784811277a8b643339093907d2f4e8e1f63c6a0759f07d0a78fb34fedd90fe8c7bbf7280dbcb42d5a4988da86a2ec557a0b6f2d8487b0fdc5e4090d2c +SHA512 (kernel-kabi-dw-5.14.0-365.el9.tar.bz2) = df42afdca90719e0b6116d90aaed09a5322a3272eee3618f74f543ad4f1129aa4ce065cac0bbfb9ad2988f59f1205c17b75841d6f956627800d7dbdec94ab481 diff --git a/update_scripts.sh b/update_scripts.sh index 38e6634..5dce4fa 100755 --- a/update_scripts.sh +++ b/update_scripts.sh @@ -7,6 +7,6 @@ fi TARGET="$1" for i in "$RPM_SOURCE_DIR"/*."$TARGET"; do - NEW=${i%.$TARGET} + NEW=${i%."$TARGET"} cp "$i" "$(basename "$NEW")" done