From 7fcff333ce0b7e90f664c5111df4ed733a8e4a5f4a400ccfd93414b2b4c9c056 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Wed, 16 Jan 2019 07:50:30 +0000
Subject: [PATCH] Align kubic

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/000product?expand=0&rev=816
---
 ...SUSE-Tumbleweed-Kubic-dvd5-dvd-x86_64.kiwi |   1 -
 openSUSE-Tumbleweed-Kubic.product             | 150 ++++++++----------
 opensuse_kubic.group                          |   5 +
 unsorted.yml                                  |   5 -
 4 files changed, 69 insertions(+), 92 deletions(-)

diff --git a/openSUSE-Tumbleweed-Kubic-dvd5-dvd-x86_64.kiwi b/openSUSE-Tumbleweed-Kubic-dvd5-dvd-x86_64.kiwi
index c475e657..26047a0b 100644
--- a/openSUSE-Tumbleweed-Kubic-dvd5-dvd-x86_64.kiwi
+++ b/openSUSE-Tumbleweed-Kubic-dvd5-dvd-x86_64.kiwi
@@ -110,7 +110,6 @@
       <repopackage name="dosfstools"/>
       <repopackage name="dracut"/>
       <repopackage name="dracut-ima"/>
-      <repopackage name="dummy-release"/>
       <repopackage name="e2fsprogs"/>
       <repopackage name="ebtables"/>
       <repopackage name="efibootmgr"/>
diff --git a/openSUSE-Tumbleweed-Kubic.product b/openSUSE-Tumbleweed-Kubic.product
index 4972d60c..c9b4627e 100644
--- a/openSUSE-Tumbleweed-Kubic.product
+++ b/openSUSE-Tumbleweed-Kubic.product
@@ -13,16 +13,10 @@
 
       <summary>openSUSE Tumbleweed Kubic</summary>
       <shortsummary>openSUSE Tumbleweed Kubic</shortsummary>
-      <description>openSUSE Tumbleweed Kubic combines the benefits of a rolling
-      OS with a container orchestration platform.
-
-      It is a modern Linux Operating System, designed for containers and
-      optimized for large, clustered deployments.  It inherits the benefits of
-      openSUSE Tumbleweed while redefining the operating system into a small,
-      efficient and reliable distribution.
+      <description>openSUSE Tumbleweed Kubic combines the benefits of a rolling OS with a container orchestration platform. It is a modern Linux Operating System, designed for containers and optimized for large, clustered deployments. It inherits the
+        benefits of openSUSE Tumbleweed while redefining the operating system into a small, efficient and reliable distribution.
       </description>
 
-
       <linguas>
         <language>en_US</language>
       </linguas>
@@ -33,93 +27,77 @@
 
       <buildconfig>
         <!-- This section is needed to generate the installation media -->
-	<producttheme>Kubic</producttheme>
-	<create_flavors>true</create_flavors>
+        <producttheme>Kubic</producttheme>
+        <create_flavors>true</create_flavors>
       </buildconfig>
 
       <installconfig>
         <!-- All flags needed during installation -->
         <defaultlang>en_US</defaultlang>
-          <datadir>suse</datadir>
-          <descriptiondir>suse/setup/descr</descriptiondir>
-          <distribution>openSUSE</distribution>
-        </installconfig>
+        <datadir>suse</datadir>
+        <descriptiondir>suse/setup/descr</descriptiondir>
+        <distribution>openSUSE</distribution>
+      </installconfig>
 
-        <!-- All Flags needed in the running system -->
-        <runtimeconfig />
-      </product>
-    </products>
+      <!-- All Flags needed in the running system -->
+      <runtimeconfig/>
+    </product>
+  </products>
 
-<!-- Default conditionals, repositories and archsets get imported -->
-    <xi:include href="defaults-conditionals.include" />
-    <xi:include href="defaults-archsets.include" />
-    <repositories>
-        <repository path="obs://openSUSE:Factory/standard"/>
-    </repositories>
+  <!-- Default conditionals, repositories and archsets get imported -->
+  <xi:include href="defaults-conditionals.include"/>
+  <xi:include href="defaults-archsets.include"/>
+  <repositories>
+    <repository path="obs://openSUSE:Factory/standard"/>
+  </repositories>
 
-    <mediasets>
-        <media type="dvd5"
-               flavor="dvd"
-               name="openSUSE-Tumbleweed-Kubic-DVD"
-               sourcemedia="0"
-               firmware="uefi"
-               mediastyle="suse-tumbleweed"
-	       run_hybridiso="true"
-               run_media_check="true"
-	       use_undecided="false"
-               create_pattern="false"
-               use_required="true"
-               use_recommended="false"
-               use_suggested="false" >
-               <!--   type   		      : defines the default size of a media
-                      flavor 		      : flavor name - this is needed for registration
-                      product		      : references the product name
-                      name   		      : name of the media
-                      sourcemedia       : sources on this media allowed?
-                      create_pattern    : create pattern out of the given groups
-                      use_required      : add required packages from the groups
-                      use_recommended   : add recommended packages from the groups
-                      use_suggested     : add suggested packages from the groups
-                      size              : define a new size for the media - default is defined via 'type' attribute
-                -->
-               <archsets>
-                   <archset ref="x86_64" />
-               </archsets>
-               <metadata>
-                  <package name="skelcd-installer-Kubic"/>
-                  <package name="skelcd-control-Kubic"/>
-		  <package name="skelcd-openSUSE"/>
-	  </metadata>
-	       <use group="openSUSE-Kubic"		create_pattern="false" use_recommended="false" />
-	       <use group="openSUSE-Kubic-DVD"  	create_pattern="false" use_recommended="false" />
-	       <use group="openSUSE-Kubic-3"		create_pattern="false" use_recommended="false" />
-	       <use group="openSUSE-Kubic-4"		create_pattern="false" use_recommended="false" />
-        </media>
-    </mediasets>
+  <mediasets>
+    <media
+      type="dvd5"
+      flavor="dvd"
+      name="openSUSE-Tumbleweed-Kubic-DVD"
+      sourcemedia="0"
+      firmware="uefi"
+      mediastyle="suse-tumbleweed"
+      run_hybridiso="true"
+      run_media_check="true"
+      use_undecided="false"
+      create_pattern="false"
+      use_required="true"
+      use_recommended="true"
+      use_suggested="false">
+      <archsets>
+        <archset ref="x86_64"/>
+      </archsets>
+      <metadata>
+        <package name="skelcd-installer-Kubic"/>
+        <package name="skelcd-control-Kubic"/>
+        <package name="skelcd-openSUSE"/>
+      </metadata>
+      <use group="opensuse_kubic" create_pattern="false"/>
+    </media>
+  </mediasets>
 
-    <group name="openSUSE-Kubic-direct">
-      <packagelist>
-	      <package name="caasp-container-manifests"/>
-	      <package name="kubic-caasp-dex-image"/>
-	      <package name="kubic-dnsmasq-nanny-image"/>
-	      <package name="kubic-flannel-image"/>
-	      <package name="kubic-haproxy-image"/>
-	      <package name="kubic-kubedns-image"/>
-	      <package name="kubic-mariadb-image"/>
-	      <package name="kubic-openldap-image"/>
-	      <package name="kubic-pv-recycler-node-image"/>
-	      <package name="kubic-salt-api-image"/>
-	      <package name="kubic-salt-master-image"/>
-	      <package name="kubic-salt-minion-image"/>
-	      <package name="kubic-sidecar-image"/>
-	      <package name="kubic-tiller-image"/>
-	      <package name="kubic-velum-image"/>
-      </packagelist>
-    </group>
+  <group name="openSUSE-Kubic-direct">
+    <packagelist>
+      <package name="caasp-container-manifests"/>
+      <package name="kubic-caasp-dex-image"/>
+      <package name="kubic-dnsmasq-nanny-image"/>
+      <package name="kubic-flannel-image"/>
+      <package name="kubic-haproxy-image"/>
+      <package name="kubic-kubedns-image"/>
+      <package name="kubic-mariadb-image"/>
+      <package name="kubic-openldap-image"/>
+      <package name="kubic-pv-recycler-node-image"/>
+      <package name="kubic-salt-api-image"/>
+      <package name="kubic-salt-master-image"/>
+      <package name="kubic-salt-minion-image"/>
+      <package name="kubic-sidecar-image"/>
+      <package name="kubic-tiller-image"/>
+      <package name="kubic-velum-image"/>
+    </packagelist>
+  </group>
 
-    <xi:include href="openSUSE-Kubic.group" />
-    <xi:include href="openSUSE-Kubic-DVD.group" />
-    <xi:include href="openSUSE-Kubic-3.group" />
-    <xi:include href="openSUSE-Kubic-4.group" />
+  <xi:include href="opensuse_kubic.group"/>
 
 </productdefinition>
diff --git a/opensuse_kubic.group b/opensuse_kubic.group
index 0a18c5df..a2d7a3e4 100644
--- a/opensuse_kubic.group
+++ b/opensuse_kubic.group
@@ -51,6 +51,7 @@
     <package name="diffutils" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:kernel-vanilla-base -->
     <package name="dmidecode" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-caasp-MicroOS -->
     <package name="docker-kubic" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-caasp-onlyDVD -->
+    <package name="docker-kubic-kubeadm-criconfig" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-caasp-alt-onlyDVD -->
     <package name="docker-libnetwork-kubic" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-caasp-onlyDVD -->
     <package name="docker-runc-kubic" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-caasp-onlyDVD -->
     <package name="dosfstools" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-caasp-MicroOS -->
@@ -105,6 +106,7 @@
     <package name="kbd-legacy" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:kernel-vanilla-base -->
     <package name="kdump" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-caasp-MicroOS -->
     <package name="kernel-default" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:kernel-default -->
+    <package name="kernel-default-base" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-caasp-alt-onlyDVD -->
     <package name="kernel-firmware" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-caasp-onlyDVD -->
     <package name="kexec-tools" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-caasp-MicroOS -->
     <package name="keyutils" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-caasp-kubeadm -->
@@ -349,8 +351,10 @@
     <package name="parted" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-caasp-MicroOS -->
     <package name="patterns-caasp-MicroOS" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-caasp-MicroOS -->
     <package name="patterns-caasp-alt-container-runtime" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-caasp-onlyDVD -->
+    <package name="patterns-caasp-alt-onlyDVD" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-caasp-alt-onlyDVD -->
     <package name="patterns-caasp-apparmor" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-caasp-onlyDVD -->
     <package name="patterns-caasp-container-runtime" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-caasp-onlyDVD -->
+    <package name="patterns-caasp-container-runtime-config" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-caasp-container-runtime-config -->
     <package name="patterns-caasp-hardware" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-caasp-onlyDVD -->
     <package name="patterns-caasp-ima_evm" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-caasp-onlyDVD -->
     <package name="patterns-caasp-kubeadm" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-caasp-kubeadm -->
@@ -370,6 +374,7 @@
     <package name="pinentry" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-caasp-MicroOS -->
     <package name="pkg-config" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:kernel-vanilla-base -->
     <package name="podman" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-caasp-onlyDVD -->
+    <package name="podman-cni-config" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-caasp-container-runtime-config -->
     <package name="procps" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-caasp-MicroOS -->
     <package name="psmisc" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-caasp-MicroOS -->
     <package name="python-base" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-caasp-onlyDVD -->
diff --git a/unsorted.yml b/unsorted.yml
index a822f39d..d32555d4 100644
--- a/unsorted.yml
+++ b/unsorted.yml
@@ -2005,7 +2005,6 @@ unsorted:
   - docker-bench-security 
   - docker-distribution-registry 
   - docker-kubic-bash-completion 
-  - docker-kubic-kubeadm-criconfig 
   - docker-kubic-test 
   - docker-kubic-zsh-completion 
   - docker-libnetwork 
@@ -5486,7 +5485,6 @@ unsorted:
   - kernel-debug 
   - kernel-debug-base 
   - kernel-debug-devel 
-  - kernel-default-base 
   - kernel-docs-html 
   - kernel-kvmsmall 
   - kernel-kvmsmall-base 
@@ -13894,8 +13892,6 @@ unsorted:
   - patterns-base-update_test 
   - patterns-base-x11-32bit 
   - patterns-base-x11_enhanced-32bit 
-  - patterns-caasp-alt-onlyDVD 
-  - patterns-caasp-container-runtime-config 
   - patterns-devel-base-devel_basis-32bit 
   - patterns-devel-base-devel_kernel-32bit 
   - patterns-devel-java-devel_java 
@@ -15276,7 +15272,6 @@ unsorted:
   - pocketsphinx-devel 
   - pocl 
   - pocl-devel 
-  - podman-cni-config 
   - podofo 
   - poedit 
   - poedit-lang