From: Jan Stancek <[email protected]>

redhat: fix signing for realtime and arm64_64k non-debug variants

Module signing for non-debug realtime and arm64_64k is currently missing.

Signed-off-by: Jan Stancek <[email protected]>

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
@@ -2845,20 +2845,24 @@ find Documentation -type d | xargs chmod u+w
     if [ "%{with_pae}" -ne "0" ]; then \
        %{modsign_cmd} certs/signing_key.pem.sign+lpae 
certs/signing_key.x509.sign+lpae $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+lpae/ \
     fi \
-    if [ "%{with_debug}" -ne "0" ]; then \
-      if [ "%{with_realtime}" -ne "0" ]; then \
-        %{modsign_cmd} certs/signing_key.pem.sign+rt-debug 
certs/signing_key.x509.sign+rt-debug 
$RPM_BUILD_ROOT/lib/modules/%{KVERREL}+rt-debug/ \
-      fi \
-      if [ "%{with_up}" -ne "0" ]; then \
-        %{modsign_cmd} certs/signing_key.pem.sign+debug 
certs/signing_key.x509.sign+debug $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+debug/ 
\
-      fi \
-      if [ "%{with_arm64_64k}" -ne "0" ]; then \
-        %{modsign_cmd} certs/signing_key.pem.sign+64k-debug 
certs/signing_key.x509.sign+64k-debug 
$RPM_BUILD_ROOT/lib/modules/%{KVERREL}+64k-debug/ \
-      fi \
-    fi \
     if [ "%{with_up_base}" -ne "0" ]; then \
       %{modsign_cmd} certs/signing_key.pem.sign certs/signing_key.x509.sign 
$RPM_BUILD_ROOT/lib/modules/%{KVERREL}/ \
     fi \
+    if [ "%{with_up}" -ne "0" ] && [ "%{with_debug}" -ne "0" ]; then \
+         %{modsign_cmd} certs/signing_key.pem.sign+debug 
certs/signing_key.x509.sign+debug $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+debug/ 
\
+    fi \
+    if [ "%{with_realtime_base}" -ne "0" ]; then \
+       %{modsign_cmd} certs/signing_key.pem.sign+rt 
certs/signing_key.x509.sign+rt $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+rt/ \
+    fi \
+    if [ "%{with_realtime}" -ne "0" ] && [ "%{with_debug}" -ne "0" ]; then \
+         %{modsign_cmd} certs/signing_key.pem.sign+rt-debug 
certs/signing_key.x509.sign+rt-debug 
$RPM_BUILD_ROOT/lib/modules/%{KVERREL}+rt-debug/ \
+    fi \
+    if [ "%{with_arm64_64k_base}" -ne "0" ]; then \
+       %{modsign_cmd} certs/signing_key.pem.sign+64k 
certs/signing_key.x509.sign+64k $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+64k/ \
+    fi \
+    if [ "%{with_arm64_64k}" -ne "0" ] && [ "%{with_debug}" -ne "0" ]; then \
+         %{modsign_cmd} certs/signing_key.pem.sign+64k-debug 
certs/signing_key.x509.sign+64k-debug 
$RPM_BUILD_ROOT/lib/modules/%{KVERREL}+64k-debug/ \
+    fi \
   fi \
   if [ "%{zipmodules}" -eq "1" ]; then \
     echo "Compressing kernel modules ..." \

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2528
_______________________________________________
kernel mailing list -- [email protected]
To unsubscribe send an email to [email protected]
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/[email protected]
Do not reply to spam, report it: 
https://pagure.io/fedora-infrastructure/new_issue

Reply via email to