From 1a80921b2b0685e783674ba6df796ba03a8f183f Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Tue, 7 May 2024 13:53:04 -0700
Subject: [PATCH] add kiwi changes

---
 iso/empanadas/empanadas/configs/el10.yaml     | 24 ++++++++++---------
 iso/empanadas/empanadas/configs/el10lh.yaml   | 21 ++++++----------
 iso/empanadas/empanadas/configs/el9-beta.yaml | 16 +++++--------
 iso/empanadas/empanadas/configs/el9.yaml      |  9 -------
 iso/empanadas/empanadas/configs/el9lh.yaml    | 16 +++++--------
 5 files changed, 32 insertions(+), 54 deletions(-)

diff --git a/iso/empanadas/empanadas/configs/el10.yaml b/iso/empanadas/empanadas/configs/el10.yaml
index 42a349b..cec3493 100644
--- a/iso/empanadas/empanadas/configs/el10.yaml
+++ b/iso/empanadas/empanadas/configs/el10.yaml
@@ -35,6 +35,7 @@
     - 'SAPHANA'
     - 'extras'
     - 'plus'
+  extra_repos: []
   structure:
     packages: 'os/Packages'
     repodata: 'os/repodata'
@@ -125,17 +126,18 @@
   kiwimap:
     git_repo: 'https://git.resf.org/sig_core/rocky-kiwi-descriptions.git'
     branch: 'r9'
-    supported_builds:
-      - live
-      - cloud
-      - container
-      - vagrant
-    allowed_arches:
-      - x86_64
-      - aarch64
-      - ppc64le
-      - s390x
-    required_pkgs: []
+    required_pkgs:
+      - dracut-kiwi-live
+      - git
+      - kiwi
+      - kiwi-cli
+      - kiwi-systemdeps-bootloaders
+      - kiwi-systemdeps-containers
+      - kiwi-systemdeps-core
+      - kiwi-systemdeps-disk-images
+      - kiwi-systemdeps-filesystems
+      - kiwi-systemdeps-image-validation
+      - kiwi-systemdeps-iso-media
   repoclosure_map:
     arches:
       x86_64: '--forcearch=x86_64 --arch=x86_64 --arch=athlon --arch=i686 --arch=i586 --arch=i486 --arch=i386 --arch=noarch'
diff --git a/iso/empanadas/empanadas/configs/el10lh.yaml b/iso/empanadas/empanadas/configs/el10lh.yaml
index 71bdc00..1ce4cb9 100644
--- a/iso/empanadas/empanadas/configs/el10lh.yaml
+++ b/iso/empanadas/empanadas/configs/el10lh.yaml
@@ -35,6 +35,7 @@
     - 'SAPHANA'
     - 'extras'
     - 'plus'
+  extra_repos: []
   structure:
     packages: 'os/Packages'
     repodata: 'os/repodata'
@@ -125,26 +126,18 @@
   kiwimap:
     git_repo: 'https://git.resf.org/sig_core/rocky-kiwi-descriptions.git'
     branch: 'r9'
-    supported_builds:
-      - live
-      - cloud
-      - container
-      - vagrant
-    allowed_arches:
-      - x86_64
-      - aarch64
-      - ppc64le
-      - s390x
     required_pkgs:
       - dracut-kiwi-live
       - git
       - kiwi
       - kiwi-cli
+      - kiwi-systemdeps-bootloaders
+      - kiwi-systemdeps-containers
+      - kiwi-systemdeps-core
+      - kiwi-systemdeps-disk-images
+      - kiwi-systemdeps-filesystems
       - kiwi-systemdeps-image-validation
-    required_project_id: '47e0b4a8-84ba-43a9-bb94-eb99dde4cf14'
-    required_project_repos:
-      - 'core-common'
-      - 'core-infra'
+      - kiwi-systemdeps-iso-media
   repoclosure_map:
     arches:
       x86_64: '--forcearch=x86_64 --arch=x86_64 --arch=athlon --arch=i686 --arch=i586 --arch=i486 --arch=i386 --arch=noarch'
diff --git a/iso/empanadas/empanadas/configs/el9-beta.yaml b/iso/empanadas/empanadas/configs/el9-beta.yaml
index 00e4ae7..ab8472f 100644
--- a/iso/empanadas/empanadas/configs/el9-beta.yaml
+++ b/iso/empanadas/empanadas/configs/el9-beta.yaml
@@ -133,22 +133,18 @@
   kiwimap:
     git_repo: 'https://git.resf.org/sig_core/rocky-kiwi-descriptions.git'
     branch: 'r9'
-    supported_builds:
-      - live
-      - cloud
-      - container
-      - vagrant
-    allowed_arches:
-      - x86_64
-      - aarch64
-      - ppc64le
-      - s390x
     required_pkgs:
       - dracut-kiwi-live
       - git
       - kiwi
       - kiwi-cli
+      - kiwi-systemdeps-bootloaders
+      - kiwi-systemdeps-containers
+      - kiwi-systemdeps-core
+      - kiwi-systemdeps-disk-images
+      - kiwi-systemdeps-filesystems
       - kiwi-systemdeps-image-validation
+      - kiwi-systemdeps-iso-media
   repoclosure_map:
     arches:
       x86_64: '--forcearch=x86_64 --arch=x86_64 --arch=athlon --arch=i686 --arch=i586 --arch=i486 --arch=i386 --arch=noarch'
diff --git a/iso/empanadas/empanadas/configs/el9.yaml b/iso/empanadas/empanadas/configs/el9.yaml
index 29bda12..c2e5f54 100644
--- a/iso/empanadas/empanadas/configs/el9.yaml
+++ b/iso/empanadas/empanadas/configs/el9.yaml
@@ -159,15 +159,6 @@
   kiwimap:
     git_repo: 'https://git.resf.org/sig_core/rocky-kiwi-descriptions.git'
     branch: 'r9'
-    supported_builds:
-      - cloud
-      - container
-      - vagrant
-    allowed_arches:
-      - x86_64
-      - aarch64
-      - ppc64le
-      - s390x
     required_pkgs:
       - dracut-kiwi-live
       - git
diff --git a/iso/empanadas/empanadas/configs/el9lh.yaml b/iso/empanadas/empanadas/configs/el9lh.yaml
index 4da01f4..69a14a9 100644
--- a/iso/empanadas/empanadas/configs/el9lh.yaml
+++ b/iso/empanadas/empanadas/configs/el9lh.yaml
@@ -133,22 +133,18 @@
   kiwimap:
     git_repo: 'https://git.resf.org/sig_core/rocky-kiwi-descriptions.git'
     branch: 'r9'
-    supported_builds:
-      - live
-      - cloud
-      - container
-      - vagrant
-    allowed_arches:
-      - x86_64
-      - aarch64
-      - ppc64le
-      - s390x
     required_pkgs:
       - dracut-kiwi-live
       - git
       - kiwi
       - kiwi-cli
+      - kiwi-systemdeps-bootloaders
+      - kiwi-systemdeps-containers
+      - kiwi-systemdeps-core
+      - kiwi-systemdeps-disk-images
+      - kiwi-systemdeps-filesystems
       - kiwi-systemdeps-image-validation
+      - kiwi-systemdeps-iso-media
   repoclosure_map:
     arches:
       x86_64: '--forcearch=x86_64 --arch=x86_64 --arch=athlon --arch=i686 --arch=i586 --arch=i486 --arch=i386 --arch=noarch'