config.yaml

@@ -1,5 +1,79 @@
 actions:
   - replace:
+      - target: "shim-find-debuginfo.sh"
+        find: |
+              cd "${RPM_BUILD_ROOT}"
+              find usr/src/debug/ -type d | sed -e "s,^,%dir /," | sort -u | tac
+              find usr/src/debug/ -type f | sed -e "s,^,/," | sort -u | tac
+        replace: |
+              cd ${RPM_BUILD_ROOT}
+              find usr/src/debug/ -type d | sed "s,^,%dir /,"
+              find usr/src/debug/ -type f | sed "s,^,/,"
+        count: 1
+      - target: "shim-find-debuginfo.sh"
+        find: |
+              declare -a tmp=()
+              
+              pushd "${RPM_BUILD_ROOT}" >/dev/null 2>&1
+              
+              mapfile -t tmp < <(find usr/lib/debug/ -type f -iname "*.efi.debug")
+              for x in "${tmp[@]}" ; do
+        replace: |
+              pushd ${RPM_BUILD_ROOT} >/dev/null 2>&1
+              for x in $(find usr/lib/debug/ -type f -iname *.efi.debug); do
+        count: 1
+      - target: "shim-find-debuginfo.sh"
+        find: |
+              for x in "${files[@]}" ; do
+                  declare name
+                  
+                  name=$(dirname "/${x}")
+        replace: |
+              for x in ${files[@]} ; do
+                  declare name=$(dirname /${x})
+        count: 1
+      - target: "shim-find-debuginfo.sh"
+        find: "name=$(dirname \"${name}\")"
+        replace: "name=$(dirname ${name})"
+        count: 1
+      - target: "shim-find-debuginfo.sh"
+        find: |
+              popd >/dev/null 2>&1
+              for x in "${dirs[@]}" ; do
+                  echo "%dir ${x}"
+              done | sort | uniq
+              for x in "${files[@]}" ; do
+                  echo "/${x}"
+              done | sort | uniq
+              for x in "${excludes[@]}" ; do
+                  echo "%exclude /${x}"
+              done
+        replace: |
+              popd >/dev/null 2>&1
+              for x in ${dirs[@]} ; do
+                  echo "%dir ${x}"
+              done | sort | uniq
+              for x in ${files[@]} ; do
+                  echo "/${x}"
+              done | sort | uniq
+              for x in ${excludes[@]} ; do
+                  echo "%exclude /${x}"
+              done
+        count: 1
+      - target: "shim-find-debuginfo.sh"
+        find: |
+              findsource > "build-${mainarch}/debugsource.list"
+              finddebug "${mainarch}" > "build-${mainarch}/debugfiles.list"
+              if [ -v altarch ]; then
+                  finddebug "${altarch}" > "build-${altarch}/debugfiles.list"
+              fi
+        replace: |
+              findsource > build-${mainarch}/debugsource.list
+              finddebug ${mainarch} > build-${mainarch}/debugfiles.list
+              if [ -v altarch ]; then
+                  finddebug ${altarch} > build-${altarch}/debugfiles.list
+              fi
+        count: 1
       - target: "spec"
         find: "%global efidir %(eval echo $(grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/'))"
         replace: "%global efidir almalinux"
@@ -8,7 +82,7 @@ actions:
         find: "BuildRequires:	dos2unix findutils"
         replace: |
               BuildRequires:	dos2unix findutils
-              BuildRequires:	efitools
+              BuildRequires:  efitools
         count: 1
       - target: "spec"
         find: "%build"
@@ -25,30 +99,67 @@ actions:
         count: 1
       - target: "spec"
         find: |
-              if [ -s "%{SOURCE1}" ]; then
-              	MAKEFLAGS="$MAKEFLAGS VENDOR_CERT_FILE=%{SOURCE1} "
+              if [ -f "%{SOURCE1}" ]; then
+              	MAKEFLAGS="$MAKEFLAGS VENDOR_DB_FILE=%{SOURCE1}"
               fi
+              %if 0%{?dbxfile}
+              if [ -f "%{SOURCE2}" ]; then
+                MAKEFLAGS="$MAKEFLAGS VENDOR_DBX_FILE=%{SOURCE2}"
+              fi
+              %endif
         replace: |
               if [ -s vendor_db.esl ]; then
               	MAKEFLAGS="$MAKEFLAGS VENDOR_DB_FILE=../vendor_db.esl"
               fi
-        count: 2
-
-  - modify_release:
-    - suffix: ".alma.1"
-      enabled: true
+              if [ -s "%{SOURCE2}" ]; then
+               	MAKEFLAGS="$MAKEFLAGS VENDOR_DBX_FILE=%{SOURCE2}"
+              fi
+        count: 1
+      - target: "spec"
+        find: |
+              if [ -f "%{SOURCE1}" ]; then
+              	MAKEFLAGS="$MAKEFLAGS VENDOR_DB_FILE=%{SOURCE1} "
+              fi
+              %if 0%{?dbxfile}
+              if [ -f "%{SOURCE2}" ]; then
+              	MAKEFLAGS="$MAKEFLAGS VENDOR_DBX_FILE=%{SOURCE2} "
+              fi
+              %endif
+        replace: |
+              if [ -s vendor_db.esl ]; then
+              	MAKEFLAGS="$MAKEFLAGS VENDOR_DB_FILE=../vendor_db.esl"
+              fi
+              if [ -s "%{SOURCE2}" ]; then
+              	MAKEFLAGS="$MAKEFLAGS VENDOR_DBX_FILE=%{SOURCE2}"
+              fi
+        count: 1
+      - target: "spec"
+        find: |
+              %{shimdir}/*.efi
+              %{shimdir}/*.hash
+              %{shimdir}/*.CSV
+        replace: |
+              %{shimdir}/*.CSV
+              %{shimdir}/*.efi
+              %{shimdir}/*.hash
+        count: 1
 
   - delete_line:
       - target: "spec"
         lines:
-          - "Source1:	redhatsecurebootca5.cer"
-          - "Source3:	sbat.redhat.csv"
-      - target: ".shim-unsigned-x64.metadata"
-        lines:
-          - "e6f506462069aa17d2e8610503635c20f3a995c3 SOURCES/redhatsecurebootca5.cer"
-      - target: ".gitignore"
-        lines:
-          - "SOURCES/redhatsecurebootca5.cer"
+          - |
+            # currently here's what's in our dbx: nothing
+            %global dbxfile %{nil}
+          - |
+            Source1:	vendordb.esl
+            %if 0%{?dbxfile}
+            Source2:	%{dbxfile}
+            %endif
+            Source3:	sbat.redhat.csv
+
+  - modify_release:
+    - suffix: ".alma.1"
+      enabled: true
 
   - changelog_entry:
       - name: "Eduard Abdullin"
@@ -57,6 +168,9 @@ actions:
           - "Use AlmaLinux OS cert and SBAT entry"
 
   - add_files:
+      - type: "source"
+        name: "dbx.esl"
+        number: 2
       - type: "source"
         name: "sbat.almalinux.csv"
         number: 3
@@ -71,4 +185,4 @@ actions:
         number: 103
 
   - delete_files:
-      - file_name: "sbat.redhat.csv"
+    - file_name: "sbat.redhat.csv"