From 40df0424663607a4d79653028bcb5a4351124df8ecff976d75347aab73acf6f3 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Mon, 1 Feb 2021 08:18:41 +0000
Subject: [PATCH] Accepting request 867406 from home:favogt:jeosarchsimpler

- Simplify multi-arch profiles using a new kiwi feature

OBS-URL: https://build.opensuse.org/request/show/867406
OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/kiwi-templates-JeOS?expand=0&rev=55
---
 JeOS.kiwi                   | 26 ++++++--------------------
 kiwi-templates-JeOS.changes |  5 +++++
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/JeOS.kiwi b/JeOS.kiwi
index ead2d83..d57198e 100644
--- a/JeOS.kiwi
+++ b/JeOS.kiwi
@@ -10,28 +10,14 @@
     </description>
     <profiles>
         <!-- Those two are only used as deps -->
-        <profile name="kvm-and-xen.x86_64" description="JeOS for KVM and HVM Xen" arch="x86_64"/>
-        <profile name="kvm-and-xen.aarch64" description="JeOS for KVM and HVM Xen" arch="aarch64"/>
-        <profile name="kvm-and-xen" description="JeOS for KVM and HVM Xen" arch="x86_64">
-            <requires profile="kvm-and-xen.x86_64"/>
-        </profile>
-        <profile name="kvm-and-xen" description="JeOS for KVM and HVM Xen" arch="aarch64">
-            <requires profile="kvm-and-xen.aarch64"/>
-        </profile>
+        <profile name="kvm-and-xen" description="JeOS for KVM and Xen" arch="aarch64,x86_64"/>
         <profile name="VMware" description="JeOS for VMware" arch="x86_64"/>
         <!-- Those two are only used as deps -->
-        <profile name="MS-HyperV.x86_64" description="JeOS for Hyper-V" arch="x86_64"/>
-        <profile name="MS-HyperV.aarch64" description="JeOS for Hyper-V" arch="aarch64"/>
-        <profile name="MS-HyperV" description="JeOS for Hyper-V" arch="x86_64">
-            <requires profile="MS-HyperV.x86_64"/>
-        </profile>
-        <profile name="MS-HyperV" description="JeOS for Hyper-V" arch="aarch64">
-            <requires profile="MS-HyperV.aarch64"/>
-        </profile>
+        <profile name="MS-HyperV" description="JeOS for Hyper-V" arch="aarch64,x86_64"/>
         <profile name="OpenStack-Cloud" description="JeOS for OpenStack Cloud" arch="x86_64"/>
         <profile name="RaspberryPi" description="JeOS for the Raspberry Pi" arch="aarch64"/>
     </profiles>
-    <preferences profiles="kvm-and-xen.x86_64">
+    <preferences profiles="kvm-and-xen" arch="x86_64">
         <version>15.1.0</version>
         <packagemanager>zypper</packagemanager>
         <bootloader-theme>openSUSE</bootloader-theme>
@@ -64,7 +50,7 @@
         </type>
     </preferences>
 
-    <preferences profiles="kvm-and-xen.aarch64">
+    <preferences profiles="kvm-and-xen" arch="aarch64">
         <version>15.1.0</version>
         <packagemanager>zypper</packagemanager>
         <bootloader-theme>openSUSE</bootloader-theme>
@@ -152,7 +138,7 @@
         </type>
     </preferences>
 
-    <preferences profiles="MS-HyperV.x86_64">
+    <preferences profiles="MS-HyperV" arch="x86_64">
         <version>15.1.0</version>
         <packagemanager>zypper</packagemanager>
         <bootloader-theme>openSUSE</bootloader-theme>
@@ -186,7 +172,7 @@
         </type>
     </preferences>
 
-    <preferences profiles="MS-HyperV.aarch64">
+    <preferences profiles="MS-HyperV" arch="aarch64">
         <version>15.1.0</version>
         <packagemanager>zypper</packagemanager>
         <bootloader-theme>openSUSE</bootloader-theme>
diff --git a/kiwi-templates-JeOS.changes b/kiwi-templates-JeOS.changes
index da12e39..5fe9a03 100644
--- a/kiwi-templates-JeOS.changes
+++ b/kiwi-templates-JeOS.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jan 27 08:33:04 UTC 2021 - Fabian Vogt <fvogt@suse.com>
+
+- Simplify multi-arch profiles using a new kiwi feature
+
 -------------------------------------------------------------------
 Tue Jan 19 13:05:39 UTC 2021 - Fabian Vogt <fvogt@suse.com>