From fb9a0d094f2c21fc8772d32f3d781789db46fe9a Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Sun, 27 Aug 2023 19:46:09 -0500 Subject: [PATCH] kernel-6.5.0-57 * Mon Aug 28 2023 Fedora Kernel Team [6.5.0-57.eln130] - Linux v6.5.0 Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel.spec | 23 +++++++++++++++++------ patch-6.5-redhat.patch | 2 +- sources | 6 +++--- 4 files changed, 22 insertions(+), 11 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 931d6835d..945b2fca7 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 = 54 +RHEL_RELEASE = 57 # # RHEL_REBASE_NUM diff --git a/kernel.spec b/kernel.spec index 0220b1a3f..0f176e104 100644 --- a/kernel.spec +++ b/kernel.spec @@ -120,6 +120,7 @@ Summary: The Linux kernel # Default compression algorithm %global compression xz +%global compression_flags --compress %global compext xz %if %{zipmodules} %global zipsed -e 's/\.ko$/\.ko.%compext/' @@ -162,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.5.0 %define specversion 6.5.0 %define patchversion 6.5 -%define pkgrelease 0.rc7.20230825git4f9e7fabf864.54 +%define pkgrelease 57 %define kversion 6 -%define tarfile_release 6.5-rc7-104-g4f9e7fabf864 +%define tarfile_release 6.5 # This is needed to do merge window version magic %define patchlevel 5 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc7.20230825git4f9e7fabf864.54%{?buildid}%{?dist} +%define specrelease 57%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.5.0 @@ -659,7 +660,7 @@ Provides: installonlypkg(kernel) # List the packages used during the kernel build # BuildRequires: kmod, bash, coreutils, tar, git-core, which -BuildRequires: bzip2, xz, findutils, m4, perl-interpreter, perl-Carp, perl-devel, perl-generators, make, diffutils, gawk +BuildRequires: bzip2, xz, findutils, 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 @@ -2115,7 +2116,7 @@ BuildKernel() { # NOTENOTE: checksums to the rpm metadata provides list. # NOTENOTE: if you change the symvers name, update the backend too echo "**** GENERATING kernel ABI metadata ****" - %compression -c9 < Module.symvers > $RPM_BUILD_ROOT/boot/symvers-$KernelVer.%compext + %compression --stdout %compression_flags < Module.symvers > $RPM_BUILD_ROOT/boot/symvers-$KernelVer.%compext cp $RPM_BUILD_ROOT/boot/symvers-$KernelVer.%compext $RPM_BUILD_ROOT/lib/modules/$KernelVer/symvers.%compext %if %{with_kabichk} @@ -2824,7 +2825,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 %compression; \ + find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -n 16 -P${RPM_BUILD_NCPUS} -r %compression %compression_flags; \ fi \ %{nil} @@ -3713,6 +3714,16 @@ fi\ # # %changelog +* Mon Aug 28 2023 Fedora Kernel Team [6.5.0-57.eln130] +- Linux v6.5.0 + +* Sun Aug 27 2023 Fedora Kernel Team [6.5.0-0.rc7.28f20a19294d.56.eln130] +- Linux v6.5.0-0.rc7.28f20a19294d + +* Sat Aug 26 2023 Fedora Kernel Team [6.5.0-0.rc7.7d2f353b2682.55.eln130] +- redhat/kernel.spec.template: update compression variables to support zstd (Brian Masney) +- Linux v6.5.0-0.rc7.7d2f353b2682 + * Fri Aug 25 2023 Fedora Kernel Team [6.5.0-0.rc7.4f9e7fabf864.54.eln130] - Linux v6.5.0-0.rc7.4f9e7fabf864 diff --git a/patch-6.5-redhat.patch b/patch-6.5-redhat.patch index 0bd0411b5..c791c10ff 100644 --- a/patch-6.5-redhat.patch +++ b/patch-6.5-redhat.patch @@ -120,7 +120,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index 4739c21a63e2..0aa6a17b6941 100644 +index 2fdd8b40b7e0..42e68b77b932 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ diff --git a/sources b/sources index 1f9d0dc24..c873ebeda 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.5-rc7-104-g4f9e7fabf864.tar.xz) = da12f37c3cc0b0965c376e72b0dbcab8e3e9270cab9342bab764c0e4b10b6e3879ec74d3fbec41b2e21c9097fda3a7e4de91f50d37a22a31d2e5cfea2e0e9786 -SHA512 (kernel-abi-stablelists-6.5.0.tar.bz2) = 040282524a1797b4ecc1fe82439d08ea0cae6837bc5518fc28fa528a88fece1fe5c690ea5cf1f2ac195d8a6ec2fea53beb33abbdd74f9ed8d57cbf96384e8d96 -SHA512 (kernel-kabi-dw-6.5.0.tar.bz2) = 27b9085fc75e54c331fc4e54b17e7045cec83b8c399910697f0369fd21b655b7c8b84faef4c3aa41754a75c3cb867c5fc83d85bb766d752f737402c1c6a34ec5 +SHA512 (linux-6.5.tar.xz) = a95de013fcf667d300b38f9b8ec9b744b922404389437bd5508d33340a0de9e047d12525b70b5341cd760e7877761d59f7c89a44d15238365a2a033d5c85dd36 +SHA512 (kernel-abi-stablelists-6.5.0.tar.bz2) = 2d661551aefa33068c871d35770648a90e4b3f11727d20f1c34c44a210e5e862b3a68a0b63e8923c2455467acffdc2b58f24f44def86387b589b35bc2a130035 +SHA512 (kernel-kabi-dw-6.5.0.tar.bz2) = 2ff74a4ec08bfdf01f32136206e657763212515d31babb5fe61e2d857e417d29a2b6a778c2eeb572d289c93df8d834c7ec419c464d9eb5b7d8fa0ef94a3a9d3a