WIP: Add support for SIG/AltArch and --kiwi-file

preliminary, several TODOs

Author: NeilHanlon

iso/empanadas/empanadas/backends/kiwi.py

@@ -55,6 +55,12 @@
             "kiwiProfile": "Container",
             "fileType": "tar.xz",
             "outputKey": "container"
+        },
+        "SBC": {
+            "kiwiType": "oem",
+            "kiwiProfile": "SBC",
+            "fileType": "raw",
+            "outputKey": "disk_image"
         }
     }
 )
@@ -73,6 +79,7 @@ def wrapper(self, *args, **kwargs):
 class KiwiBackend(BackendInterface):
     """Build an image using Kiwi"""
 
+    kiwi_file: str
     build_args: List[str] = field(factory=list)
     image_result: ImagesData = field(init=False)
     kiwi_conf: AttributeDict = field(init=False)
@@ -92,6 +99,7 @@ def build(self):
 
         kiwi_command = [
             "kiwi-ng", "--color-output",
+            "--kiwi-file", self.kiwi_file,
             *self.build_args,
         ]
         if self.ctx.debug:
@@ -163,7 +171,7 @@ def clean(self):
 
     def run_mock_command(self, mock_command: List[str]):
         mock_args = ["--configdir", "/tmp/mock-rocky-configs/etc/mock", "-r", f"rl-9-{self.ctx.architecture.name}-core-infra"]
-        if self.ctx.image_type != 'Container':
+        if self.ctx.image_type not in ['Container']:
             mock_args.append("--isolation=simple")
         command = [
             "mock",

iso/empanadas/empanadas/common.py

@@ -119,8 +119,7 @@ class Color:
     "GenericCloud": ["Base", "LVM"],
     "Vagrant": ["Libvirt", "Vbox", "VMware"],
     "OCP": ["Base"],
-    "RPI": ["Base"],
-    "GenericArm": ["Minimal"],
+    "SBC": ["RaspberryPi", "GenericArm"],
 }
 
 

iso/empanadas/empanadas/scripts/build_image.py

@@ -69,7 +69,11 @@ def run():
 
     for architecture in arches:
         if results.backend == "kiwi":
-            backend = KiwiBackend()
+            kiwi_file = "config.xml"
+            if results.variant == "RaspberryPi":
+               kiwi_file = "rocky-sbc-raspberrypi.xml" 
+
+            backend = KiwiBackend(kiwi_file=kiwi_file)
         else:
             backend = ImageFactoryBackend(
                 kickstart_dir="kickstart" if results.kickstartdir else "os",