rpms/kernel
8
2
Fork 6
Code Issues Pull Requests Releases Activity

hpsa: bring back deprecated PCI ids #CFHack #CFHack2024

Browse Source 
mptsas: bring back deprecated PCI ids #CFHack #CFHack2024

megaraid_sas: bring back deprecated PCI ids #CFHack #CFHack2024

qla2xxx: bring back deprecated PCI ids #CFHack #CFHack2024

qla4xxx: bring back deprecated PCI ids

lpfc: bring back deprecated PCI ids

be2iscsi: bring back deprecated PCI ids

kernel/rh_messages.h: enable all disabled pci devices by moving to unmaintained

Use AlmaLinux OS secure boot cert

Debrand for AlmaLinux OS
This commit is contained in:
Andrew Lukoshko 2025-02-06 12:47:38 +03:00 committed by eabdullin
commit 4e90f39382
6 changed files with 54 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -1,6 +1,6 @@
SOURCES/kernel-abi-stablelists-5.14.0-503.22.1.el9_5.tar.bz2 SOURCES/kernel-abi-stablelists-5.14.0-503.23.1.el9_5.tar.bz2
SOURCES/kernel-kabi-dw-5.14.0-503.22.1.el9_5.tar.bz2 SOURCES/kernel-kabi-dw-5.14.0-503.23.1.el9_5.tar.bz2
SOURCES/linux-5.14.0-503.22.1.el9_5.tar.xz SOURCES/linux-5.14.0-503.23.1.el9_5.tar.xz
SOURCES/nvidiagpuoot001.x509 SOURCES/nvidiagpuoot001.x509
SOURCES/olima1.x509 SOURCES/olima1.x509
SOURCES/olimaca1.x509 SOURCES/olimaca1.x509

6
.kernel.metadata
View File

@ -1,6 +1,6 @@
846ae6404bfb2ed32e129667182afa7689c06450 SOURCES/kernel-abi-stablelists-5.14.0-503.22.1.el9_5.tar.bz2 55496215370bdd32b7c68cbaac2184a5eaff26ff SOURCES/kernel-abi-stablelists-5.14.0-503.23.1.el9_5.tar.bz2
559b5aaaf11345a745a081dd94d30648b09bdf34 SOURCES/kernel-kabi-dw-5.14.0-503.22.1.el9_5.tar.bz2 920e8782a187ed394bf3761e6ee44ce67dbaf90b SOURCES/kernel-kabi-dw-5.14.0-503.23.1.el9_5.tar.bz2
ddf7fb5c0aaee2f79ae0a3ae0fbe89e832946f2d SOURCES/linux-5.14.0-503.22.1.el9_5.tar.xz be437b0c52798507d0a92ffbf5762ecd6f90e78e SOURCES/linux-5.14.0-503.23.1.el9_5.tar.xz
4fff8080e88afffc06d8ef5004db8d53bb21237f SOURCES/nvidiagpuoot001.x509 4fff8080e88afffc06d8ef5004db8d53bb21237f SOURCES/nvidiagpuoot001.x509
706ae01dd14efa38f0f565a3706acac19c78df02 SOURCES/olima1.x509 706ae01dd14efa38f0f565a3706acac19c78df02 SOURCES/olima1.x509
6e3f0d61414c0b50f48dc2d4c3b3cd024e1c3a43 SOURCES/olimaca1.x509 6e3f0d61414c0b50f48dc2d4c3b3cd024e1c3a43 SOURCES/olimaca1.x509

2
SOURCES/Makefile.rhelver
View File

@ -12,7 +12,7 @@ RHEL_MINOR = 5
# #
# Use this spot to avoid future merge conflicts. # Use this spot to avoid future merge conflicts.
# Do not trim this comment. # Do not trim this comment.
RHEL_RELEASE = 503.22.1 RHEL_RELEASE = 503.23.1
# #
# ZSTREAM # ZSTREAM

4
SOURCES/kernel.changelog
View File

@ -1,3 +1,7 @@
* Mon Jan 20 2025 Chao YE <cye@redhat.com> [5.14.0-503.23.1.el9_5]
- printk: nbcon: Fix illegal RCU usage on thread wakeup (Derek Barbosa) [RHEL-73036]
Resolves: RHEL-73036
* Wed Jan 15 2025 Chao YE <cye@redhat.com> [5.14.0-503.22.1.el9_5] * Wed Jan 15 2025 Chao YE <cye@redhat.com> [5.14.0-503.22.1.el9_5]
- [s390] zcore: WRITE is "data source", not destination... (CKI Backport Bot) [RHEL-63078] - [s390] zcore: WRITE is "data source", not destination... (CKI Backport Bot) [RHEL-63078]
- arm64/sve: Discard stale CPU state when handling SVE traps (Mark Salter) [RHEL-72218] {CVE-2024-50275} - arm64/sve: Discard stale CPU state when handling SVE traps (Mark Salter) [RHEL-72218] {CVE-2024-50275}

BIN
SOURCES/uki-sb-cert-x86_64-almalinux.crt
View File

Binary file not shown.

63
SPECS/kernel.spec
View File

@ -165,15 +165,15 @@ Summary: The Linux kernel
# define buildid .local # define buildid .local
%define specversion 5.14.0 %define specversion 5.14.0
%define patchversion 5.14 %define patchversion 5.14
%define pkgrelease 503.22.1 %define pkgrelease 503.23.1
%define kversion 5 %define kversion 5
%define tarfile_release 5.14.0-503.22.1.el9_5 %define tarfile_release 5.14.0-503.23.1.el9_5
# This is needed to do merge window version magic # This is needed to do merge window version magic
%define patchlevel 14 %define patchlevel 14
# This allows pkg_release to have configurable %%{?dist} tag # This allows pkg_release to have configurable %%{?dist} tag
%define specrelease 503.22.1%{?buildid}%{?dist} %define specrelease 503.23.1%{?buildid}%{?dist}
# This defines the kabi tarball version # This defines the kabi tarball version
%define kabiversion 5.14.0-503.22.1.el9_5 %define kabiversion 5.14.0-503.23.1.el9_5
# #
# End of genspec.sh variables # End of genspec.sh variables
@ -645,6 +645,7 @@ Requires: kernel-modules-core-uname-r = %{KVERREL}
Provides: installonlypkg(kernel) Provides: installonlypkg(kernel)
%endif %endif
# #
# List the packages used during the kernel build # List the packages used during the kernel build
# #
@ -900,11 +901,6 @@ Source84: mod-internal.list
Source85: mod-partner.list Source85: mod-partner.list
Source86: mod-kvm.list Source86: mod-kvm.list
Source100: almalinuxdup1.x509
Source101: almalinuxkpatch1.x509
Source102: almalinuximaca1.x509
Source103: almalinuxima.x509
Source104: almalinuxima.x509
Source105: nvidiagpuoot001.x509 Source105: nvidiagpuoot001.x509
%if 0%{?centos} %if 0%{?centos}
@ -953,6 +949,13 @@ Source4000: README.rst
Source4001: rpminspect.yaml Source4001: rpminspect.yaml
Source4002: gating.yaml Source4002: gating.yaml
# AlmaLinux Source
Source100: almalinuxdup1.x509
Source103: almalinuxima.x509
Source104: almalinuxima.x509
Source102: almalinuximaca1.x509
Source101: almalinuxkpatch1.x509
## Patches needed for building this package ## Patches needed for building this package
%if !%{nopatches} %if !%{nopatches}
@ -960,7 +963,10 @@ Source4002: gating.yaml
Patch1: patch-%{patchversion}-redhat.patch Patch1: patch-%{patchversion}-redhat.patch
%endif %endif
# Bring back deprecated PCI ids #CFHack #CFHack2024 # empty final patch to facilitate testing of kernel patches
Patch999999: linux-kernel-test.patch
# AlmaLinux Patch
Patch2001: 0001-Enable-all-disabled-pci-devices-by-moving-to-unmaint.patch Patch2001: 0001-Enable-all-disabled-pci-devices-by-moving-to-unmaint.patch
Patch2002: 0002-Bring-back-deprecated-pci-ids-to-mptsas-mptspi-drive.patch Patch2002: 0002-Bring-back-deprecated-pci-ids-to-mptsas-mptspi-drive.patch
Patch2003: 0003-Bring-back-deprecated-pci-ids-to-hpsa-driver.patch Patch2003: 0003-Bring-back-deprecated-pci-ids-to-hpsa-driver.patch
@ -969,9 +975,6 @@ Patch2005: 0005-Bring-back-deprecated-pci-ids-to-lpfc-driver.patch
Patch2006: 0006-Bring-back-deprecated-pci-ids-to-qla4xxx-driver.patch Patch2006: 0006-Bring-back-deprecated-pci-ids-to-qla4xxx-driver.patch
Patch2007: 0007-Bring-back-deprecated-pci-ids-to-be2iscsi-driver.patch Patch2007: 0007-Bring-back-deprecated-pci-ids-to-be2iscsi-driver.patch
# empty final patch to facilitate testing of kernel patches
Patch999999: linux-kernel-test.patch
# END OF PATCH DEFINITIONS # END OF PATCH DEFINITIONS
%description %description
@ -1483,8 +1486,8 @@ Requires: kernel-%{?1:%{1}-}-modules-core-uname-r = %{KVERREL}%{uname_variant %{
%endif\ %endif\
%if "%{1}" == "rt" || "%{?1}" == ""\ %if "%{1}" == "rt" || "%{?1}" == ""\
Provides: almalinux(kernel-sig-key) = 202303\ Provides: almalinux(kernel-sig-key) = 202303\
Conflicts: shim-ia32 <= 15.6-1.el9.alma\ Conflicts: shim-ia32 < 15.8-4.el9_3.alma.2\
Conflicts: shim-x64 <= 15.6-1.el9.alma\ Conflicts: shim-x64 < 15.8-4.el9_3.alma.2\
%endif\ %endif\
%{expand:%%kernel_reqprovconf %{?1:%{1}} %{-o:%{-o}}}\ %{expand:%%kernel_reqprovconf %{?1:%{1}} %{-o:%{-o}}}\
%if %{?1:1} %{!?1:0} \ %if %{?1:1} %{!?1:0} \
@ -1713,6 +1716,12 @@ cp -a %{SOURCE1} .
%if !%{nopatches} %if !%{nopatches}
ApplyOptionalPatch patch-%{patchversion}-redhat.patch
%endif
ApplyOptionalPatch linux-kernel-test.patch
# Applying AlmaLinux Patch
ApplyPatch 0001-Enable-all-disabled-pci-devices-by-moving-to-unmaint.patch ApplyPatch 0001-Enable-all-disabled-pci-devices-by-moving-to-unmaint.patch
ApplyPatch 0002-Bring-back-deprecated-pci-ids-to-mptsas-mptspi-drive.patch ApplyPatch 0002-Bring-back-deprecated-pci-ids-to-mptsas-mptspi-drive.patch
ApplyPatch 0003-Bring-back-deprecated-pci-ids-to-hpsa-driver.patch ApplyPatch 0003-Bring-back-deprecated-pci-ids-to-hpsa-driver.patch
@ -1721,11 +1730,6 @@ ApplyPatch 0005-Bring-back-deprecated-pci-ids-to-lpfc-driver.patch
ApplyPatch 0006-Bring-back-deprecated-pci-ids-to-qla4xxx-driver.patch ApplyPatch 0006-Bring-back-deprecated-pci-ids-to-qla4xxx-driver.patch
ApplyPatch 0007-Bring-back-deprecated-pci-ids-to-be2iscsi-driver.patch ApplyPatch 0007-Bring-back-deprecated-pci-ids-to-be2iscsi-driver.patch
ApplyOptionalPatch patch-%{patchversion}-redhat.patch
%endif
ApplyOptionalPatch linux-kernel-test.patch
# END OF PATCH APPLICATIONS # END OF PATCH APPLICATIONS
# Any further pre-build tree manipulations happen here. # Any further pre-build tree manipulations happen here.
@ -1837,6 +1841,7 @@ RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS ${specver
cp %{SOURCE82} . cp %{SOURCE82} .
RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target} RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target}
# end of kernel config # end of kernel config
%endif %endif
@ -3790,6 +3795,24 @@ fi
# #
# #
%changelog %changelog
* Thu Feb 06 2025 Andrei Lukoshko <alukoshko@almalinux.org> - 5.14.0-503.23.1
- hpsa: bring back deprecated PCI ids #CFHack #CFHack2024
- mptsas: bring back deprecated PCI ids #CFHack #CFHack2024
- megaraid_sas: bring back deprecated PCI ids #CFHack #CFHack2024
- qla2xxx: bring back deprecated PCI ids #CFHack #CFHack2024
- qla4xxx: bring back deprecated PCI ids
- lpfc: bring back deprecated PCI ids
- be2iscsi: bring back deprecated PCI ids
- kernel/rh_messages.h: enable all disabled pci devices by moving to
unmaintained
* Thu Feb 06 2025 Eduard Abdullin <eabdullin@almalinux.org> - 5.14.0-503.23.1
- Use AlmaLinux OS secure boot cert
- Debrand for AlmaLinux OS
* Mon Jan 20 2025 Chao YE <cye@redhat.com> [5.14.0-503.23.1.el9_5]
- printk: nbcon: Fix illegal RCU usage on thread wakeup (Derek Barbosa) [RHEL-73036]
* Wed Jan 15 2025 Chao YE <cye@redhat.com> [5.14.0-503.22.1.el9_5] * Wed Jan 15 2025 Chao YE <cye@redhat.com> [5.14.0-503.22.1.el9_5]
- [s390] zcore: WRITE is "data source", not destination... (CKI Backport Bot) [RHEL-63078] - [s390] zcore: WRITE is "data source", not destination... (CKI Backport Bot) [RHEL-63078]
- arm64/sve: Discard stale CPU state when handling SVE traps (Mark Salter) [RHEL-72218] {CVE-2024-50275} - arm64/sve: Discard stale CPU state when handling SVE traps (Mark Salter) [RHEL-72218] {CVE-2024-50275}