diff --git a/config.yaml b/config.yaml index 769fae0..497ffaa 100644 --- a/config.yaml +++ b/config.yaml @@ -3,29 +3,6 @@ actions: - suffix: ".alma.1" enabled: true - - add_files: - - type: "source" - name: "almalinuxsecurebootca0.cer" - number: 300 - - type: "source" - name: "almalinuxsecureboot0.cer" - number: 301 - - - delete_files: - - file_name: "redhatsecurebootca3.cer" - - file_name: "redhatsecureboot301.cer" - - file_name: "redhatsecurebootca5.cer" - - file_name: "redhatsecureboot503.cer" - - - delete_line: - - target: "spec" - lines: - - | - Source300: redhatsecurebootca3.cer - Source301: redhatsecureboot301.cer - Source500: redhatsecurebootca5.cer - Source503: redhatsecureboot503.cer - - replace: - target: "spec" find: "%global debug_package %{nil}" @@ -33,27 +10,34 @@ actions: %global efi_vendor almalinux %global efidir almalinux %global efi_esp_dir /boot/efi/EFI/%{efidir} - + %global debug_package %{nil} count: 1 - target: "spec" find: | - -Defi_sbat_distro_id="fedora" \ - -Defi_sbat_distro_summary="The Fedora Project" \ + %if 0%{?centos} + %define sb_key centossecureboot202 + %else + %define sb_key redhatsecureboot802 + %endif replace: | - -Defi_sbat_distro_id="almalinux" \ - -Defi_sbat_distro_summary="AlmaLinux" \ - count: 1 - - target: "spec" - find: "-Defi_sbat_distro_url=\"https://src.fedoraproject.org/rpms/%{name}\"" - replace: "-Defi_sbat_distro_url=\"https://git.almalinux.org/rpms/%{name}\"" + %define sb_key almalinuxsecureboot0 count: 1 - target: "spec" find: | - %pesign -s -i %{fwup_efi_fn} -o %{fwup_efi_fn}.tmp -a %{SOURCE300} -c %{SOURCE301} -n redhatsecureboot301 - %pesign -s -i %{fwup_efi_fn}.tmp -o %{fwup_efi_fn}.signed -a %{SOURCE500} -c %{SOURCE503} -n redhatsecureboot503 + %if 0%{?centos} + -Defi_sbat_distro_id="centos" \ + -Defi_sbat_distro_summary="The Fedora Project" \ + -Defi_sbat_distro_url="https://www.centos.org/" \ + %else + -Defi_sbat_distro_id="rhel" \ + -Defi_sbat_distro_summary="Red Hat Enterprise Linux" \ + -Defi_sbat_distro_url="mailto:secalert@redhat.com" \ + %endif replace: | - %pesign -s -i %{fwup_efi_fn} -o %{fwup_efi_fn}.signed -a %{SOURCE300} -c %{SOURCE301} -n almalinuxsecureboot0 + -Defi_sbat_distro_id="almalinux" \ + -Defi_sbat_distro_summary="AlmaLinux" \ + -Defi_sbat_distro_url="https://git.almalinux.org/rpms/%{name}" \ count: 1 - changelog_entry: diff --git a/files/almalinuxsecureboot0.cer b/files/almalinuxsecureboot0.cer deleted file mode 100644 index e6bb9db..0000000 Binary files a/files/almalinuxsecureboot0.cer and /dev/null differ diff --git a/files/almalinuxsecurebootca0.cer b/files/almalinuxsecurebootca0.cer deleted file mode 100644 index d086cd5..0000000 Binary files a/files/almalinuxsecurebootca0.cer and /dev/null differ