autopatch/kernel
4
0
Fork 0
Code Issues Pull Requests Releases Activity

Initial commit

Browse Source
This commit is contained in:
Sofia Boldyreva 2025-01-22 20:26:49 +01:00
commit 322f9d4a26
12 changed files with 793 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

390
config.yaml Normal file
View File

@ -0,0 +1,390 @@
actions:
- replace:
- target: "kernel-aarch64-64k-debug-rhel.config"
find: |
# CONFIG_BE2NET_BE2 is not set
# CONFIG_BE2NET_BE3 is not set
replace: |
CONFIG_BE2NET_BE2=y
CONFIG_BE2NET_BE3=y
count: 1
- target: "kernel-aarch64-64k-debug-rhel.config"
find: "# CONFIG_MLX4_CORE_GEN2 is not set"
replace: "CONFIG_MLX4_CORE_GEN2=y"
count: 1
- target: "kernel-aarch64-64k-rhel.config"
find: |
# CONFIG_BE2NET_BE2 is not set
# CONFIG_BE2NET_BE3 is not set
replace: |
CONFIG_BE2NET_BE2=y
CONFIG_BE2NET_BE3=y
count: 1
- target: "kernel-aarch64-64k-rhel.config"
find: "# CONFIG_MLX4_CORE_GEN2 is not set"
replace: "# CONFIG_MLX4_CORE_GEN2 is not set"
count: 1
- target: "kernel-aarch64-debug-rhel.config"
find: |
# CONFIG_BE2NET_BE2 is not set
# CONFIG_BE2NET_BE3 is not set
replace: |
CONFIG_BE2NET_BE2=y
CONFIG_BE2NET_BE3=y
count: 1
- target: "kernel-aarch64-debug-rhel.config"
find: "# CONFIG_MLX4_CORE_GEN2 is not set"
replace: "CONFIG_MLX4_CORE_GEN2=y"
count: 1
- target: "kernel-aarch64-rhel.config"
find: |
# CONFIG_BE2NET_BE2 is not set
# CONFIG_BE2NET_BE3 is not set
replace: |
CONFIG_BE2NET_BE2=y
CONFIG_BE2NET_BE3=y
count: 1
- target: "kernel-aarch64-rhel.config"
find: "# CONFIG_MLX4_CORE_GEN2 is not set"
replace: "CONFIG_MLX4_CORE_GEN2=y"
count: 1
- target: "kernel-aarch64-rt-debug-rhel.config"
find: |
# CONFIG_BE2NET_BE2 is not set
# CONFIG_BE2NET_BE3 is not set
replace: |
CONFIG_BE2NET_BE2=y
CONFIG_BE2NET_BE3=y
count: 1
- target: "kernel-aarch64-rt-debug-rhel.config"
find: "# CONFIG_MLX4_CORE_GEN2 is not set"
replace: "CONFIG_MLX4_CORE_GEN2=y"
count: 1
- target: "kernel-aarch64-rt-rhel.config"
find: |
# CONFIG_BE2NET_BE2 is not set
# CONFIG_BE2NET_BE3 is not set
replace: |
CONFIG_BE2NET_BE2=y
CONFIG_BE2NET_BE3=y
count: 1
- target: "kernel-aarch64-rt-rhel.config"
find: "# CONFIG_MLX4_CORE_GEN2 is not set"
replace: "CONFIG_MLX4_CORE_GEN2=y"
count: 1
- target: "kernel-ppc64le-debug-rhel.config"
find: |
# CONFIG_BE2NET_BE2 is not set
# CONFIG_BE2NET_BE3 is not set
replace: |
CONFIG_BE2NET_BE2=y
CONFIG_BE2NET_BE3=y
count: 1
- target: "kernel-ppc64le-debug-rhel.config"
find: "# CONFIG_MLX4_CORE_GEN2 is not set"
replace: "CONFIG_MLX4_CORE_GEN2=y"
count: 1
- target: "kernel-ppc64le-rhel.config"
find: |
# CONFIG_BE2NET_BE2 is not set
# CONFIG_BE2NET_BE3 is not set
replace: |
CONFIG_BE2NET_BE2=y
CONFIG_BE2NET_BE3=y
count: 1
- target: "kernel-ppc64le-rhel.config"
find: "# CONFIG_MLX4_CORE_GEN2 is not set"
replace: "CONFIG_MLX4_CORE_GEN2=y"
count: 1
- target: "kernel-s390x-debug-rhel.config"
find: |
# CONFIG_BE2NET_BE2 is not set
# CONFIG_BE2NET_BE3 is not set
replace: |
CONFIG_BE2NET_BE2=y
CONFIG_BE2NET_BE3=y
count: 1
- target: "kernel-s390x-debug-rhel.config"
find: "# CONFIG_MLX4_CORE_GEN2 is not set"
replace: "CONFIG_MLX4_CORE_GEN2=y"
count: 1
- target: "kernel-s390x-rhel.config"
find: |
# CONFIG_BE2NET_BE2 is not set
# CONFIG_BE2NET_BE3 is not set
replace: |
CONFIG_BE2NET_BE2=y
CONFIG_BE2NET_BE3=y
count: 1
- target: "kernel-s390x-rhel.config"
find: "# CONFIG_MLX4_CORE_GEN2 is not set"
replace: "CONFIG_MLX4_CORE_GEN2=y"
count: 1
- target: "kernel-s390x-zfcpdump-rhel.config"
find: |
# CONFIG_BE2NET_BE2 is not set
# CONFIG_BE2NET_BE3 is not set
replace: |
CONFIG_BE2NET_BE2=y
CONFIG_BE2NET_BE3=y
count: 1
- target: "kernel-s390x-zfcpdump-rhel.config"
find: "# CONFIG_MLX4_CORE_GEN2 is not set"
replace: "CONFIG_MLX4_CORE_GEN2=y"
count: 1
- target: "kernel-x86_64-debug-rhel.config"
find: |
# CONFIG_BE2NET_BE2 is not set
# CONFIG_BE2NET_BE3 is not set
replace: |
CONFIG_BE2NET_BE2=y
CONFIG_BE2NET_BE3=y
count: 1
- target: "kernel-x86_64-debug-rhel.config"
find: "# CONFIG_MLX4_CORE_GEN2 is not set"
replace: "CONFIG_MLX4_CORE_GEN2=y"
count: 1
- target: "kernel-x86_64-rhel.config"
find: |
# CONFIG_BE2NET_BE2 is not set
# CONFIG_BE2NET_BE3 is not set
replace: |
CONFIG_BE2NET_BE2=y
CONFIG_BE2NET_BE3=y
count: 1
- target: "kernel-x86_64-rhel.config"
find: "# CONFIG_MLX4_CORE_GEN2 is not set"
replace: "CONFIG_MLX4_CORE_GEN2=y"
count: 1
- target: "kernel-x86_64-rt-debug-rhel.config"
find: |
# CONFIG_BE2NET_BE2 is not set
# CONFIG_BE2NET_BE3 is not set
replace: |
CONFIG_BE2NET_BE2=y
CONFIG_BE2NET_BE3=y
count: 1
- target: "kernel-x86_64-rt-debug-rhel.config"
find: "# CONFIG_MLX4_CORE_GEN2 is not set"
replace: "CONFIG_MLX4_CORE_GEN2=y"
count: 1
- target: "kernel-x86_64-rt-rhel.config"
find: |
# CONFIG_BE2NET_BE2 is not set
# CONFIG_BE2NET_BE3 is not set
replace: |
CONFIG_BE2NET_BE2=y
CONFIG_BE2NET_BE3=y
count: 1
- target: "kernel-x86_64-rt-rhel.config"
find: "# CONFIG_MLX4_CORE_GEN2 is not set"
replace: "CONFIG_MLX4_CORE_GEN2=y"
count: 1
- target: "x509.genkey.centos"
find: |
O = The CentOS Project
CN = CentOS Stream kernel signing key
emailAddress = security@centos.org
replace: |
O = AlmaLinux
CN = AlmaLinux kernel signing key
emailAddress = security@almalinux.org
count: 1
- target: "x509.genkey.rhel"
find: |
O = Red Hat
CN = Red Hat Enterprise Linux kernel signing key
emailAddress = secalert@redhat.com
replace: |
O = AlmaLinux
CN = AlmaLinux kernel signing key
emailAddress = security@almalinux.org
count: 1
- target: "spec"
find: "%ifnarch noarch"
replace: "%ifnarch x86_64"
count: 2
- target: "spec"
find: |
%if 0%{?centos}
%define pesign_name_0 centossecureboot201
%else
%ifarch x86_64 aarch64
%define pesign_name_0 redhatsecureboot501
%endif
%ifarch s390x
%define pesign_name_0 redhatsecureboot302
%endif
%ifarch ppc64le
%define pesign_name_0 redhatsecureboot701
%endif
%endif
replace: "%define pesign_name_0 almalinuxsecurebootca0"
count: 1
- target: "spec"
find: "Source103: almalinuxima.x509"
replace: |
Source103: almalinuxima.x509
Source104: almalinuxima.x509
count: 1
- target: "spec"
find: "Summary: Various documentation bits found in the kernel source"
replace: |
Summary: Various documentation bits found in the kernel source
BuildArch: noarch
count: 1
- target: "spec"
find: "Summary: The Red Hat Enterprise Linux kernel ABI symbol stablelists"
replace: |
Summary: The AlmaLinux kernel ABI symbol stablelists
BuildArch: noarch
count: 1
- target: "spec"
find: |
The kABI package contains information pertaining to the Red Hat Enterprise
Linux kernel ABI, including lists of kernel symbols that are needed by
replace: |
The kABI package contains information pertaining to the AlmaLinux
kernel ABI, including lists of kernel symbols that are needed by
count: 1
- target: "spec"
find: |
The package contains data describing the current ABI of the Red Hat Enterprise
Linux kernel, suitable for the kabi-dw tool.
replace: |
The package contains data describing the current ABI of the AlmaLinux
kernel, suitable for the kabi-dw tool.
count: 1
- target: "spec"
find: "This package provides kernel modules for the %{?2:%{2} }kernel package for Red Hat internal usage.\\"
replace: "This package provides kernel modules for the %{?2:%{2} }kernel package for AlmaLinux internal usage.\\"
count: 1
- target: "spec"
find: "%{expand:%%kernel_reqprovconf %{?1:%{1}} %{-o:%{-o}}}\\"
replace: |
%if "%{1}" == "rt" || "%{?1}" == ""\
Provides: almalinux(kernel-sig-key) = 202303\
Conflicts: shim-ia32 <= 15.6-1.el9.alma\
Conflicts: shim-x64 <= 15.6-1.el9.alma\
%endif\
%{expand:%%kernel_reqprovconf %{?1:%{1}} %{-o:%{-o}}}\
count: 1
- target: "spec"
find: " sed -i 's/CONFIG_CRYPTO_FIPS_NAME=.*/CONFIG_CRYPTO_FIPS_NAME=\"Red Hat Enterprise Linux %{rhel} - Kernel Cryptographic API\"/' $i"
replace: " sed -i 's/CONFIG_CRYPTO_FIPS_NAME=.*/CONFIG_CRYPTO_FIPS_NAME=\"AlmaLinux %{rhel} - Kernel Cryptographic API\"/' $i"
count: 1
- target: "spec"
find: "SBATsuffix=\"centos\""
replace: "SBATsuffix=\"rhel\""
count: 1
- target: "spec"
find: |
linux,1,Red Hat,linux,$KernelVer,mailto:secalert@redhat.com
linux.$SBATsuffix,1,Red Hat,linux,$KernelVer,mailto:secalert@redhat.com
kernel-uki-virt.$SBATsuffix,1,Red Hat,kernel-uki-virt,$KernelVer,mailto:secalert@redhat.com
replace: |
linux,1,Red Hat,linux,$KernelVer,mailto:secalert@redhat.com
linux,1,AlmaLinux,linux,$KernelVer,mailto:security@almalinux.org
linux.$SBATsuffix,1,Red Hat,linux,$KernelVer,mailto:secalert@redhat.com
linux.almalinux,1,AlmaLinux,linux,$KernelVer,mailto:security@almalinux.org
kernel-uki-virt.$SBATsuffix,1,Red Hat,kernel-uki-virt,$KernelVer,mailto:secalert@redhat.com
kernel-uki-virt.almalinux,1,AlmaLinux,kernel-uki-virt,$KernelVer,mailto:security@almalinux.org
count: 1
- target: "spec"
find: "UKI_secureboot_name=centossecureboot204"
replace: "UKI_secureboot_name=alsecureboot001"
count: 1
- target: "spec"
find: "UKI_secureboot_name=redhatsecureboot504"
replace: "UKI_secureboot_name=alsecureboot001"
count: 1
- target: "spec"
find: "# Red Hat UEFI Secure Boot CA cert, which can be used to authenticate the kernel"
replace: "# AlmaLinux UEFI Secure Boot CA cert, which can be used to authenticate the kernel"
count: 1
- delete_line:
- target: "spec"
lines:
- |
Source100: rheldup3.x509
Source101: rhelkpatch1.x509
Source102: rhelimaca1.x509
Source103: rhelima.x509
Source104: rhelima_centos.x509
- |
# 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
- |
if [ "$KernelExtension" == "gz" ]; then
gzip -f9 $SignImage
fi
- modify_release:
- suffix: ".alma.1"
enabled: true
- changelog_entry:
- name: "Andrei Lukoshko"
email: "alukoshko@almalinux.org"
line:
- "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"
- name: "Eduard Abdullin"
email: "eabdullin@almalinux.org"
line:
- "Use AlmaLinux OS secure boot cert"
- "Debrand for AlmaLinux OS"
- add_files:
- type: "patch"
name: "0001-Enable-all-disabled-pci-devices-by-moving-to-unmaint.patch"
number: 2001
- type: "patch"
name: "0002-Bring-back-deprecated-pci-ids-to-mptsas-mptspi-drive.patch"
number: 2002
- type: "patch"
name: "0003-Bring-back-deprecated-pci-ids-to-hpsa-driver.patch"
number: 2003
- type: "patch"
name: "0004-Bring-back-deprecated-pci-ids-to-qla2xxx-driver.patch"
number: 2004
- type: "patch"
name: "0005-Bring-back-deprecated-pci-ids-to-lpfc-driver.patch"
number: 2005
- type: "patch"
name: "0006-Bring-back-deprecated-pci-ids-to-qla4xxx-driver.patch"
number: 2006
- type: "patch"
name: "0007-Bring-back-deprecated-pci-ids-to-be2iscsi-driver.patch"
number: 2007
- type: "source"
name: "almalinuxdup1.x509"
number: 100
- type: "source"
name: "almalinuxima.x509"
number: 103
- type: "source"
name: "almalinuximaca1.x509"
number: 102
- type: "source"
name: "almalinuxkpatch1.x509"
number: 101
- type: "source"
name: "uki-sb-cert-x86_64-almalinux.crt"
number: "Latest"

122
files/0001-Enable-all-disabled-pci-devices-by-moving-to-unmaint.patch Normal file
View File

@ -0,0 +1,122 @@
From e6b210caa51bc33c46d5acfae198645a9914fa32 Mon Sep 17 00:00:00 2001
From: Andrew Lukoshko <alukoshko@almalinux.org>
Date: Mon, 30 Sep 2024 13:13:37 +0000
Subject: [PATCH] Enable all disabled pci devices by moving to unmaintained
---
kernel/rh_messages.h | 94 ++++++++++++++++++++++----------------------
1 file changed, 47 insertions(+), 47 deletions(-)
diff --git a/kernel/rh_messages.h b/kernel/rh_messages.h
index b798ad5d4..c59853b47 100644
--- a/kernel/rh_messages.h
+++ b/kernel/rh_messages.h
@@ -141,6 +141,53 @@ static const struct pci_device_id rh_deprecated_pci_devices[] = {
};
static const struct pci_device_id rh_disabled_pci_devices[] = {
+ {0} /* Terminating entry */
+};
+
+static const struct pci_device_id rh_unmaintained_pci_devices[] = {
+ { 0x10df, 0xe220, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x10df, 0x0724, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x10df, 0xe200, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x10df, 0xf011, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x10df, 0xf015, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x10df, 0xf100, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x10df, 0xfc40, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x1000, 0x005b, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x1000, 0x0071, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x1000, 0x0073, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x1000, 0x0079, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x15B3, 0x1003, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x15B3, 0x1004, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x15B3, 0x1005, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x15B3, 0x1006, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x15B3, 0x1007, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x15B3, 0x1008, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x15B3, 0x1009, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x15B3, 0x100a, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x15B3, 0x100b, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x15B3, 0x100c, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x15B3, 0x100d, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x15B3, 0x100e, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x15B3, 0x100f, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x15B3, 0x1010, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x15B3, 0xA2DC, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x1000, 0x006E, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x1000, 0x0080, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x1000, 0x0081, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x1000, 0x0082, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x1000, 0x0083, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x1000, 0x0084, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x1000, 0x0085, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x1000, 0x0086, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x1000, 0x0087, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x177d, 0xa01e, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x177d, 0xa034, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x177d, 0x0011, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x1077, 0x2031, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x1077, 0x2532, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x1077, 0x8031, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x1924, 0x0803, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x1924, 0x0813, PCI_ANY_ID, PCI_ANY_ID },
{ 0x1011, 0x0046, 0x103c, 0x10c2 },
{ 0x1011, 0x0046, 0x9005, 0x0364 },
{ 0x1011, 0x0046, 0x9005, 0x0365 },
@@ -293,51 +340,4 @@ static const struct pci_device_id rh_disabled_pci_devices[] = {
{0} /* Terminating entry */
};
-static const struct pci_device_id rh_unmaintained_pci_devices[] = {
- { 0x10df, 0xe220, PCI_ANY_ID, PCI_ANY_ID },
- { 0x10df, 0x0724, PCI_ANY_ID, PCI_ANY_ID },
- { 0x10df, 0xe200, PCI_ANY_ID, PCI_ANY_ID },
- { 0x10df, 0xf011, PCI_ANY_ID, PCI_ANY_ID },
- { 0x10df, 0xf015, PCI_ANY_ID, PCI_ANY_ID },
- { 0x10df, 0xf100, PCI_ANY_ID, PCI_ANY_ID },
- { 0x10df, 0xfc40, PCI_ANY_ID, PCI_ANY_ID },
- { 0x1000, 0x005b, PCI_ANY_ID, PCI_ANY_ID },
- { 0x1000, 0x0071, PCI_ANY_ID, PCI_ANY_ID },
- { 0x1000, 0x0073, PCI_ANY_ID, PCI_ANY_ID },
- { 0x1000, 0x0079, PCI_ANY_ID, PCI_ANY_ID },
- { 0x15B3, 0x1003, PCI_ANY_ID, PCI_ANY_ID },
- { 0x15B3, 0x1004, PCI_ANY_ID, PCI_ANY_ID },
- { 0x15B3, 0x1005, PCI_ANY_ID, PCI_ANY_ID },
- { 0x15B3, 0x1006, PCI_ANY_ID, PCI_ANY_ID },
- { 0x15B3, 0x1007, PCI_ANY_ID, PCI_ANY_ID },
- { 0x15B3, 0x1008, PCI_ANY_ID, PCI_ANY_ID },
- { 0x15B3, 0x1009, PCI_ANY_ID, PCI_ANY_ID },
- { 0x15B3, 0x100a, PCI_ANY_ID, PCI_ANY_ID },
- { 0x15B3, 0x100b, PCI_ANY_ID, PCI_ANY_ID },
- { 0x15B3, 0x100c, PCI_ANY_ID, PCI_ANY_ID },
- { 0x15B3, 0x100d, PCI_ANY_ID, PCI_ANY_ID },
- { 0x15B3, 0x100e, PCI_ANY_ID, PCI_ANY_ID },
- { 0x15B3, 0x100f, PCI_ANY_ID, PCI_ANY_ID },
- { 0x15B3, 0x1010, PCI_ANY_ID, PCI_ANY_ID },
- { 0x15B3, 0xA2DC, PCI_ANY_ID, PCI_ANY_ID },
- { 0x1000, 0x006E, PCI_ANY_ID, PCI_ANY_ID },
- { 0x1000, 0x0080, PCI_ANY_ID, PCI_ANY_ID },
- { 0x1000, 0x0081, PCI_ANY_ID, PCI_ANY_ID },
- { 0x1000, 0x0082, PCI_ANY_ID, PCI_ANY_ID },
- { 0x1000, 0x0083, PCI_ANY_ID, PCI_ANY_ID },
- { 0x1000, 0x0084, PCI_ANY_ID, PCI_ANY_ID },
- { 0x1000, 0x0085, PCI_ANY_ID, PCI_ANY_ID },
- { 0x1000, 0x0086, PCI_ANY_ID, PCI_ANY_ID },
- { 0x1000, 0x0087, PCI_ANY_ID, PCI_ANY_ID },
- { 0x177d, 0xa01e, PCI_ANY_ID, PCI_ANY_ID },
- { 0x177d, 0xa034, PCI_ANY_ID, PCI_ANY_ID },
- { 0x177d, 0x0011, PCI_ANY_ID, PCI_ANY_ID },
- { 0x1077, 0x2031, PCI_ANY_ID, PCI_ANY_ID },
- { 0x1077, 0x2532, PCI_ANY_ID, PCI_ANY_ID },
- { 0x1077, 0x8031, PCI_ANY_ID, PCI_ANY_ID },
- { 0x1924, 0x0803, PCI_ANY_ID, PCI_ANY_ID },
- { 0x1924, 0x0813, PCI_ANY_ID, PCI_ANY_ID },
- {0} /* Terminating entry */
-};
-
#endif /* __RH_MESSAGES_H */
--
2.43.5

39
files/0002-Bring-back-deprecated-pci-ids-to-mptsas-mptspi-drive.patch Normal file
View File

@ -0,0 +1,39 @@
From ac6e3b155d35bfea32b1c3c6015a18b6e5046652 Mon Sep 17 00:00:00 2001
From: Andrew Lukoshko <alukoshko@almalinux.org>
Date: Mon, 8 Apr 2024 13:17:47 +0000
Subject: [PATCH 2/4] Bring back deprecated pci ids to mptsas-mptspi driver
---
drivers/message/fusion/mptsas.c | 2 +-
drivers/message/fusion/mptspi.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
index 9d2f13f12..b25686049 100644
--- a/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
@@ -5381,7 +5381,7 @@ static void mptsas_remove(struct pci_dev *pdev)
}
static struct pci_device_id mptsas_pci_table[] = {
-#ifdef CONFIG_RHEL_DIFFERENCES
+#ifdef CONFIG_ALMALINUX_DIFFERENCES
{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1068,
PCI_VENDOR_ID_VMWARE, PCI_ANY_ID },
#else
diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c
index fd4a10b78..f9616de2a 100644
--- a/drivers/message/fusion/mptspi.c
+++ b/drivers/message/fusion/mptspi.c
@@ -1238,7 +1238,7 @@ static struct spi_function_template mptspi_transport_functions = {
*/
static struct pci_device_id mptspi_pci_table[] = {
-#ifdef CONFIG_RHEL_DIFFERENCES
+#ifdef CONFIG_ALMALINUX_DIFFERENCES
{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_53C1030,
PCI_VENDOR_ID_VMWARE, PCI_ANY_ID },
#else
--
2.27.0

51
files/0003-Bring-back-deprecated-pci-ids-to-hpsa-driver.patch Normal file
View File

@ -0,0 +1,51 @@
From f9ab10cebe6411dd26fec2ef354db2e527386b4f Mon Sep 17 00:00:00 2001
From: Andrew Lukoshko <alukoshko@almalinux.org>
Date: Mon, 8 Apr 2024 13:20:29 +0000
Subject: [PATCH 3/4] Bring back deprecated pci ids to hpsa driver
---
drivers/scsi/hpsa.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index bd5880cbd..060bd914a 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -82,9 +82,7 @@ MODULE_DESCRIPTION("Driver for HP Smart Array Controller version " \
HPSA_DRIVER_VERSION);
MODULE_VERSION(HPSA_DRIVER_VERSION);
MODULE_LICENSE("GPL");
-#ifndef CONFIG_RHEL_DIFFERENCES
MODULE_ALIAS("cciss");
-#endif
static int hpsa_simple_mode;
module_param(hpsa_simple_mode, int, S_IRUGO|S_IWUSR);
@@ -93,6 +91,11 @@ MODULE_PARM_DESC(hpsa_simple_mode,
/* define the PCI info for the cards we can control */
static const struct pci_device_id hpsa_pci_device_id[] = {
+ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSC, 0x103C, 0x3223},
+ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSC, 0x103C, 0x3234},
+ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSC, 0x103C, 0x3235},
+ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSC, 0x103C, 0x3237},
+ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSC, 0x103C, 0x323D},
{PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3241},
{PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3243},
{PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3245},
@@ -146,12 +149,10 @@ static const struct pci_device_id hpsa_pci_device_id[] = {
{PCI_VENDOR_ID_HP_3PAR, 0x0075, 0x1590, 0x007D},
{PCI_VENDOR_ID_HP_3PAR, 0x0075, 0x1590, 0x0088},
{PCI_VENDOR_ID_HP, 0x333f, 0x103c, 0x333f},
-#ifndef CONFIG_RHEL_DIFFERENCES
{PCI_VENDOR_ID_HP, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0},
{PCI_VENDOR_ID_COMPAQ, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0},
-#endif
{0,}
};
--
2.27.0

43
files/0004-Bring-back-deprecated-pci-ids-to-qla2xxx-driver.patch Normal file
View File

@ -0,0 +1,43 @@
From 091c13878c5d53a9ca8c78d8d3dc20598ff11c88 Mon Sep 17 00:00:00 2001
From: Andrew Lukoshko <alukoshko@almalinux.org>
Date: Mon, 8 Apr 2024 13:22:27 +0000
Subject: [PATCH 4/4] Bring back deprecated pci ids to qla2xxx driver
---
drivers/scsi/qla2xxx/qla_os.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 036f26c42..1d7b684dc 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -8121,7 +8121,6 @@ static const struct pci_error_handlers qla2xxx_err_handler = {
};
static struct pci_device_id qla2xxx_pci_tbl[] = {
-#ifndef CONFIG_RHEL_DIFFERENCES
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2100) },
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2200) },
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2300) },
@@ -8134,18 +8133,13 @@ static struct pci_device_id qla2xxx_pci_tbl[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8432) },
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5422) },
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5432) },
-#endif
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2532) },
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2031) },
-#ifndef CONFIG_RHEL_DIFFERENCES
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8001) },
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8021) },
-#endif
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8031) },
-#ifndef CONFIG_RHEL_DIFFERENCES
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISPF001) },
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8044) },
-#endif
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2071) },
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2271) },
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2261) },
--
2.27.0

86
files/0005-Bring-back-deprecated-pci-ids-to-lpfc-driver.patch Normal file
View File

@ -0,0 +1,86 @@
From 0e54f93854865b95b50e8023645e423af634e4ec Mon Sep 17 00:00:00 2001
From: Andrew Lukoshko <alukoshko@almalinux.org>
Date: Tue, 9 Apr 2024 17:27:35 +0000
Subject: [PATCH 1/3] Bring back deprecated pci ids to lpfc driver
---
drivers/scsi/lpfc/lpfc_ids.h | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/drivers/scsi/lpfc/lpfc_ids.h b/drivers/scsi/lpfc/lpfc_ids.h
index 85fc52038..0b1616e93 100644
--- a/drivers/scsi/lpfc/lpfc_ids.h
+++ b/drivers/scsi/lpfc/lpfc_ids.h
@@ -24,7 +24,6 @@
#include <linux/pci.h>
const struct pci_device_id lpfc_id_table[] = {
-#ifndef CONFIG_RHEL_DIFFERENCES
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_VIPER,
PCI_ANY_ID, PCI_ANY_ID, },
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_FIREFLY,
@@ -55,13 +54,10 @@ const struct pci_device_id lpfc_id_table[] = {
PCI_ANY_ID, PCI_ANY_ID, },
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_HELIOS_DCSP,
PCI_ANY_ID, PCI_ANY_ID, },
-#endif
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BMID,
PCI_ANY_ID, PCI_ANY_ID, },
-#ifndef CONFIG_RHEL_DIFFERENCES
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BSMB,
PCI_ANY_ID, PCI_ANY_ID, },
-#endif
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR,
PCI_ANY_ID, PCI_ANY_ID, },
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR_SCSP,
@@ -72,7 +68,6 @@ const struct pci_device_id lpfc_id_table[] = {
PCI_ANY_ID, PCI_ANY_ID, },
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZSMB,
PCI_ANY_ID, PCI_ANY_ID, },
-#ifndef CONFIG_RHEL_DIFFERENCES
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_TFLY,
PCI_ANY_ID, PCI_ANY_ID, },
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LP101,
@@ -83,7 +78,6 @@ const struct pci_device_id lpfc_id_table[] = {
PCI_ANY_ID, PCI_ANY_ID, },
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LPE11000S,
PCI_ANY_ID, PCI_ANY_ID, },
-#endif
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT,
PCI_ANY_ID, PCI_ANY_ID, },
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_MID,
@@ -96,7 +90,6 @@ const struct pci_device_id lpfc_id_table[] = {
PCI_ANY_ID, PCI_ANY_ID, },
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_S,
PCI_ANY_ID, PCI_ANY_ID, },
-#ifndef CONFIG_RHEL_DIFFERENCES
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PROTEUS_VF,
PCI_ANY_ID, PCI_ANY_ID, },
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PROTEUS_PF,
@@ -107,23 +100,18 @@ const struct pci_device_id lpfc_id_table[] = {
PCI_ANY_ID, PCI_ANY_ID, },
{PCI_VENDOR_ID_SERVERENGINE, PCI_DEVICE_ID_TOMCAT,
PCI_ANY_ID, PCI_ANY_ID, },
-#endif
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_FALCON,
PCI_ANY_ID, PCI_ANY_ID, },
-#ifndef CONFIG_RHEL_DIFFERENCES
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BALIUS,
PCI_ANY_ID, PCI_ANY_ID, },
-#endif
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FC,
PCI_ANY_ID, PCI_ANY_ID, },
-#ifndef CONFIG_RHEL_DIFFERENCES
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FCOE,
PCI_ANY_ID, PCI_ANY_ID, },
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FC_VF,
PCI_ANY_ID, PCI_ANY_ID, },
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FCOE_VF,
PCI_ANY_ID, PCI_ANY_ID, },
-#endif
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_G6_FC,
PCI_ANY_ID, PCI_ANY_ID, },
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_G7_FC,
--
2.27.0

32
files/0006-Bring-back-deprecated-pci-ids-to-qla4xxx-driver.patch Normal file
View File

@ -0,0 +1,32 @@
From b4fdb240a1102876c03e0dbbef57758550e6e334 Mon Sep 17 00:00:00 2001
From: Andrew Lukoshko <alukoshko@almalinux.org>
Date: Tue, 9 Apr 2024 17:35:14 +0000
Subject: [PATCH 2/3] Bring back deprecated pci ids to qla4xxx driver
---
drivers/scsi/qla4xxx/ql4_os.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index c72c44087..2dd7a9b0d 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -9865,7 +9865,6 @@ static struct pci_device_id qla4xxx_pci_tbl[] = {
.subvendor = PCI_ANY_ID,
.subdevice = PCI_ANY_ID,
},
-#ifndef CONFIG_RHEL_DIFFERENCES
{
.vendor = PCI_VENDOR_ID_QLOGIC,
.device = PCI_DEVICE_ID_QLOGIC_ISP8022,
@@ -9884,7 +9883,6 @@ static struct pci_device_id qla4xxx_pci_tbl[] = {
.subvendor = PCI_ANY_ID,
.subdevice = PCI_ANY_ID,
},
-#endif
{0, 0},
};
MODULE_DEVICE_TABLE(pci, qla4xxx_pci_tbl);
--
2.27.0

30
files/0007-Bring-back-deprecated-pci-ids-to-be2iscsi-driver.patch Normal file
View File

@ -0,0 +1,30 @@
From 3c0cc7c69970a50fae40e8f6376fd50eb053db2d Mon Sep 17 00:00:00 2001
From: Andrew Lukoshko <alukoshko@almalinux.org>
Date: Tue, 9 Apr 2024 17:36:30 +0000
Subject: [PATCH 3/3] Bring back deprecated pci ids to be2iscsi driver
---
drivers/scsi/be2iscsi/be_main.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index 9079d4d83..3b4778ac4 100644
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -384,13 +384,11 @@ static int beiscsi_eh_device_reset(struct scsi_cmnd *sc)
/*------------------- PCI Driver operations and data ----------------- */
static const struct pci_device_id beiscsi_pci_id_table[] = {
-#ifndef CONFIG_RHEL_DIFFERENCES
{ PCI_DEVICE(BE_VENDOR_ID, BE_DEVICE_ID1) },
{ PCI_DEVICE(BE_VENDOR_ID, BE_DEVICE_ID2) },
{ PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID1) },
{ PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID2) },
{ PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID3) },
-#endif
{ PCI_DEVICE(ELX_VENDOR_ID, OC_SKH_ID1) },
{ 0 }
};
--
2.27.0

BIN
files/almalinuxdup1.x509 Normal file
View File

Binary file not shown.

BIN
files/almalinuxima.x509 Normal file
View File

Binary file not shown.

BIN
files/almalinuximaca1.x509 Normal file
View File

Binary file not shown.

BIN
files/almalinuxkpatch1.x509 Normal file
View File

Binary file not shown.