diff --git a/config.yaml b/config.yaml index 0cf4af7..3672eed 100644 --- a/config.yaml +++ b/config.yaml @@ -1,3 +1,6 @@ +parameters: + pre_clean: true + actions: - add_files: @@ -92,6 +95,56 @@ actions: CONFIG_MLX4_CORE_GEN2=y CONFIG_MLX4_CORE=m count: 1 + - target: "kernel*.config" + find: | + # CONFIG_BTRFS_FS is not set + replace: | + # CONFIG_BTRFS_ASSERT is not set + # CONFIG_BTRFS_DEBUG is not set + CONFIG_BTRFS_FS=m + # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set + CONFIG_BTRFS_FS_POSIX_ACL=y + # CONFIG_BTRFS_FS_REF_VERIFY is not set + # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set + count: 1 + - target: "kernel*.config" + find: | + # CONFIG_FSI is not set + replace: | + CONFIG_FS_POSIX_ACL=y + # CONFIG_FSI is not set + count: 1 + - target: "kernel*.config" + find: | + # CONFIG_RAID6_PQ_BENCHMARK is not set + replace: | + CONFIG_RAID6_PQ=m + # CONFIG_RAID6_PQ_BENCHMARK is not set + count: 1 + - target: "kernel*debug*.config" + find: | + # CONFIG_BTRFS_ASSERT is not set + replace: | + CONFIG_BTRFS_ASSERT=y + count: 1 + - target: "kernel*zfcpdump*.config" + find: | + CONFIG_BTRFS_FS=m + replace: | + CONFIG_BTRFS_FS=y + count: 1 + - target: "kernel*zfcpdump*.config" + find: | + CONFIG_RAID6_PQ=m + replace: | + CONFIG_RAID6_PQ=y + count: 1 + - target: "kernel*zfcpdump*.config" + find: | + # CONFIG_LIBCRC32C is not set + replace: | + CONFIG_LIBCRC32C=y + count: 1 - target: "spec" find: | %ifnarch noarch @@ -148,7 +201,7 @@ actions: - target: "spec" find: | openssl x509 -inform der -in %{SOURCE102} -out nvidiagpuoot001.pem - cat rheldup3.pem rhelkpatch1.pem nvidiagpuoot001.pem > ../certs/rhel.pem + cat rheldup3.pem rhelkpatch1.pem nvidiagpuoot001.pem >> ../certs/rhel.pem replace: | openssl x509 -inform der -in %{SOURCE102} -out nvidiagpuoot001.pem openssl x509 -inform der -in %{SOURCE107} -out almalinuxnvidia.pem @@ -220,18 +273,24 @@ actions: SBATsuffix="rhel" %else count: 1 - - target: "spec" + - target: "uki.sbat.template" 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 + 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 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 + 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" + find: | + 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 + 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: "x509.genkey.centos" find: | @@ -306,9 +365,21 @@ actions: Source104: rhelima.x509 Source105: rhelima_centos.x509 Source106: fedoraimaca.x509 + - target: "kernel*zfcpdump*.config" + lines: + - "# CONFIG_FS_POSIX_ACL is not set" - changelog_entry: - - name: "Andrei Lukoshko" + - name: "Eduard Abdullin" + email: "eabdullin@almalinux.org" + line: + - "Debrand for AlmaLinux OS" + - "Use AlmaLinux OS secure boot cert" + - name: "Neal Gompa" + email: "ngompa@almalinux.org" + line: + - "Enable Btrfs support for all kernel variants" + - name: "Andrew Lukoshko" email: "alukoshko@almalinux.org" line: - "hpsa: bring back deprecated PCI ids #CFHack #CFHack2024" @@ -319,8 +390,3 @@ actions: - "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" diff --git a/files/0004-Bring-back-deprecated-pci-ids-to-qla2xxx-driver.patch b/files/0004-Bring-back-deprecated-pci-ids-to-qla2xxx-driver.patch index 93c90bf..5c97a98 100644 --- a/files/0004-Bring-back-deprecated-pci-ids-to-qla2xxx-driver.patch +++ b/files/0004-Bring-back-deprecated-pci-ids-to-qla2xxx-driver.patch @@ -14,7 +14,7 @@ index 26089872a..8018c68f2 100644 @@ -8123,7 +8123,7 @@ static const struct pci_error_handlers qla2xxx_err_handler = { }; - static struct pci_device_id qla2xxx_pci_tbl[] = { + static const struct pci_device_id qla2xxx_pci_tbl[] = { -#ifndef CONFIG_RHEL_DIFFERENCES +#ifndef CONFIG_ALMALINUX_DIFFERENCES { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2100) }, diff --git a/files/0008-Bring-back-deprecated-pci-ids-to-megaraid_sas-driver.patch b/files/0008-Bring-back-deprecated-pci-ids-to-megaraid_sas-driver.patch index 3939775..5ca01f9 100644 --- a/files/0008-Bring-back-deprecated-pci-ids-to-megaraid_sas-driver.patch +++ b/files/0008-Bring-back-deprecated-pci-ids-to-megaraid_sas-driver.patch @@ -13,7 +13,7 @@ index bf57fd3b9..0eaed98ac 100644 +++ b/drivers/scsi/megaraid/megaraid_sas_base.c @@ -149,7 +149,7 @@ megasas_set_ld_removed_by_fw(struct megasas_instance *instance); */ - static struct pci_device_id megasas_pci_table[] = { + static const struct pci_device_id megasas_pci_table[] = { -#ifndef CONFIG_RHEL_DIFFERENCES +#ifndef CONFIG_ALMALINUX_DIFFERENCES diff --git a/scripts/create_symlinks.sh b/scripts/create_symlinks.sh index 6b9b614..32f0e51 100644 --- a/scripts/create_symlinks.sh +++ b/scripts/create_symlinks.sh @@ -6,6 +6,3 @@ ln -s kernel-x86_64-debug-rhel.config kernel-x86_64_v2-debug-rhel.config ln -s kernel-x86_64-rt-rhel.config kernel-x86_64_v2-rt-rhel.config ln -s kernel-x86_64-rt-debug-rhel.config kernel-x86_64_v2-rt-debug-rhel.config - -ln -s kernel-x86_64-automotive-rhel.config kernel-x86_64_v2-automotive-rhel.config -ln -s kernel-x86_64-automotive-debug-rhel.config kernel-x86_64_v2-automotive-debug-rhel.config