diff --git a/config.yaml b/config.yaml index da7225a..e7ba812 100644 --- a/config.yaml +++ b/config.yaml @@ -19,6 +19,7 @@ actions: - type: "source" name: "almalinuxnvidia1.x509" number: 109 + - type: "patch" name: "0001-Enable-all-disabled-pci-devices-by-moving-to-unmaint.patch" number: 2001 @@ -31,9 +32,6 @@ actions: - 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 @@ -46,8 +44,9 @@ actions: - type: "patch" name: "0009-Bring-back-deprecated-pci-ids-to-mpt3sas-driver.patch" number: 2009 + - type: "patch" - name: "0010-Bring-back-deprecated-pci-ids-to-aacraid-driver.patch" + name: "0001-Keep-fs-btrfs-files-in-modules-package.patch" number: 2010 - replace: @@ -95,6 +94,15 @@ actions: CONFIG_MLX4_CORE_GEN2=y CONFIG_MLX4_CORE=m count: 1 + - target: "kernel*riscv64*.config" + find: | + # CONFIG_MLX4_CORE_GEN2 is not set + # CONFIG_MLX4_CORE is not set + replace: | + CONFIG_MLX4_CORE_GEN2=y + CONFIG_MLX4_CORE=m + count: 1 + - target: "kernel*aarch64*.config" find: "# CONFIG_BTRFS_FS is not set" replace: "CONFIG_BTRFS_FS=m" @@ -123,6 +131,7 @@ actions: find: "# CONFIG_BTRFS_FS is not set" replace: "CONFIG_BTRFS_FS=m" count: 1 + - target: "kernel*.config" find: | # CONFIG_FSI is not set @@ -204,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" @@ -299,7 +308,6 @@ 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" @@ -308,9 +316,15 @@ 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" + find: | + 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 + replace: | + sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md + kernel.almalinux,1,AlmaLinux,kernel-core,@KVER,mailto:security@almalinux.org count: 1 - target: "x509.genkey.centos" find: | @@ -370,18 +384,6 @@ actions: Source480: %{name}-x86_64_v2-rt-rhel.config Source481: %{name}-x86_64_v2-rt-debug-rhel.config count: 1 - - target: "spec" - find: "UKI_secureboot_name=centossecureboot204" - replace: "UKI_secureboot_name=%{pesign_name_0}" - count: 1 - - target: "spec" - find: "UKI_secureboot_name=redhatsecureboot504" - replace: "UKI_secureboot_name=%{pesign_name_0}" - count: 1 - - target: "spec" - find: "UKI_secureboot_cert=%{SOURCE153}" - replace: "UKI_secureboot_cert=%{_datadir}/pki/sb-certs/secureboot-uki-virt-%{_arch}.cer" - count: 1 - target: "spec" find: | %if 0%{?centos} @@ -401,6 +403,21 @@ actions: %define pesign_name_0 almalinuxsecureboot0 count: 1 + - target: "spec" + find: | + %if 0%{?centos} + UKI_secureboot_name=centossecureboot204 + UKI_secureboot_cert=%{_datadir}/pki/sb-certs/secureboot-uki-virt-%{_arch}.cer + %else + # RHEL only builds UKI for x86 + UKI_secureboot_name=redhatsecureboot504 + UKI_secureboot_cert=%{SOURCE153} + %endif + replace: | + UKI_secureboot_name=%{pesign_name_0} + UKI_secureboot_cert=%{_datadir}/pki/sb-certs/secureboot-uki-virt-%{_arch}.cer + count: 1 + - run_script: - script: "create_symlinks.sh" @@ -416,11 +433,18 @@ actions: Source105: rhelima_centos.x509 Source106: fedoraimaca.x509 - | - # Temporary use redhatsecureboot504 for x86 UKI, see RHEL-122230 - Source153: redhatsecureboot504.cer + # Temporary use redhatsecureboot504 for x86 UKI, see RHEL-122230 + Source153: redhatsecureboot504.cer - target: "kernel*zfcpdump*.config" lines: - "# CONFIG_FS_POSIX_ACL is not set" + - target: "def_variants.yaml.rhel" + lines: + + - "- fs/btrfs/.*: modules-internal" + + - delete_files: + - file_name: "redhatsecureboot504.cer" - changelog_entry: - name: "Eduard Abdullin" @@ -440,6 +464,5 @@ actions: - "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" diff --git a/files/0001-Keep-fs-btrfs-files-in-modules-package.patch b/files/0001-Keep-fs-btrfs-files-in-modules-package.patch new file mode 100644 index 0000000..470a006 --- /dev/null +++ b/files/0001-Keep-fs-btrfs-files-in-modules-package.patch @@ -0,0 +1,24 @@ +From 32b5df3d57caf5ab17a5161bbe152403ca9d0147 Mon Sep 17 00:00:00 2001 +From: eabdullin +Date: Wed, 4 Feb 2026 14:08:11 +0300 +Subject: [PATCH] Keep fs/btrfs/.* files in modules package + +--- + redhat/rhel_files/def_variants.yaml.rhel | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/redhat/rhel_files/def_variants.yaml.rhel b/redhat/rhel_files/def_variants.yaml.rhel +index 27e1aca80..61018dd69 100644 +--- a/redhat/rhel_files/def_variants.yaml.rhel ++++ b/redhat/rhel_files/def_variants.yaml.rhel +@@ -372,7 +372,6 @@ rules: + - fs/bcachefs/.*: modules-core + - fs/befs/befs.*: modules-extra + - fs/binfmt_misc.ko: modules-core +- - fs/btrfs/.*: modules-internal + - fs/cachefiles/.*: modules-core + - fs/ceph/.*: modules-core + - fs/coda/coda.*: modules-extra +-- +2.51.0 + diff --git a/files/0005-Bring-back-deprecated-pci-ids-to-lpfc-driver.patch b/files/0005-Bring-back-deprecated-pci-ids-to-lpfc-driver.patch deleted file mode 100644 index ce27ae8..0000000 --- a/files/0005-Bring-back-deprecated-pci-ids-to-lpfc-driver.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 4ad65faf019bfae8aec7b4e24d41c62184266ba1 Mon Sep 17 00:00:00 2001 -From: Andrew Lukoshko -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 - - 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 - diff --git a/files/0010-Bring-back-deprecated-pci-ids-to-aacraid-driver.patch b/files/0010-Bring-back-deprecated-pci-ids-to-aacraid-driver.patch deleted file mode 100644 index 45dbec0..0000000 --- a/files/0010-Bring-back-deprecated-pci-ids-to-aacraid-driver.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c462f778d114958a05afed7f5ba199417fbc7f1a Mon Sep 17 00:00:00 2001 -From: Andrew Lukoshko -Date: Thu, 8 Aug 2024 16:50:33 +0000 -Subject: [PATCH 10/10] Bring back deprecated pci ids to aacraid driver - ---- - drivers/scsi/aacraid/linit.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c -index 90a6070a1..e6d12db09 100644 ---- a/drivers/scsi/aacraid/linit.c -+++ b/drivers/scsi/aacraid/linit.c -@@ -77,7 +77,7 @@ char aac_driver_version[] = AAC_DRIVER_FULL_VERSION; - * Note: The last field is used to index into aac_drivers below. - */ - static const struct pci_device_id aac_pci_tbl[] = { --#ifndef CONFIG_RHEL_DIFFERENCES -+#ifndef CONFIG_ALMALINUX_DIFFERENCES - { 0x1028, 0x0001, 0x1028, 0x0001, 0, 0, 0 }, /* PERC 2/Si (Iguana/PERC2Si) */ - { 0x1028, 0x0002, 0x1028, 0x0002, 0, 0, 1 }, /* PERC 3/Di (Opal/PERC3Di) */ - { 0x1028, 0x0003, 0x1028, 0x0003, 0, 0, 2 }, /* PERC 3/Si (SlimFast/PERC3Si */ --- -2.43.5 -