From: Jan Stancek <jstancek@xxxxxxxxxx>
redhat: align file names with names of signing keys for ppc and s390
Forward port of c9s commit:
d8c1f5dbe0f2 ("redhat: align file names with names of signing keys for ppc and s390")
Signed-off-by: Jan Stancek <jstancek@xxxxxxxxxx>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -702,8 +702,7 @@ sources-rh: $(TARBALL) generate-testpatch-tmp setup-source dist-configs-check
@cat $$(ls -1 $(SPECPACKAGE_NAME).changelog-* | sort -t '.' -k 3 -n -r) \
> $(SOURCES)/kernel.changelog
@if [ "$(RELEASED_KERNEL)" -ne 0 ]; then \
- cp keys/redhatsecureboot{301,501,ca5,ca1}.cer $(SOURCES)/; \
- cp keys/secureboot_{ppc,s390}.cer $(SOURCES)/; \
+ cp keys/redhatsecureboot{301,302,303,501,ca5,ca1}.cer $(SOURCES)/; \
else \
cp keys/redhatsecureboot{003,401,ca2,ca4}.cer $(SOURCES)/; \
fi
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -822,8 +822,8 @@ Source10: redhatsecurebootca5.cer
Source11: redhatsecurebootca1.cer
Source12: redhatsecureboot501.cer
Source13: redhatsecureboot301.cer
-Source14: secureboot_s390.cer
-Source15: secureboot_ppc.cer
+Source14: redhatsecureboot302.cer
+Source15: redhatsecureboot303.cer
%define secureboot_ca_1 %{SOURCE10}
%define secureboot_ca_0 %{SOURCE11}
diff --git a/redhat/keys/secureboot_s390.cer b/redhat/keys/redhatsecureboot302.cer
rename from redhat/keys/secureboot_s390.cer
rename to redhat/keys/redhatsecureboot302.cer
index blahblah..blahblah 100644
--- a/redhat/keys/secureboot_s390.cer
+++ b/redhat/keys/redhatsecureboot302.cer
diff --git a/redhat/keys/secureboot_ppc.cer b/redhat/keys/redhatsecureboot303.cer
rename from redhat/keys/secureboot_ppc.cer
rename to redhat/keys/redhatsecureboot303.cer
index blahblah..blahblah 100644
--- a/redhat/keys/secureboot_ppc.cer
+++ b/redhat/keys/redhatsecureboot303.cer
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2849
--
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
