config.yaml

@@ -2,52 +2,30 @@ actions:
   - replace:
       - target: ".shim.metadata"
         find: |
-              fe978419c312c0c415d52befb4f6561e2d9556a7 SOURCES/BOOTAA64.CSV
+              9ca9cfa834aedfaf3efe2216bfa1cb7c286ee1c0 SOURCES/fbx64.efi
-              9650b41c0227b343478d03f4d7fcd6c8d3744440 SOURCES/BOOTIA32.CSV
+              5eb0ac78eee6aeeaf44a3f11d002b4fe00af6916 SOURCES/mmx64.efi
-              6801abf1c4d54f15f869470c99e480433940407a SOURCES/BOOTX64.CSV
+              4312f246b6ba692040383f10358ac9a5927207de SOURCES/shimaa64.efi
-              317f45115504f1ba56f0113dc217460e3c26cf82 SOURCES/fbaa64.efi
+              783fb77783e9d0c4c400b723dfd0f02f006616ae SOURCES/shimx64.efi
-              4fd02a6b3ec5dc58fcba1a3d8dec69e0cb86f5d5 SOURCES/fbia32.efi
-              b26bb4ed41e96d6e2b2471dc5d50f0f2c88ff884 SOURCES/fbx64.efi
-              b2e0f92dba676facda778be739e2959f5e51c077 SOURCES/mmaa64.efi
-              e8316a74f06a29385eeb7fd734f582e60dc7a2a4 SOURCES/mmia32.efi
-              77f25d23c6b0bb2f79a47d574f8af5ffe91e2466 SOURCES/mmx64.efi
-              ba0b760e594ff668ee72ae348adf3e49b97f75fb SOURCES/redhatsecureboot501.cer
-              e6f506462069aa17d2e8610503635c20f3a995c3 SOURCES/redhatsecurebootca5.cer
-              750bd7932437b1fb6610c233f69db1b70d67fab1 SOURCES/shimaa64.efi
-              0cd6ef62726de2f1321bfe6b70f47b788ac38666 SOURCES/shimia32.efi
-              86855303a18b978cf90d6c244bfe30897f449996 SOURCES/shimx64.efi
         replace: |
-              e2bd0ba50614457483a298097b2252b6f18c0a1b SOURCES/BOOTAA64.CSV
-              46bef68f0c2f722f4bb59385a8917c18210d4c4f SOURCES/BOOTIA32.CSV
-              cca8dd0b9b2e2d3a5e693087a926cb63150a0b2f SOURCES/BOOTX64.CSV
-              077f737b9a26b59d2517ee390879f02ab464a284 SOURCES/almalinuxsecurebootca0.cer
               4591a3da03f337b27e963b69202f7109496c0ef8 SOURCES/fbaa64.efi
-              0bbc4ac41e7ed2fb284f76995dac4be4f86f18a1 SOURCES/fbia32.efi
               403a4e918a00f5e90551085c7ba545969feee26e SOURCES/fbx64.efi
               48fe2246bcc52729315e7db8361d753ab6be1633 SOURCES/mmaa64.efi
-              8cbdaee830b36fc741e7f04228422933c07bbb4f SOURCES/mmia32.efi
               08fa765dbe8902c022fe0d5b5803c14bc1e44a5c SOURCES/mmx64.efi
               206b13df7ccae83bf2f961da7010e16eac372b28 SOURCES/shimaa64.efi
-              489ce4f178645f1317ffb3401007694e2ec77638 SOURCES/shimia32.efi
               1208043ca28f8566c115d8a15ba9bd8163b6badb SOURCES/shimx64.efi
         count: 1
       - target: "shim.rpmmacros"
         find: |
-              %global shimveraa64 15-7.el8_1
+              %global shimveraa64 15.8-2.el9
-              %global shimveria32 15.8-2.el8
+              %global shimverx64 15.8-2.el9
-              %global shimverx64 15.8-2.el8
-              #%%global shimverarm 15-1.el8
         replace: |
-              %global shimveraa64 15.8-2.el8.alma.1
+              %global shimveraa64 15.8-2.el9.alma.1
-              %global shimveria32 15.8-2.el8.alma.1
+              %global shimverx64 15.8-2.el9.alma.1
-              %global shimverx64 15.8-2.el8.alma.1
-              #%%global shimverarm 15-1.el8.alma.1
         count: 1
       - target: "shim.rpmmacros"
         find: "Requires: dbxtool >= 0.6-3						\\"
         replace: |
               Requires: dbxtool >= 0.6-3						\
-              Requires: %{efi_esp_dir}/grub%{-a*}.efi					\
               %{expand:%ifarch x86_64						\
               # SecureBoot keys dependencies						\
               Requires: almalinux(grub2-sig-key) >= 202303				\
@@ -71,16 +49,23 @@ actions:
               
               Name:		shim
         count: 1
-      - target: "spec"
-        find: |
-              Source1:	redhatsecureboot501.cer
-              Source2:	redhatsecurebootca5.cer
-        replace: "Source1:	almalinuxsecurebootca0.cer"
       - target: ".gitignore"
         find: |
-            SOURCES/redhatsecureboot501.cer
+            SOURCES/fbx64.efi
-            SOURCES/redhatsecurebootca5.cer
+            SOURCES/mmx64.efi
-        replace: "SOURCES/almalinuxsecurebootca0.cer"
+        replace: |
+            SOURCES/fbaa64.efi
+            SOURCES/fbx64.efi
+            SOURCES/mmaa64.efi
+            SOURCES/mmx64.efi
+        count: 1
+        
+  - delete_line:
+      - target: "spec"
+        lines:
+          - |
+            Source1:	redhatsecureboot501.cer
+            Source2:	redhatsecurebootca5.cer
 
   - modify_release:
     - suffix: ".alma.2"
@@ -91,4 +76,23 @@ actions:
         email: "eabdullin@almalinux.org"
         line:
           - "Add SB for aarch64"
-          - "AlmaLinux changes"
+          - "Use AlmaLinux cert"
+
+  - delete_files:
+      - file_name: "BOOTAA64.CSV"
+      - file_name: "BOOTX64.CSV"
+      - file_name: "fbaa64.efi"
+      - file_name: "mmaa64.efi"
+
+  - add_files:
+      - type: "source"
+        name: "almalinuxsecurebootca0.cer"
+        number: 1
+      - type: "source"
+        name: "BOOTAA64.CSV"
+        number: "Latest"
+        modify_spec: False
+      - type: "source"
+        name: "BOOTX64.CSV"
+        number: "Latest"
+        modify_spec: False