Fix ExclusiveArch, BTRFS config, and SBAT template rules
- Add riscv64 to ExclusiveArch find/replace to match updated spec - Remove obsolete CONFIG_BTRFS_FS_CHECK_INTEGRITY from BTRFS replace blocks (option removed in kernel 6.12) - Keep Red Hat SBAT lines in *.sbat.template replaces and append AlmaLinux entries instead of replacing - Delete leftover lpfc patch file
This commit is contained in:
parent
ae3f6a4840
commit
7c39bb795b
56
config.yaml
56
config.yaml
@ -104,53 +104,32 @@ actions:
|
||||
count: 1
|
||||
|
||||
- target: "kernel*aarch64*.config"
|
||||
find: |
|
||||
# CONFIG_BTRFS_FS is not set
|
||||
replace: |
|
||||
CONFIG_BTRFS_FS=m
|
||||
# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
|
||||
find: "# CONFIG_BTRFS_FS is not set"
|
||||
replace: "CONFIG_BTRFS_FS=m"
|
||||
count: 1
|
||||
- target: "kernel*s390x-zfcpdump-rhel.config"
|
||||
find: |
|
||||
# CONFIG_BTRFS_FS is not set
|
||||
replace: |
|
||||
CONFIG_BTRFS_FS=m
|
||||
# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
|
||||
find: "# CONFIG_BTRFS_FS is not set"
|
||||
replace: "CONFIG_BTRFS_FS=m"
|
||||
count: 1
|
||||
- target: "kernel-s390x-debug-rhel.config"
|
||||
find: |
|
||||
# CONFIG_BTRFS_FS is not set
|
||||
replace: |
|
||||
CONFIG_BTRFS_FS=m
|
||||
# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
|
||||
find: "# CONFIG_BTRFS_FS is not set"
|
||||
replace: "CONFIG_BTRFS_FS=m"
|
||||
count: 1
|
||||
- target: "kernel-ppc64le-debug-rhel.config"
|
||||
find: |
|
||||
# CONFIG_BTRFS_FS is not set
|
||||
replace: |
|
||||
CONFIG_BTRFS_FS=m
|
||||
# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
|
||||
find: "# CONFIG_BTRFS_FS is not set"
|
||||
replace: "CONFIG_BTRFS_FS=m"
|
||||
count: 1
|
||||
- target: "kernel-riscv64-debug-rhel.config"
|
||||
find: |
|
||||
# CONFIG_BTRFS_FS is not set
|
||||
replace: |
|
||||
CONFIG_BTRFS_FS=m
|
||||
# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
|
||||
find: "# CONFIG_BTRFS_FS is not set"
|
||||
replace: "CONFIG_BTRFS_FS=m"
|
||||
count: 1
|
||||
- target: "kernel-x86_64-debug-rhel.config"
|
||||
find: |
|
||||
# CONFIG_BTRFS_FS is not set
|
||||
replace: |
|
||||
CONFIG_BTRFS_FS=m
|
||||
# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
|
||||
find: "# CONFIG_BTRFS_FS is not set"
|
||||
replace: "CONFIG_BTRFS_FS=m"
|
||||
count: 1
|
||||
- target: "kernel-x86_64-rt*"
|
||||
find: |
|
||||
# CONFIG_BTRFS_FS is not set
|
||||
replace: |
|
||||
CONFIG_BTRFS_FS=m
|
||||
# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
|
||||
find: "# CONFIG_BTRFS_FS is not set"
|
||||
replace: "CONFIG_BTRFS_FS=m"
|
||||
count: 1
|
||||
|
||||
- target: "kernel*.config"
|
||||
@ -234,8 +213,8 @@ actions:
|
||||
%endif
|
||||
count: 1
|
||||
- target: "spec"
|
||||
find: "ExclusiveArch: noarch i386 i686 x86_64 s390x aarch64 ppc64le"
|
||||
replace: "ExclusiveArch: noarch i386 i686 x86_64 s390x aarch64 ppc64le x86_64_v2"
|
||||
find: "ExclusiveArch: noarch i386 i686 x86_64 s390x aarch64 ppc64le riscv64"
|
||||
replace: "ExclusiveArch: noarch i386 i686 x86_64 s390x aarch64 ppc64le riscv64 x86_64_v2"
|
||||
count: 1
|
||||
- target: "spec"
|
||||
find: "Source104: almalinuxima.x509"
|
||||
@ -325,6 +304,7 @@ actions:
|
||||
kernel-uki-virt.@SBAT_SUFFIX,1,Red Hat,kernel-uki-virt,@KVER,mailto:secalert@redhat.com
|
||||
replace: |
|
||||
sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md
|
||||
kernel-uki-virt.@SBAT_SUFFIX,1,Red Hat,kernel-uki-virt,@KVER,mailto:secalert@redhat.com
|
||||
kernel-uki-virt.almalinux,1,AlmaLinux,kernel-uki-virt,@KVER,mailto:security@almalinux.org
|
||||
count: 1
|
||||
- target: "uki-addons.sbat.template"
|
||||
@ -333,6 +313,7 @@ actions:
|
||||
kernel-uki-virt-addons.@SBAT_SUFFIX,1,Red Hat,kernel-uki-virt-addons,@KVER,mailto:secalert@redhat.com
|
||||
replace: |
|
||||
sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md
|
||||
kernel-uki-virt-addons.@SBAT_SUFFIX,1,Red Hat,kernel-uki-virt-addons,@KVER,mailto:secalert@redhat.com
|
||||
kernel-uki-virt-addons.almalinux,1,AlmaLinux,kernel-uki-virt-addons,@KVER,mailto:security@almalinux.org
|
||||
count: 1
|
||||
- target: "kernel.sbat.template"
|
||||
@ -341,6 +322,7 @@ actions:
|
||||
kernel.@SBAT_SUFFIX,1,Red Hat,kernel-core,@KVER,mailto:secalert@redhat.com
|
||||
replace: |
|
||||
sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md
|
||||
kernel.@SBAT_SUFFIX,1,Red Hat,kernel-core,@KVER,mailto:secalert@redhat.com
|
||||
kernel.almalinux,1,AlmaLinux,kernel-core,@KVER,mailto:security@almalinux.org
|
||||
count: 1
|
||||
- target: "x509.genkey.centos"
|
||||
|
||||
@ -1,68 +0,0 @@
|
||||
From 4ad65faf019bfae8aec7b4e24d41c62184266ba1 Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Lukoshko <alukoshko@almalinux.org>
|
||||
Date: Thu, 8 Aug 2024 16:42:21 +0000
|
||||
Subject: [PATCH 05/10] Bring back deprecated pci ids to lpfc driver
|
||||
|
||||
---
|
||||
drivers/scsi/lpfc/lpfc_ids.h | 12 ++++++------
|
||||
1 file changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/drivers/scsi/lpfc/lpfc_ids.h b/drivers/scsi/lpfc/lpfc_ids.h
|
||||
index 85fc52038..83dc9f4c7 100644
|
||||
--- a/drivers/scsi/lpfc/lpfc_ids.h
|
||||
+++ b/drivers/scsi/lpfc/lpfc_ids.h
|
||||
@@ -24,7 +24,7 @@
|
||||
#include <linux/pci.h>
|
||||
|
||||
const struct pci_device_id lpfc_id_table[] = {
|
||||
-#ifndef CONFIG_RHEL_DIFFERENCES
|
||||
+#ifndef CONFIG_ALMALINUX_DIFFERENCES
|
||||
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_VIPER,
|
||||
PCI_ANY_ID, PCI_ANY_ID, },
|
||||
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_FIREFLY,
|
||||
@@ -58,7 +58,7 @@ const struct pci_device_id lpfc_id_table[] = {
|
||||
#endif
|
||||
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BMID,
|
||||
PCI_ANY_ID, PCI_ANY_ID, },
|
||||
-#ifndef CONFIG_RHEL_DIFFERENCES
|
||||
+#ifndef CONFIG_ALMALINUX_DIFFERENCES
|
||||
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BSMB,
|
||||
PCI_ANY_ID, PCI_ANY_ID, },
|
||||
#endif
|
||||
@@ -72,7 +72,7 @@ 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
|
||||
+#ifndef CONFIG_ALMALINUX_DIFFERENCES
|
||||
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_TFLY,
|
||||
PCI_ANY_ID, PCI_ANY_ID, },
|
||||
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LP101,
|
||||
@@ -96,7 +96,7 @@ 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
|
||||
+#ifndef CONFIG_ALMALINUX_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,
|
||||
@@ -110,13 +110,13 @@ const struct pci_device_id lpfc_id_table[] = {
|
||||
#endif
|
||||
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_FALCON,
|
||||
PCI_ANY_ID, PCI_ANY_ID, },
|
||||
-#ifndef CONFIG_RHEL_DIFFERENCES
|
||||
+#ifndef CONFIG_ALMALINUX_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
|
||||
+#ifndef CONFIG_ALMALINUX_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,
|
||||
--
|
||||
2.43.5
|
||||
|
||||
Loading…
Reference in New Issue
Block a user