Simplify build since I only support x86_64 currently.

include/build-x86_64.ipp.yml

@@ -1,50 +0,0 @@
-version: '2'
-mpp-vars:
-  efiarch: x64
-  boot_rpms:
-    mpp-join:
-      - mpp-eval: boot_rpms
-      - - grub2-efi-x64
-        - grub2-pc
-  base_rpms:
-    mpp-join:
-      - mpp-eval: base_rpms
-      - - microcode_ctl
-pipelines:
-- name: build
-  runner: org.osbuild.centos9
-  stages:
-  - type: org.osbuild.rpm
-    inputs:
-      packages:
-        type: org.osbuild.files
-        origin: org.osbuild.source
-        mpp-depsolve:
-          architecture: $arch
-          module-platform-id: $distro_module_id
-          baseurl: $distro_baseurl/BaseOS/$arch/os/
-          repos:
-            mpp-eval: distro_repos
-          packages:
-            mpp-join:
-              - mpp-eval: build_rpms
-              - mpp-eval: extra_build_rpms
-              - - grub2-efi-x64
-                - grub2-efi-x64-cdboot
-                - grub2-tools-efi
-                - grub2-pc
-                - grub2-pc-modules
-                - grub2-tools
-                - shim-x64
-    options:
-      gpgkeys:
-      - mpp-eval: centos_gpg_key
-      - mpp-eval: redhat_gpg_key
-      exclude:
-        docs: true
-  - type: org.osbuild.selinux
-    options:
-      file_contexts: etc/selinux/targeted/contexts/files/file_contexts
-      labels:
-        /usr/bin/cp: system_u:object_r:install_exec_t:s0
-        /usr/bin/tar: system_u:object_r:install_exec_t:s0

include/build.ipp.yml

@@ -2,6 +2,7 @@ version: '2'
 
 mpp-vars:
   distro_name: cs9 # The default
+  efiarch: x64
 
 mpp-define-image:
   size: $image_size
@@ -30,9 +31,41 @@ pipelines:
     path: distro/$distro_name.ipp.yml
 - mpp-import-pipelines:
     path: defaults.ipp.yml
-- mpp-import-pipelines:
-    path: target-$target.ipp.yml
-- mpp-import-pipeline:
-    path: build-$arch.ipp.yml
-    id: build
+- name: build
+  runner: org.osbuild.centos9
+  stages:
+  - type: org.osbuild.rpm
+    inputs:
+      packages:
+        type: org.osbuild.files
+        origin: org.osbuild.source
+        mpp-depsolve:
+          architecture: $arch
+          module-platform-id: $distro_module_id
+          baseurl: $distro_baseurl/BaseOS/$arch/os/
+          repos:
+            mpp-eval: distro_repos
+          packages:
+            mpp-join:
+              - mpp-eval: build_rpms
+              - mpp-eval: extra_build_rpms
+              - - grub2-efi-x64
+                - grub2-efi-x64-cdboot
+                - grub2-tools-efi
+                - grub2-pc
+                - grub2-pc-modules
+                - grub2-tools
+                - shim-x64
+    options:
+      gpgkeys:
+      - mpp-eval: centos_gpg_key
+      - mpp-eval: redhat_gpg_key
+      exclude:
+        docs: true
+  - type: org.osbuild.selinux
+    options:
+      file_contexts: etc/selinux/targeted/contexts/files/file_contexts
+      labels:
+        /usr/bin/cp: system_u:object_r:install_exec_t:s0
+        /usr/bin/tar: system_u:object_r:install_exec_t:s0
   runner: org.osbuild.centos9

include/defaults.ipp.yml

@@ -275,9 +275,12 @@ mpp-vars:
   boot_rpms:
     - dracut-config-generic
     - grub2-tools-minimal
+    - grub2-efi-x64
+    - grub2-pc
     - $kernel_rpm
   base_rpms:
     - $linux_firmware_rpm
+    - microcode_ctl
     - NetworkManager
     - audit
     - chrony

include/target-qemu.ipp.yml

@@ -1,2 +0,0 @@
-version: '2'
-pipelines: []

k8s/run.sh

@@ -1,6 +1,14 @@
+echo "========> Building minimal."
 sudo podman run --rm \
      --privileged \
      -v $PWD:/project:Z \
      -w /project \
      localhost/j7s-os-builder:latest \
      make cs9-qemu-minimal-ostree.x86_64.repo
+echo "========> Building container."
+sudo podman run --rm \
+     --privileged \
+     -v $PWD:/project:Z \
+     -w /project \
+     localhost/j7s-os-builder:latest \
+     make cs9-qemu-container-ostree.x86_64.repo