Merge pull request 'fix(autopatch): Fixed three replace actions that broke when upstream added new Nvidia certs (SOURCE107/108), changed the SBAT suffix mec' (#10) from agent-fix/a10-20260717-115748 into a10

Reviewed-on: #10
This commit is contained in:
Andrew Lukoshko 2026-07-17 12:18:44 +00:00
commit 3972f069be

View File

@ -18,7 +18,7 @@ actions:
number: 104
- type: "source"
name: "almalinuxnvidia1.x509"
number: 107
number: 109
- type: "patch"
name: "0001-Enable-all-disabled-pci-devices-by-moving-to-unmaint.patch"
number: 2001
@ -95,17 +95,33 @@ 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
- target: "kernel*aarch64*.config"
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"
count: 1
- target: "kernel-s390x-debug-rhel.config"
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"
count: 1
- target: "kernel-riscv64-debug-rhel.config"
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"
count: 1
- target: "kernel-x86_64-rt*"
find: "# CONFIG_BTRFS_FS is not set"
replace: "CONFIG_BTRFS_FS=m"
count: 1
- target: "kernel*.config"
find: |
@ -201,11 +217,15 @@ actions:
- target: "spec"
find: |
openssl x509 -inform der -in %{SOURCE102} -out nvidiagpuoot001.pem
cat rheldup3.pem rhelkpatch1.pem nvidiagpuoot001.pem >> ../certs/rhel.pem
openssl x509 -inform der -in %{SOURCE107} -out nvidiajetsonsoc.pem
openssl x509 -inform der -in %{SOURCE108} -out nvidiabfdpu.pem
cat rheldup3.pem rhelkpatch1.pem nvidiagpuoot001.pem nvidiajetsonsoc.pem nvidiabfdpu.pem >> ../certs/rhel.pem
replace: |
openssl x509 -inform der -in %{SOURCE102} -out nvidiagpuoot001.pem
openssl x509 -inform der -in %{SOURCE107} -out almalinuxnvidia.pem
cat rheldup3.pem rhelkpatch1.pem nvidiagpuoot001.pem almalinuxnvidia.pem > ../certs/rhel.pem
openssl x509 -inform der -in %{SOURCE107} -out nvidiajetsonsoc.pem
openssl x509 -inform der -in %{SOURCE108} -out nvidiabfdpu.pem
openssl x509 -inform der -in %{SOURCE109} -out almalinuxnvidia.pem
cat rheldup3.pem rhelkpatch1.pem nvidiagpuoot001.pem nvidiajetsonsoc.pem nvidiabfdpu.pem almalinuxnvidia.pem > ../certs/rhel.pem
count: 1
- target: "spec"
find: |
@ -266,11 +286,11 @@ actions:
- target: "spec"
find: |
%if 0%{?centos}
SBATsuffix="centos"
%global sbat_suffix centos
%else
replace: |
%if 0%{?centos}
SBATsuffix="rhel"
%global sbat_suffix rhel
%else
count: 1
- target: "uki.sbat.template"