Bladeren bron

Build Fedora in Actions without Secure boot (#1616)

Benjamin Otto 6 maanden geleden
bovenliggende
commit
f94e8003ac
1 gewijzigde bestanden met toevoegingen van 6 en 6 verwijderingen
  1. 6 6
      pkg/fedora/kernel-surface/build-linux-surface.py

+ 6 - 6
pkg/fedora/kernel-surface/build-linux-surface.py

@@ -4,6 +4,7 @@ import argparse
 import subprocess
 import sys
 from pathlib import Path
+import logging
 
 #####################################################################
 
@@ -86,7 +87,7 @@ sb_key = script / "secureboot" / "MOK.key"
 
 # Check if the major version is supported.
 if not patches.exists() or not config.exists():
-    print("ERROR: Could not find patches / configs for kernel %s!" % kernel_major)
+    logging.error("ERROR: Could not find patches / configs for kernel %s!" % kernel_major)
     sys.exit(1)
 
 # Check if Secure Boot keys are available.
@@ -94,12 +95,11 @@ sb_avail = sb_cert.exists() and sb_key.exists()
 
 # If we are building without secureboot, require user input to continue.
 if not sb_avail:
-    print("")
-    print("Secure Boot keys were not configured! Using Red Hat testkeys.")
-    print("The compiled kernel will not boot with Secure Boot enabled!")
-    print("")
+    logging.warning("Secure Boot keys were not configured! Using Red Hat testkeys.")
+    logging.warning("The compiled kernel will not boot with Secure Boot enabled!")
 
-    input("Press enter to continue: ")
+    if sys.stdin.isatty():
+        input("Press enter to continue: ")
 
 # Expand globs
 surface_patches = sorted(patches.glob("*.patch"))