From 123bb16f2dddbf26f7eaa062e7780f0495493d50a5e4eb82f59642e10eae0eb3 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Tue, 29 May 2018 14:35:15 +0000
Subject: [PATCH] No arch specification needed for metapackages

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/000product?expand=0&rev=239
---
 ...uct_converter:openSUSE-ftp-ftp-i586_x86_64.kiwi |  8 ++++----
 openSUSE.product                                   | 14 ++++++--------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/_service:product_converter:openSUSE-ftp-ftp-i586_x86_64.kiwi b/_service:product_converter:openSUSE-ftp-ftp-i586_x86_64.kiwi
index 27550a8a..2e484769 100644
--- a/_service:product_converter:openSUSE-ftp-ftp-i586_x86_64.kiwi
+++ b/_service:product_converter:openSUSE-ftp-ftp-i586_x86_64.kiwi
@@ -57,10 +57,10 @@
       <source path="obs://openSUSE:Factory:Containers/container"/>
     </instrepo>
     <metadata>
-      <repopackage name="skelcd-installer-openSUSE" medium="0" arch="i586,x86_64" removearch="src,nosrc" onlyarch="i586,x86_64"/>
-      <repopackage name="instlux" medium="0" arch="i586,x86_64" removearch="src,nosrc" onlyarch="i586,x86_64"/>
-      <repopackage name="skelcd-control-openSUSE" medium="0" arch="i586,x86_64" removearch="src,nosrc" onlyarch="i586,x86_64"/>
-      <repopackage name="skelcd-openSUSE" medium="0" arch="i586,x86_64" removearch="src,nosrc" onlyarch="i586"/>
+      <repopackage name="skelcd-installer-openSUSE" medium="0" removearch="src,nosrc" onlyarch="i586,x86_64"/>
+      <repopackage name="instlux" medium="0" removearch="src,nosrc" onlyarch="i586,x86_64"/>
+      <repopackage name="skelcd-control-openSUSE" medium="0" removearch="src,nosrc" onlyarch="i586,x86_64"/>
+      <repopackage name="skelcd-openSUSE" medium="0" removearch="src,nosrc" onlyarch="i586,x86_64"/>
     </metadata>
     <repopackages>
       <repopackage name="*"/>
diff --git a/openSUSE.product b/openSUSE.product
index 084ec10f..9728eefa 100644
--- a/openSUSE.product
+++ b/openSUSE.product
@@ -114,12 +114,11 @@
           <!-- we put all packages (even suggested) on the media for the two groups below -->
           <metadata>
               <!-- if you like to add a metapackage to the real media, add it in a normal group.xml file -->
-              <package name="skelcd-installer-openSUSE" arch="i586,x86_64" onlyarch="i586,x86_64" />
-              <package name="instlux" arch="i586,x86_64" onlyarch="i586,x86_64" />
-              <package name="skelcd-control-openSUSE" arch="i586,x86_64" onlyarch="i586,x86_64" />
-      <!--        <package name="skelcd-openSUSE" arch="armv7hl" onlyarch="armv7hl"/> -->
-              <package name="skelcd-openSUSE" arch="i586,x86_64" onlyarch="i586"/>
-              <!-- package name="yast2-slide-show" onlyarch="noarch" / -->
+              <package name="skelcd-installer-openSUSE" />
+              <package name="instlux" />
+              <package name="skelcd-control-openSUSE" />
+              <package name="skelcd-openSUSE"/>
+              <!-- package name="yast2-slide-show" / -->
           </metadata>
           <use group="i586_additional" create_pattern="false" />
           <use group="i686_kernels_ftp" create_pattern="false" />
@@ -178,10 +177,9 @@
           <metadata>
               <!-- if you like to add a metapackage to the real media, add it in a normal group.xml file -->
               <package name="skelcd-installer-openSUSE" />
-              <!-- package name="openSUSE-images" arch="x86_64" / -->
               <package name="skelcd-control-openSUSE" />
               <package name="skelcd-openSUSE" />
-              <!--package name="yast2-slide-show" onlyarch="noarch" /-->
+              <!--package name="yast2-slide-show" /-->
           </metadata>
         </media>