From 9c1cf4fbfc4de34388a76aad7e00411806a532040df2af49c62d095b849287bb Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Wed, 16 Jan 2019 08:04:21 +0000
Subject: [PATCH] Align NonOss handling with leap:

- drop the addon CD
- simplify setup for FTP tree, just take all packages
  in openSUSE:Factory:NonFree

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/000product?expand=0&rev=817
---
 _multibuild                                   |   3 +-
 openSUSE-Addon-NonOss-Deps-x86_64.group       |  56 --
 openSUSE-Addon-NonOss-Deps.group              |  38 --
 ...on-NonOss-cd-addon-nonoss-i586_x86_64.kiwi | 570 ------------------
 ...SUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi |  50 +-
 openSUSE-Addon-NonOss-x86_64.group            |  11 -
 openSUSE-Addon-NonOss.group                   |  39 --
 openSUSE-Addon-NonOss.product                 |  39 +-
 8 files changed, 11 insertions(+), 795 deletions(-)
 delete mode 100644 openSUSE-Addon-NonOss-Deps-x86_64.group
 delete mode 100644 openSUSE-Addon-NonOss-Deps.group
 delete mode 100644 openSUSE-Addon-NonOss-cd-addon-nonoss-i586_x86_64.kiwi
 delete mode 100644 openSUSE-Addon-NonOss-x86_64.group
 delete mode 100644 openSUSE-Addon-NonOss.group

diff --git a/_multibuild b/_multibuild
index 9eebd533..af8ad511 100644
--- a/_multibuild
+++ b/_multibuild
@@ -1,10 +1,9 @@
 <multibuild>
-  <package>openSUSE-Addon-NonOss-cd-addon-nonoss-i586_x86_64</package>
   <package>openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64</package>
+  <package>openSUSE-Tumbleweed-Kubic-dvd5-dvd-x86_64</package>
   <package>openSUSE-cd-mini-i586</package>
   <package>openSUSE-cd-mini-x86_64</package>
   <package>openSUSE-dvd5-dvd-i586</package>
   <package>openSUSE-dvd5-dvd-x86_64</package>
   <package>openSUSE-ftp-ftp-i586_x86_64</package>
-  <package>openSUSE-Tumbleweed-Kubic-dvd5-dvd-x86_64</package>
 </multibuild>
diff --git a/openSUSE-Addon-NonOss-Deps-x86_64.group b/openSUSE-Addon-NonOss-Deps-x86_64.group
deleted file mode 100644
index 86f404e1..00000000
--- a/openSUSE-Addon-NonOss-Deps-x86_64.group
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Autogenerated by https://github.com/openSUSE/package-lists -->
-<group name="Addon-NonOss-Deps-x86_64">
-  <conditional name="only_x86_64"/>
-  <packagelist>
-    <package name="Mesa-32bit"/>
-    <package name="Mesa-dri-32bit"/>
-    <package name="Mesa-gallium-32bit"/>
-    <package name="Mesa-libGL1-32bit"/>
-    <package name="Mesa-libglapi0-32bit"/>
-    <package name="alsa-devel-32bit"/>
-    <package name="gtk2-engine-oxygen-32bit"/>
-    <package name="libFLAC8-32bit"/>
-    <package name="libLLVM7-32bit"/>
-    <package name="libSDL-1_2-0-32bit"/>
-    <package name="libX11-xcb1-32bit"/>
-    <package name="libXdmcp6-32bit"/>
-    <package name="libXxf86vm1-32bit"/>
-    <package name="libcurl4-32bit"/>
-    <package name="libdrm2-32bit"/>
-    <package name="libdrm_amdgpu1-32bit"/>
-    <package name="libdrm_intel1-32bit"/>
-    <package name="libdrm_nouveau2-32bit"/>
-    <package name="libdrm_radeon1-32bit"/>
-    <package name="libdw1-32bit"/>
-    <package name="libebl-plugins-32bit"/>
-    <package name="libedit0-32bit"/>
-    <package name="libelf1-32bit"/>
-    <package name="libfreebl3-32bit"/>
-    <package name="libncurses6-32bit"/>
-    <package name="libnghttp2-14-32bit"/>
-    <package name="libnm-glib4-32bit"/>
-    <package name="libnm-util2-32bit"/>
-    <package name="libopenal1-32bit"/>
-    <package name="libopenssl1_0_0-steam-32bit"/>
-    <package name="libpciaccess0-32bit"/>
-    <package name="libpsl5-32bit"/>
-    <package name="libpulse0-32bit"/>
-    <package name="libsndfile1-32bit"/>
-    <package name="libsoftokn3-32bit"/>
-    <package name="libspeex1-32bit"/>
-    <package name="libssh4-32bit"/>
-    <package name="libtheora0-32bit"/>
-    <package name="libvorbisenc2-32bit"/>
-    <package name="libxcb-dri2-0-32bit"/>
-    <package name="libxcb-dri3-0-32bit"/>
-    <package name="libxcb-glx0-32bit"/>
-    <package name="libxcb-present0-32bit"/>
-    <package name="libxcb-sync1-32bit"/>
-    <package name="libxshmfence1-32bit"/>
-    <package name="mozilla-nspr-32bit"/>
-    <package name="mozilla-nss-32bit"/>
-    <package name="mozilla-nss-certs-32bit"/>
-    <package name="pulseaudio-utils-32bit"/>
-  </packagelist>
-</group>
diff --git a/openSUSE-Addon-NonOss-Deps.group b/openSUSE-Addon-NonOss-Deps.group
deleted file mode 100644
index d145a89a..00000000
--- a/openSUSE-Addon-NonOss-Deps.group
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Autogenerated by https://github.com/openSUSE/package-lists -->
-<group name="Addon-NonOss-Deps">
-  <packagelist>
-    <package name="7kaa"/>
-    <package name="Mesa-KHR-devel"/>
-    <package name="Mesa-devel"/>
-    <package name="Mesa-libEGL-devel"/>
-    <package name="Mesa-libGL-devel"/>
-    <package name="Mesa-libGLESv1_CM-devel"/>
-    <package name="Mesa-libGLESv1_CM1"/>
-    <package name="Mesa-libGLESv2-2"/>
-    <package name="Mesa-libGLESv2-devel"/>
-    <package name="Mesa-libglapi-devel"/>
-    <package name="alsa-devel"/>
-    <package name="bsdiff"/>
-    <package name="freeglut-devel"/>
-    <package name="glu-devel"/>
-    <package name="libOSMesa-devel"/>
-    <package name="libOSMesa8"/>
-    <package name="libXdamage-devel"/>
-    <package name="libXxf86vm-devel"/>
-    <package name="libenet7"/>
-    <package name="libgbm-devel"/>
-    <package name="libglut3"/>
-    <package name="libglvnd-devel"/>
-    <package name="libopenssl1_0_0-steam"/>
-    <package name="libregina3"/>
-    <package name="libvulkan1"/>
-    <package name="lksctp-tools"/>
-    <package name="openttd-data"/>
-    <package name="openttd-opengfx"/>
-    <package name="steamtricks"/>
-    <package name="steamtricks-data"/>
-    <package name="ubuntu-fonts"/>
-    <package name="vulkan-tools"/>
-  </packagelist>
-</group>
diff --git a/openSUSE-Addon-NonOss-cd-addon-nonoss-i586_x86_64.kiwi b/openSUSE-Addon-NonOss-cd-addon-nonoss-i586_x86_64.kiwi
deleted file mode 100644
index 5a1f9164..00000000
--- a/openSUSE-Addon-NonOss-cd-addon-nonoss-i586_x86_64.kiwi
+++ /dev/null
@@ -1,570 +0,0 @@
-<image name="OBS__openSUSE-Addon-NonOss___2014" schemaversion="4.1">
-  <description type="system">
-    <author>The SUSE Team</author>
-    <contact>build@opensuse.org</contact>
-    <specification>openSUSE NonOSS Addon</specification>
-  </description>
-  <preferences>
-    <type image="product"/>
-    <version>1.0.0</version>
-    <packagemanager>zypper</packagemanager>
-  </preferences>
-  <instsource>
-    <architectures>
-      <arch id="i386" name="dummy" fallback="noarch"/>
-      <arch id="i486" name="dummy" fallback="i386"/>
-      <arch id="i586" name="dummy" fallback="i486"/>
-      <arch id="i686" name="dummy" fallback="i586"/>
-      <arch id="noarch" name="dummy"/>
-      <arch id="x86_64" name="dummy" fallback="i686"/>
-      <requiredarch ref="i586"/>
-      <requiredarch ref="x86_64"/>
-    </architectures>
-    <productoptions>
-      <productvar name="DISTNAME">openSUSE-Addon-NonOss</productvar>
-      <productvar name="DROP_REPOSITORY">true</productvar>
-      <productvar name="FLAVOR">addon-nonoss</productvar>
-      <productvar name="MEDIUM_NAME">openSUSE-Tumbleweed-Addon-NonOss-BiArch-i586-x86_64</productvar>
-      <productvar name="MULTIPLE_MEDIA">false</productvar>
-      <productvar name="PRODUCT_DIR">/</productvar>
-      <productvar name="PRODUCT_NAME">$DISTNAME-$FLAVOR</productvar>
-      <productvar name="PRODUCT_RELEASE">0</productvar>
-      <productvar name="PRODUCT_SUMMARY">non oss addon</productvar>
-      <productvar name="PRODUCT_THEME">openSUSE</productvar>
-      <productvar name="PRODUCT_VERSION">$VERSION</productvar>
-      <productvar name="SEPARATE_MEDIA">true</productvar>
-      <productvar name="SHA1OPT">-x -2</productvar>
-      <productvar name="VENDOR">openSUSE</productvar>
-      <productvar name="VERSION">2014</productvar>
-      <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:2014,openSUSE NonOSS Addon</productinfo>
-      <productinfo name="LINGUAS">af ar be_BY bg br ca cy el et ga gl gu_IN he hi_IN hr ka km ko lt mk nn pa_IN rw sk sl sr_CS ss st tg th tr uk ve vi xh zu </productinfo>
-      <productinfo name="REPOID">obsproduct://build.o.o/openSUSE:Factory/openSUSE-Addon-NonOss/2014/addon-nonoss/i586-x86_64</productinfo>
-      <productinfo name="VENDOR">openSUSE</productinfo>
-      <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
-      <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
-      <productoption name="REPO_LOCATION"></productoption>
-      <productoption name="SOURCEMEDIUM">0</productoption>
-    </productoptions>
-    <instrepo name="repository_1" priority="1" local="true">
-      <source path="obs://openSUSE:Factory:NonFree/standard"/>
-    </instrepo>
-    <instrepo name="repository_2" priority="2" local="true">
-      <source path="obs://openSUSE:Factory/standard"/>
-    </instrepo>
-    <metadata>
-      <repopackage name="skelcd-openSUSE-non-OSS" medium="0" removearch="src,nosrc" onlyarch="i586,x86_64"/>
-    </metadata>
-    <repopackages>
-      <repopackage name="7kaa"/>
-      <repopackage name="7kaa-music"/>
-      <repopackage name="AdobeICCProfiles"/>
-      <repopackage name="alsa-devel"/>
-      <repopackage name="alsa-devel-32bit" arch="x86_64"/>
-      <repopackage name="antlr-bootstrap" onlyarch="skipit"/>
-      <repopackage name="bonnie-ctcs2-glue" onlyarch="skipit"/>
-      <repopackage name="bootdisk" onlyarch="skipit"/>
-      <repopackage name="bootpmac" onlyarch="skipit"/>
-      <repopackage name="bootsplash-branding-SLED" onlyarch="skipit"/>
-      <repopackage name="bootsplash-branding-SLES" onlyarch="skipit"/>
-      <repopackage name="bpg-fonts"/>
-      <repopackage name="bsdiff"/>
-      <repopackage name="cg"/>
-      <repopackage name="cg-32bit" arch="x86_64"/>
-      <repopackage name="cg-devel"/>
-      <repopackage name="clicfs-profile-gnome" onlyarch="skipit"/>
-      <repopackage name="clicfs-profile-kde" onlyarch="skipit"/>
-      <repopackage name="compiz-branding-SLE" onlyarch="skipit"/>
-      <repopackage name="cpp41" onlyarch="skipit"/>
-      <repopackage name="cpp43" onlyarch="skipit"/>
-      <repopackage name="cpp45" onlyarch="skipit"/>
-      <repopackage name="cpp46" onlyarch="skipit"/>
-      <repopackage name="cpp47" onlyarch="skipit"/>
-      <repopackage name="cpq_etk" onlyarch="skipit"/>
-      <repopackage name="cross-armv5tel-gcc47-icecream-backend" onlyarch="skipit"/>
-      <repopackage name="cross-armv7hl-gcc47-icecream-backend" onlyarch="skipit"/>
-      <repopackage name="cross-hppa-gcc47-icecream-backend" onlyarch="skipit"/>
-      <repopackage name="cross-i386-gcc47-icecream-backend" onlyarch="skipit"/>
-      <repopackage name="cross-ia64-gcc47-icecream-backend" onlyarch="skipit"/>
-      <repopackage name="cross-ppc-gcc47-icecream-backend" onlyarch="skipit"/>
-      <repopackage name="cross-ppc64-gcc47-icecream-backend" onlyarch="skipit"/>
-      <repopackage name="cross-s390-gcc47-icecream-backend" onlyarch="skipit"/>
-      <repopackage name="cross-s390x-gcc47-icecream-backend" onlyarch="skipit"/>
-      <repopackage name="cross-x86_64-gcc47-icecream-backend" onlyarch="skipit"/>
-      <repopackage name="curl-mini" onlyarch="skipit"/>
-      <repopackage name="dbench-ctcs2-glue" onlyarch="skipit"/>
-      <repopackage name="desktop-data-SLED" onlyarch="skipit"/>
-      <repopackage name="desktop-data-SLED-extra-gnome" onlyarch="skipit"/>
-      <repopackage name="desktop-data-SLES-extra-gnome" onlyarch="skipit"/>
-      <repopackage name="discord" arch="x86_64"/>
-      <repopackage name="dummy-release" onlyarch="skipit"/>
-      <repopackage name="enchant-zemberek" onlyarch="skipit"/>
-      <repopackage name="epiphany-branding-SLED" onlyarch="skipit"/>
-      <repopackage name="freeglut-devel"/>
-      <repopackage name="frogatto"/>
-      <repopackage name="frogatto-data"/>
-      <repopackage name="frogatto-lang"/>
-      <repopackage name="gcc41" onlyarch="skipit"/>
-      <repopackage name="gcc41-32bit" onlyarch="skipit"/>
-      <repopackage name="gcc41-ada" onlyarch="skipit"/>
-      <repopackage name="gcc41-c++" onlyarch="skipit"/>
-      <repopackage name="gcc41-fortran" onlyarch="skipit"/>
-      <repopackage name="gcc41-fortran-32bit" onlyarch="skipit"/>
-      <repopackage name="gcc41-gij" onlyarch="skipit"/>
-      <repopackage name="gcc41-gij-32bit" onlyarch="skipit"/>
-      <repopackage name="gcc41-info" onlyarch="skipit"/>
-      <repopackage name="gcc41-java" onlyarch="skipit"/>
-      <repopackage name="gcc41-locale" onlyarch="skipit"/>
-      <repopackage name="gcc41-obj-c++" onlyarch="skipit"/>
-      <repopackage name="gcc41-objc" onlyarch="skipit"/>
-      <repopackage name="gcc41-objc-32bit" onlyarch="skipit"/>
-      <repopackage name="gcc41-testresults" onlyarch="skipit"/>
-      <repopackage name="gcc43" onlyarch="skipit"/>
-      <repopackage name="gcc43-32bit" onlyarch="skipit"/>
-      <repopackage name="gcc43-ada" onlyarch="skipit"/>
-      <repopackage name="gcc43-c++" onlyarch="skipit"/>
-      <repopackage name="gcc43-debugsource" onlyarch="skipit"/>
-      <repopackage name="gcc43-fortran" onlyarch="skipit"/>
-      <repopackage name="gcc43-fortran-32bit" onlyarch="skipit"/>
-      <repopackage name="gcc43-gij" onlyarch="skipit"/>
-      <repopackage name="gcc43-gij-32bit" onlyarch="skipit"/>
-      <repopackage name="gcc43-info" onlyarch="skipit"/>
-      <repopackage name="gcc43-java" onlyarch="skipit"/>
-      <repopackage name="gcc43-locale" onlyarch="skipit"/>
-      <repopackage name="gcc43-obj-c++" onlyarch="skipit"/>
-      <repopackage name="gcc43-objc" onlyarch="skipit"/>
-      <repopackage name="gcc43-objc-32bit" onlyarch="skipit"/>
-      <repopackage name="gcc43-testresults" onlyarch="skipit"/>
-      <repopackage name="gcc45" onlyarch="skipit"/>
-      <repopackage name="gcc45-32bit" onlyarch="skipit"/>
-      <repopackage name="gcc45-ada" onlyarch="skipit"/>
-      <repopackage name="gcc45-ada-32bit" onlyarch="skipit"/>
-      <repopackage name="gcc45-c++" onlyarch="skipit"/>
-      <repopackage name="gcc45-fortran" onlyarch="skipit"/>
-      <repopackage name="gcc45-fortran-32bit" onlyarch="skipit"/>
-      <repopackage name="gcc45-gij" onlyarch="skipit"/>
-      <repopackage name="gcc45-gij-32bit" onlyarch="skipit"/>
-      <repopackage name="gcc45-info" onlyarch="skipit"/>
-      <repopackage name="gcc45-java" onlyarch="skipit"/>
-      <repopackage name="gcc45-locale" onlyarch="skipit"/>
-      <repopackage name="gcc45-obj-c++" onlyarch="skipit"/>
-      <repopackage name="gcc45-objc" onlyarch="skipit"/>
-      <repopackage name="gcc45-objc-32bit" onlyarch="skipit"/>
-      <repopackage name="gcc45-testresults" onlyarch="skipit"/>
-      <repopackage name="gcc46" onlyarch="skipit"/>
-      <repopackage name="gcc46-32bit" onlyarch="skipit"/>
-      <repopackage name="gcc46-ada" onlyarch="skipit"/>
-      <repopackage name="gcc46-ada-32bit" onlyarch="skipit"/>
-      <repopackage name="gcc46-c++" onlyarch="skipit"/>
-      <repopackage name="gcc46-fortran" onlyarch="skipit"/>
-      <repopackage name="gcc46-fortran-32bit" onlyarch="skipit"/>
-      <repopackage name="gcc46-gij" onlyarch="skipit"/>
-      <repopackage name="gcc46-gij-32bit" onlyarch="skipit"/>
-      <repopackage name="gcc46-info" onlyarch="skipit"/>
-      <repopackage name="gcc46-java" onlyarch="skipit"/>
-      <repopackage name="gcc46-locale" onlyarch="skipit"/>
-      <repopackage name="gcc46-obj-c++" onlyarch="skipit"/>
-      <repopackage name="gcc46-objc" onlyarch="skipit"/>
-      <repopackage name="gcc46-objc-32bit" onlyarch="skipit"/>
-      <repopackage name="gcc46-testresults" onlyarch="skipit"/>
-      <repopackage name="gcc47" onlyarch="skipit"/>
-      <repopackage name="gcc47-32bit" onlyarch="skipit"/>
-      <repopackage name="gcc47-ada" onlyarch="skipit"/>
-      <repopackage name="gcc47-ada-32bit" onlyarch="skipit"/>
-      <repopackage name="gcc47-c++" onlyarch="skipit"/>
-      <repopackage name="gcc47-debugsource" onlyarch="skipit"/>
-      <repopackage name="gcc47-fortran" onlyarch="skipit"/>
-      <repopackage name="gcc47-fortran-32bit" onlyarch="skipit"/>
-      <repopackage name="gcc47-gij" onlyarch="skipit"/>
-      <repopackage name="gcc47-gij-32bit" onlyarch="skipit"/>
-      <repopackage name="gcc47-info" onlyarch="skipit"/>
-      <repopackage name="gcc47-java" onlyarch="skipit"/>
-      <repopackage name="gcc47-locale" onlyarch="skipit"/>
-      <repopackage name="gcc47-obj-c++" onlyarch="skipit"/>
-      <repopackage name="gcc47-objc" onlyarch="skipit"/>
-      <repopackage name="gcc47-objc-32bit" onlyarch="skipit"/>
-      <repopackage name="gconf2-branding-SLED" onlyarch="skipit"/>
-      <repopackage name="gconf2-branding-SLES" onlyarch="skipit"/>
-      <repopackage name="gettext-runtime-mini" onlyarch="skipit"/>
-      <repopackage name="gettext-tools-mini" onlyarch="skipit"/>
-      <repopackage name="gfxboot-branding-SLED" onlyarch="skipit"/>
-      <repopackage name="gfxboot-branding-SLES" onlyarch="skipit"/>
-      <repopackage name="ghc-bootstrap" onlyarch="skipit"/>
-      <repopackage name="ghostscript-mini" onlyarch="skipit"/>
-      <repopackage name="ghostscript-mini-devel" onlyarch="skipit"/>
-      <repopackage name="gimp-branding-SLED" onlyarch="skipit"/>
-      <repopackage name="glib2-branding-SLED" onlyarch="skipit"/>
-      <repopackage name="glib2-branding-SLES" onlyarch="skipit"/>
-      <repopackage name="glu-devel"/>
-      <repopackage name="gnome-menus-branding-SLED" onlyarch="skipit"/>
-      <repopackage name="gnome-panel-branding-SLED" onlyarch="skipit"/>
-      <repopackage name="gtk2-branding-SLED" onlyarch="skipit"/>
-      <repopackage name="gtk2-engine-oxygen-32bit" arch="x86_64"/>
-      <repopackage name="gtk2-theme-SLED" onlyarch="skipit"/>
-      <repopackage name="gtk3-branding-SLED" onlyarch="skipit"/>
-      <repopackage name="i386-rescue" onlyarch="skipit"/>
-      <repopackage name="installation-images" onlyarch="skipit"/>
-      <repopackage name="installation-images-debuginfodeps-Kubic" onlyarch="skipit"/>
-      <repopackage name="installation-images-extras" onlyarch="skipit"/>
-      <repopackage name="installation-images-openSUSE" onlyarch="skipit"/>
-      <repopackage name="installation-images-openSUSE-debuginfo" onlyarch="skipit"/>
-      <repopackage name="instlux" onlyarch="skipit"/>
-      <repopackage name="instlux-local" onlyarch="skipit"/>
-      <repopackage name="instlux-net" onlyarch="skipit"/>
-      <repopackage name="iozone"/>
-      <repopackage name="iozone-doc"/>
-      <repopackage name="ivtv-firmware"/>
-      <repopackage name="java-1_7_0-bootstrap" onlyarch="skipit"/>
-      <repopackage name="java-1_7_0-bootstrap-devel" onlyarch="skipit"/>
-      <repopackage name="java-1_7_0-bootstrap-headless" onlyarch="skipit"/>
-      <repopackage name="java-1_7_0-openjdk-bootstrap" onlyarch="skipit"/>
-      <repopackage name="java-1_7_0-openjdk-bootstrap-devel" onlyarch="skipit"/>
-      <repopackage name="java-1_7_0-openjdk-bootstrap-headless" onlyarch="skipit"/>
-      <repopackage name="java-cup-bootstrap" onlyarch="skipit"/>
-      <repopackage name="jaxen-bootstrap" onlyarch="skipit"/>
-      <repopackage name="john-wordlists"/>
-      <repopackage name="kiwi-image-livecd-gnome" onlyarch="skipit"/>
-      <repopackage name="kiwi-image-livecd-gnome-original" onlyarch="skipit"/>
-      <repopackage name="kiwi-image-livecd-gnome-promo" onlyarch="skipit"/>
-      <repopackage name="kiwi-image-livecd-gnome-promo-part" onlyarch="skipit"/>
-      <repopackage name="kiwi-image-livecd-gnome-unpackaged" onlyarch="skipit"/>
-      <repopackage name="kiwi-image-livecd-gnome.i586" onlyarch="skipit"/>
-      <repopackage name="kiwi-image-livecd-gnome.x86_64" onlyarch="skipit"/>
-      <repopackage name="kiwi-image-livecd-kde" onlyarch="skipit"/>
-      <repopackage name="kiwi-image-livecd-kde-original" onlyarch="skipit"/>
-      <repopackage name="kiwi-image-livecd-kde-promo-part" onlyarch="skipit"/>
-      <repopackage name="kiwi-image-livecd-kde-unpackaged" onlyarch="skipit"/>
-      <repopackage name="kiwi-image-livecd-kde.i586" onlyarch="skipit"/>
-      <repopackage name="kiwi-image-livecd-kde.x86_64" onlyarch="skipit"/>
-      <repopackage name="kiwi-image-livecd-x11" onlyarch="skipit"/>
-      <repopackage name="kiwi-image-livecd-x11-promo-part" onlyarch="skipit"/>
-      <repopackage name="kiwi-profiled-livecd-gnome" onlyarch="skipit"/>
-      <repopackage name="kiwi-profiled-livecd-gnome-iso" onlyarch="skipit"/>
-      <repopackage name="kiwi-profiled-livecd-gnome-promo" onlyarch="skipit"/>
-      <repopackage name="kiwi-profiled-livecd-kde" onlyarch="skipit"/>
-      <repopackage name="kiwi-profiled-livecd-kde-iso" onlyarch="skipit"/>
-      <repopackage name="kiwi-profiled-livecd-x11" onlyarch="skipit"/>
-      <repopackage name="kiwi-profiled-livecd-x11-iso" onlyarch="skipit"/>
-      <repopackage name="kiwi-promo-dvd-parts" onlyarch="skipit"/>
-      <repopackage name="krb5-mini" onlyarch="skipit"/>
-      <repopackage name="krb5-mini-devel" onlyarch="skipit"/>
-      <repopackage name="libada41" onlyarch="skipit"/>
-      <repopackage name="libada43" onlyarch="skipit"/>
-      <repopackage name="libada45" onlyarch="skipit"/>
-      <repopackage name="libada46" onlyarch="skipit"/>
-      <repopackage name="libada47" onlyarch="skipit"/>
-      <repopackage name="libada47-32bit" onlyarch="skipit"/>
-      <repopackage name="libcdio++0-mini" onlyarch="skipit"/>
-      <repopackage name="libcdio-mini-devel" onlyarch="skipit"/>
-      <repopackage name="libcdio-mini-utils" onlyarch="skipit"/>
-      <repopackage name="libcdio_cdda0-mini" onlyarch="skipit"/>
-      <repopackage name="libcdio_paranoia0-mini" onlyarch="skipit"/>
-      <repopackage name="libcurl-mini-devel" onlyarch="skipit"/>
-      <repopackage name="libcurl4-32bit" arch="x86_64"/>
-      <repopackage name="libcurl4-mini" onlyarch="skipit"/>
-      <repopackage name="libdrm2-32bit" arch="x86_64"/>
-      <repopackage name="libdrm_amdgpu1-32bit" arch="x86_64"/>
-      <repopackage name="libdrm_intel1-32bit" arch="x86_64"/>
-      <repopackage name="libdrm_nouveau2-32bit" arch="x86_64"/>
-      <repopackage name="libdrm_radeon1-32bit" arch="x86_64"/>
-      <repopackage name="libdw1-32bit" arch="x86_64"/>
-      <repopackage name="libebl-plugins-32bit" arch="x86_64"/>
-      <repopackage name="libedit0-32bit" arch="x86_64"/>
-      <repopackage name="libelf1-32bit" arch="x86_64"/>
-      <repopackage name="libenet7"/>
-      <repopackage name="libffi4-gcc47" onlyarch="skipit"/>
-      <repopackage name="libffi4-gcc47-32bit" onlyarch="skipit"/>
-      <repopackage name="libffi41" onlyarch="skipit"/>
-      <repopackage name="libffi41-32bit" onlyarch="skipit"/>
-      <repopackage name="libffi41-devel" onlyarch="skipit"/>
-      <repopackage name="libffi41-devel-32bit" onlyarch="skipit"/>
-      <repopackage name="libffi43" onlyarch="skipit"/>
-      <repopackage name="libffi43-32bit" onlyarch="skipit"/>
-      <repopackage name="libffi43-debugsource" onlyarch="skipit"/>
-      <repopackage name="libffi43-devel" onlyarch="skipit"/>
-      <repopackage name="libffi43-devel-32bit" onlyarch="skipit"/>
-      <repopackage name="libffi45" onlyarch="skipit"/>
-      <repopackage name="libffi45-32bit" onlyarch="skipit"/>
-      <repopackage name="libffi45-devel" onlyarch="skipit"/>
-      <repopackage name="libffi45-devel-32bit" onlyarch="skipit"/>
-      <repopackage name="libffi46" onlyarch="skipit"/>
-      <repopackage name="libffi46-32bit" onlyarch="skipit"/>
-      <repopackage name="libffi46-devel" onlyarch="skipit"/>
-      <repopackage name="libffi46-devel-32bit" onlyarch="skipit"/>
-      <repopackage name="libffi47" onlyarch="skipit"/>
-      <repopackage name="libffi47-debugsource" onlyarch="skipit"/>
-      <repopackage name="libffi47-devel" onlyarch="skipit"/>
-      <repopackage name="libffi47-devel-32bit" onlyarch="skipit"/>
-      <repopackage name="libFLAC8-32bit" arch="x86_64"/>
-      <repopackage name="libfreebl3-32bit" arch="x86_64"/>
-      <repopackage name="libgbm-devel"/>
-      <repopackage name="libgcc33" onlyarch="skipit"/>
-      <repopackage name="libgcc33-32bit" onlyarch="skipit"/>
-      <repopackage name="libgcc41" onlyarch="skipit"/>
-      <repopackage name="libgcc41-32bit" onlyarch="skipit"/>
-      <repopackage name="libgcc43" onlyarch="skipit"/>
-      <repopackage name="libgcc43-32bit" onlyarch="skipit"/>
-      <repopackage name="libgcc45" onlyarch="skipit"/>
-      <repopackage name="libgcc45-32bit" onlyarch="skipit"/>
-      <repopackage name="libgcc46" onlyarch="skipit"/>
-      <repopackage name="libgcc46-32bit" onlyarch="skipit"/>
-      <repopackage name="libgcc_s1-gcc47" onlyarch="skipit"/>
-      <repopackage name="libgcc_s1-gcc47-32bit" onlyarch="skipit"/>
-      <repopackage name="libgcj41" onlyarch="skipit"/>
-      <repopackage name="libgcj41-32bit" onlyarch="skipit"/>
-      <repopackage name="libgcj41-devel" onlyarch="skipit"/>
-      <repopackage name="libgcj41-devel-32bit" onlyarch="skipit"/>
-      <repopackage name="libgcj43" onlyarch="skipit"/>
-      <repopackage name="libgcj43-32bit" onlyarch="skipit"/>
-      <repopackage name="libgcj43-devel" onlyarch="skipit"/>
-      <repopackage name="libgcj43-devel-32bit" onlyarch="skipit"/>
-      <repopackage name="libgcj43-jar" onlyarch="skipit"/>
-      <repopackage name="libgcj45" onlyarch="skipit"/>
-      <repopackage name="libgcj45-32bit" onlyarch="skipit"/>
-      <repopackage name="libgcj45-devel" onlyarch="skipit"/>
-      <repopackage name="libgcj45-devel-32bit" onlyarch="skipit"/>
-      <repopackage name="libgcj45-jar" onlyarch="skipit"/>
-      <repopackage name="libgcj46" onlyarch="skipit"/>
-      <repopackage name="libgcj46-32bit" onlyarch="skipit"/>
-      <repopackage name="libgcj46-devel" onlyarch="skipit"/>
-      <repopackage name="libgcj46-devel-32bit" onlyarch="skipit"/>
-      <repopackage name="libgcj46-jar" onlyarch="skipit"/>
-      <repopackage name="libgcj47" onlyarch="skipit"/>
-      <repopackage name="libgcj47-32bit" onlyarch="skipit"/>
-      <repopackage name="libgcj47-debugsource" onlyarch="skipit"/>
-      <repopackage name="libgcj47-devel" onlyarch="skipit"/>
-      <repopackage name="libgcj47-devel-32bit" onlyarch="skipit"/>
-      <repopackage name="libgcj47-jar" onlyarch="skipit"/>
-      <repopackage name="libgcj_bc1-gcc47" onlyarch="skipit"/>
-      <repopackage name="libgcj_bc43" onlyarch="skipit"/>
-      <repopackage name="libgcj_bc45" onlyarch="skipit"/>
-      <repopackage name="libgcj_bc46" onlyarch="skipit"/>
-      <repopackage name="libgfortran3-gcc47" onlyarch="skipit"/>
-      <repopackage name="libgfortran3-gcc47-32bit" onlyarch="skipit"/>
-      <repopackage name="libgfortran41" onlyarch="skipit"/>
-      <repopackage name="libgfortran41-32bit" onlyarch="skipit"/>
-      <repopackage name="libgfortran43" onlyarch="skipit"/>
-      <repopackage name="libgfortran43-32bit" onlyarch="skipit"/>
-      <repopackage name="libgfortran45" onlyarch="skipit"/>
-      <repopackage name="libgfortran45-32bit" onlyarch="skipit"/>
-      <repopackage name="libgfortran46" onlyarch="skipit"/>
-      <repopackage name="libgfortran46-32bit" onlyarch="skipit"/>
-      <repopackage name="libglut3"/>
-      <repopackage name="libglvnd-devel"/>
-      <repopackage name="libgomp1-gcc47" onlyarch="skipit"/>
-      <repopackage name="libgomp1-gcc47-32bit" onlyarch="skipit"/>
-      <repopackage name="libgomp43" onlyarch="skipit"/>
-      <repopackage name="libgomp43-32bit" onlyarch="skipit"/>
-      <repopackage name="libgomp45" onlyarch="skipit"/>
-      <repopackage name="libgomp45-32bit" onlyarch="skipit"/>
-      <repopackage name="libgomp46" onlyarch="skipit"/>
-      <repopackage name="libgomp46-32bit" onlyarch="skipit"/>
-      <repopackage name="libLLVM7-32bit" arch="x86_64"/>
-      <repopackage name="libmicro-ctcs-glue" onlyarch="skipit"/>
-      <repopackage name="libmudflap41" onlyarch="skipit"/>
-      <repopackage name="libmudflap41-32bit" onlyarch="skipit"/>
-      <repopackage name="libmudflap45" onlyarch="skipit"/>
-      <repopackage name="libmudflap45-32bit" onlyarch="skipit"/>
-      <repopackage name="libmudflap46" onlyarch="skipit"/>
-      <repopackage name="libmudflap46-32bit" onlyarch="skipit"/>
-      <repopackage name="libncurses6-32bit" arch="x86_64"/>
-      <repopackage name="libnghttp2-14-32bit" arch="x86_64"/>
-      <repopackage name="libnm-glib4-32bit" arch="x86_64"/>
-      <repopackage name="libnm-util2-32bit" arch="x86_64"/>
-      <repopackage name="libobjc4-gcc47" onlyarch="skipit"/>
-      <repopackage name="libobjc4-gcc47-32bit" onlyarch="skipit"/>
-      <repopackage name="libobjc41" onlyarch="skipit"/>
-      <repopackage name="libobjc41-32bit" onlyarch="skipit"/>
-      <repopackage name="libobjc43" onlyarch="skipit"/>
-      <repopackage name="libobjc43-32bit" onlyarch="skipit"/>
-      <repopackage name="libobjc45" onlyarch="skipit"/>
-      <repopackage name="libobjc45-32bit" onlyarch="skipit"/>
-      <repopackage name="libobjc46" onlyarch="skipit"/>
-      <repopackage name="libobjc46-32bit" onlyarch="skipit"/>
-      <repopackage name="libopenal1-32bit" arch="x86_64"/>
-      <repopackage name="libopenssl1_0_0-steam"/>
-      <repopackage name="libopenssl1_0_0-steam-32bit" arch="x86_64"/>
-      <repopackage name="libOSMesa-devel"/>
-      <repopackage name="libOSMesa8"/>
-      <repopackage name="libpciaccess0-32bit" arch="x86_64"/>
-      <repopackage name="libpsl5-32bit" arch="x86_64"/>
-      <repopackage name="libpulse0-32bit" arch="x86_64"/>
-      <repopackage name="libquadmath0-gcc47" onlyarch="skipit"/>
-      <repopackage name="libquadmath0-gcc47-32bit" onlyarch="skipit"/>
-      <repopackage name="libregina3"/>
-      <repopackage name="libSDL-1_2-0-32bit" arch="x86_64"/>
-      <repopackage name="libsndfile1-32bit" arch="x86_64"/>
-      <repopackage name="libsoftokn3-32bit" arch="x86_64"/>
-      <repopackage name="libspeex1-32bit" arch="x86_64"/>
-      <repopackage name="libssh4-32bit" arch="x86_64"/>
-      <repopackage name="libstdc++41" onlyarch="skipit"/>
-      <repopackage name="libstdc++41-32bit" onlyarch="skipit"/>
-      <repopackage name="libstdc++41-devel" onlyarch="skipit"/>
-      <repopackage name="libstdc++41-devel-32bit" onlyarch="skipit"/>
-      <repopackage name="libstdc++41-doc" onlyarch="skipit"/>
-      <repopackage name="libstdc++43" onlyarch="skipit"/>
-      <repopackage name="libstdc++43-32bit" onlyarch="skipit"/>
-      <repopackage name="libstdc++43-devel" onlyarch="skipit"/>
-      <repopackage name="libstdc++43-devel-32bit" onlyarch="skipit"/>
-      <repopackage name="libstdc++43-doc" onlyarch="skipit"/>
-      <repopackage name="libstdc++45" onlyarch="skipit"/>
-      <repopackage name="libstdc++45-32bit" onlyarch="skipit"/>
-      <repopackage name="libstdc++45-devel" onlyarch="skipit"/>
-      <repopackage name="libstdc++45-devel-32bit" onlyarch="skipit"/>
-      <repopackage name="libstdc++45-doc" onlyarch="skipit"/>
-      <repopackage name="libstdc++46" onlyarch="skipit"/>
-      <repopackage name="libstdc++46-32bit" onlyarch="skipit"/>
-      <repopackage name="libstdc++46-devel" onlyarch="skipit"/>
-      <repopackage name="libstdc++46-devel-32bit" onlyarch="skipit"/>
-      <repopackage name="libstdc++46-doc" onlyarch="skipit"/>
-      <repopackage name="libstdc++47-devel" onlyarch="skipit"/>
-      <repopackage name="libstdc++47-devel-32bit" onlyarch="skipit"/>
-      <repopackage name="libstdc++47-doc" onlyarch="skipit"/>
-      <repopackage name="libstdc++6-gcc47" onlyarch="skipit"/>
-      <repopackage name="libstdc++6-gcc47-32bit" onlyarch="skipit"/>
-      <repopackage name="libstdc++6-gcc47-locale" onlyarch="skipit"/>
-      <repopackage name="libsystemd0-mini" onlyarch="skipit"/>
-      <repopackage name="libtheora0-32bit" arch="x86_64"/>
-      <repopackage name="libudev-mini-devel" onlyarch="skipit"/>
-      <repopackage name="libudev-mini1" onlyarch="skipit"/>
-      <repopackage name="libudf0-mini" onlyarch="skipit"/>
-      <repopackage name="libunrar-devel"/>
-      <repopackage name="libunrar5_6_8"/>
-      <repopackage name="libvorbisenc2-32bit" arch="x86_64"/>
-      <repopackage name="libvulkan1"/>
-      <repopackage name="libX11-xcb1-32bit" arch="x86_64"/>
-      <repopackage name="libxcb-dri2-0-32bit" arch="x86_64"/>
-      <repopackage name="libxcb-dri3-0-32bit" arch="x86_64"/>
-      <repopackage name="libxcb-glx0-32bit" arch="x86_64"/>
-      <repopackage name="libxcb-present0-32bit" arch="x86_64"/>
-      <repopackage name="libxcb-sync1-32bit" arch="x86_64"/>
-      <repopackage name="libXdamage-devel"/>
-      <repopackage name="libXdmcp6-32bit" arch="x86_64"/>
-      <repopackage name="libxshmfence1-32bit" arch="x86_64"/>
-      <repopackage name="libXxf86vm-devel"/>
-      <repopackage name="libXxf86vm1-32bit" arch="x86_64"/>
-      <repopackage name="lksctp-tools"/>
-      <repopackage name="Mesa-32bit" arch="x86_64"/>
-      <repopackage name="Mesa-devel"/>
-      <repopackage name="Mesa-dri-32bit" arch="x86_64"/>
-      <repopackage name="Mesa-gallium-32bit" arch="x86_64"/>
-      <repopackage name="Mesa-KHR-devel"/>
-      <repopackage name="Mesa-libEGL-devel"/>
-      <repopackage name="Mesa-libGL-devel"/>
-      <repopackage name="Mesa-libGL1-32bit" arch="x86_64"/>
-      <repopackage name="Mesa-libglapi-devel"/>
-      <repopackage name="Mesa-libglapi0-32bit" arch="x86_64"/>
-      <repopackage name="Mesa-libGLESv1_CM-devel"/>
-      <repopackage name="Mesa-libGLESv1_CM1"/>
-      <repopackage name="Mesa-libGLESv2-2"/>
-      <repopackage name="Mesa-libGLESv2-devel"/>
-      <repopackage name="mikachan-fonts"/>
-      <repopackage name="moneyplex-daten"/>
-      <repopackage name="moneyplex-suse"/>
-      <repopackage name="mozilla-nspr-32bit" arch="x86_64"/>
-      <repopackage name="mozilla-nss-32bit" arch="x86_64"/>
-      <repopackage name="mozilla-nss-certs-32bit" arch="x86_64"/>
-      <repopackage name="MozillaFirefox-branding-SLED" onlyarch="skipit"/>
-      <repopackage name="netperf"/>
-      <repopackage name="OpenOffice_org-branding-SLED" onlyarch="skipit"/>
-      <repopackage name="openSUSE-Addon-Lang-release" onlyarch="skipit"/>
-      <repopackage name="openSUSE-Addon-Lang-release-cd" onlyarch="skipit"/>
-      <repopackage name="openSUSE-Addon-NonOss-release" onlyarch="skipit"/>
-      <repopackage name="openSUSE-Addon-NonOss-release-addon-nonoss" onlyarch="skipit"/>
-      <repopackage name="openSUSE-Addon-NonOss-release-biarch" onlyarch="skipit"/>
-      <repopackage name="openSUSE-Addon-NonOss-release-ftp" onlyarch="skipit"/>
-      <repopackage name="openSUSE-Addon-NonOss-release-ppc" onlyarch="skipit"/>
-      <repopackage name="openSUSE-driverupdate" onlyarch="skipit"/>
-      <repopackage name="openSUSE-images" onlyarch="skipit"/>
-      <repopackage name="openSUSE-LiveCD-release" onlyarch="skipit"/>
-      <repopackage name="openSUSE-LiveCD-release-livecd-gnome" onlyarch="skipit"/>
-      <repopackage name="openSUSE-LiveCD-release-livecd-kde" onlyarch="skipit"/>
-      <repopackage name="openSUSE-OSP-release" onlyarch="skipit"/>
-      <repopackage name="openSUSE-OSP-release-dvd-promo" onlyarch="skipit"/>
-      <repopackage name="openSUSE-Promo-release" onlyarch="skipit"/>
-      <repopackage name="openSUSE-Promo-release-promodvd" onlyarch="skipit"/>
-      <repopackage name="openSUSE-release-dvd" onlyarch="skipit"/>
-      <repopackage name="openSUSE-release-dvd-biarch" onlyarch="skipit"/>
-      <repopackage name="openSUSE-release-dvd-promo" onlyarch="skipit"/>
-      <repopackage name="openSUSE-release-dvd-promo" onlyarch="skipit"/>
-      <repopackage name="openSUSE-release-livecd-gnome" onlyarch="skipit"/>
-      <repopackage name="openSUSE-release-livecd-kde" onlyarch="skipit"/>
-      <repopackage name="openSUSE-release-livecd-kde3" onlyarch="skipit"/>
-      <repopackage name="openSUSE-release-livecd-x11" onlyarch="skipit"/>
-      <repopackage name="openSUSE-release-livetree" onlyarch="skipit"/>
-      <repopackage name="openSUSE-release-livetree-gnome" onlyarch="skipit"/>
-      <repopackage name="openSUSE-release-livetree-kde" onlyarch="skipit"/>
-      <repopackage name="openSUSE-release-mini" onlyarch="skipit"/>
-      <repopackage name="openSUSE-release-promodvd" onlyarch="skipit"/>
-      <repopackage name="openSUSE-release-usb-gnome" onlyarch="skipit"/>
-      <repopackage name="openSUSE-release-usb-kde" onlyarch="skipit"/>
-      <repopackage name="openSUSE-release-usb-x11" onlyarch="skipit"/>
-      <repopackage name="openttd-data"/>
-      <repopackage name="openttd-opengfx"/>
-      <repopackage name="openttd-opensfx"/>
-      <repopackage name="opera" arch="x86_64"/>
-      <repopackage name="package-lists-openSUSE-GNOME-cd" onlyarch="skipit"/>
-      <repopackage name="package-lists-openSUSE-images" onlyarch="skipit"/>
-      <repopackage name="package-lists-openSUSE-KDE-cd" onlyarch="skipit"/>
-      <repopackage name="package-lists-openSUSE-X11-cd" onlyarch="skipit"/>
-      <repopackage name="patterns-non_oss"/>
-      <repopackage name="patterns-non_oss_opt"/>
-      <repopackage name="perlref"/>
-      <repopackage name="policycoreutils-gui" onlyarch="skipit"/>
-      <repopackage name="promo-dvd-parts" onlyarch="skipit"/>
-      <repopackage name="pulseaudio-utils-32bit" arch="x86_64"/>
-      <repopackage name="Reaction"/>
-      <repopackage name="Reaction-data"/>
-      <repopackage name="skelcd" onlyarch="skipit"/>
-      <repopackage name="skelcd-control-openSUSE" onlyarch="skipit"/>
-      <repopackage name="skelcd-control-openSUSE-LangAddOn" onlyarch="skipit"/>
-      <repopackage name="skelcd-debuginfo" onlyarch="skipit"/>
-      <repopackage name="skelcd-openSUSE" onlyarch="skipit"/>
-      <repopackage name="skelcd-openSUSE-non-OSS" onlyarch="skipit"/>
-      <repopackage name="sle-sdk-release" onlyarch="skipit"/>
-      <repopackage name="sle-sdk-release-sp" onlyarch="skipit"/>
-      <repopackage name="sled-release-sp" onlyarch="skipit"/>
-      <repopackage name="sles-release-sp" onlyarch="skipit"/>
-      <repopackage name="snipl" arch="x86_64"/>
-      <repopackage name="splashy-branding-SLED" onlyarch="skipit"/>
-      <repopackage name="steam"/>
-      <repopackage name="steam-controller"/>
-      <repopackage name="steam-vr"/>
-      <repopackage name="steamcmd"/>
-      <repopackage name="steamtricks"/>
-      <repopackage name="steamtricks-data"/>
-      <repopackage name="stream"/>
-      <repopackage name="sysbench-ctcs-glue" onlyarch="skipit"/>
-      <repopackage name="systemd-mini" onlyarch="skipit"/>
-      <repopackage name="systemd-mini-analyze" onlyarch="skipit"/>
-      <repopackage name="systemd-mini-bash-completion" onlyarch="skipit"/>
-      <repopackage name="systemd-mini-devel" onlyarch="skipit"/>
-      <repopackage name="systemd-mini-sysvinit" onlyarch="skipit"/>
-      <repopackage name="sysvinit" onlyarch="skipit"/>
-      <repopackage name="THE"/>
-      <repopackage name="THE-doc"/>
-      <repopackage name="ubuntu-fonts"/>
-      <repopackage name="udev-mini" onlyarch="skipit"/>
-      <repopackage name="unrar"/>
-      <repopackage name="vulkan-tools"/>
-      <repopackage name="xv"/>
-      <repopackage name="yast2-all-packages" onlyarch="skipit"/>
-      <repopackage name="yast2-branding-SLED" onlyarch="skipit"/>
-      <repopackage name="yast2-branding-SLES" onlyarch="skipit"/>
-      <repopackage name="yast2-registration" onlyarch="skipit"/>
-      <repopackage name="yast2-registration-branding-SLE" onlyarch="skipit"/>
-      <repopackage name="yast2-slide-show" onlyarch="skipit"/>
-      <repopackage name="yast2-slide-show-SLED" onlyarch="skipit"/>
-      <repopackage name="yast2-slide-show-SLES" onlyarch="skipit"/>
-      <repopackage name="yast2-slide-show-SuSELinux" onlyarch="skipit"/>
-      <repopackage name="yast2-theme-SLE" onlyarch="skipit"/>
-      <repopackage name="yast2-trans-am" onlyarch="skipit"/>
-      <repopackage name="yast2-trans-be" onlyarch="skipit"/>
-      <repopackage name="yast2-trans-ms" onlyarch="skipit"/>
-      <repopackage name="yast2-trans-my" onlyarch="skipit"/>
-      <repopackage name="yast2-trans-tk" onlyarch="skipit"/>
-      <repopackage name="yast2-wagon-control-SLE" onlyarch="skipit"/>
-      <repopackage name="openSUSE-Addon-NonOss-release" addarch="i586,x86_64"/>
-    </repopackages>
-  </instsource>
-</image>
diff --git a/openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi b/openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi
index 1be0fec1..7788de98 100644
--- a/openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi
+++ b/openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE-Addon-NonOss___2014" schemaversion="4.1">
+<image name="OBS__openSUSE-Addon-NonOss___20190115" schemaversion="4.1">
   <description type="system">
     <author>The SUSE Team</author>
     <contact>build@opensuse.org</contact>
@@ -23,6 +23,7 @@
     <productoptions>
       <productvar name="DISTNAME">openSUSE-Addon-NonOss</productvar>
       <productvar name="FLAVOR">ftp</productvar>
+      <productvar name="MAKE_LISTINGS">true</productvar>
       <productvar name="MEDIUM_NAME">openSUSE-Addon-NonOss-FTP-i586-x86_64</productvar>
       <productvar name="MULTIPLE_MEDIA">true</productvar>
       <productvar name="PRODUCT_DIR">/</productvar>
@@ -35,11 +36,11 @@
       <productvar name="SEPARATE_MEDIA">true</productvar>
       <productvar name="SHA1OPT">-x -2</productvar>
       <productvar name="VENDOR">openSUSE</productvar>
-      <productvar name="VERSION">2014</productvar>
+      <productvar name="VERSION">20190115</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:2014,openSUSE NonOSS Addon</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20190115,openSUSE NonOSS Addon</productinfo>
       <productinfo name="LINGUAS">af ar be_BY bg br ca cy el et ga gl gu_IN he hi_IN hr ka km ko lt mk nn pa_IN rw sk sl sr_CS ss st tg th tr uk ve vi xh zu </productinfo>
-      <productinfo name="REPOID">obsproduct://build.o.o/openSUSE:Factory/openSUSE-Addon-NonOss/2014/ftp/i586-x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.o.o/openSUSE:Factory/openSUSE-Addon-NonOss/20190115/ftp/i586-x86_64</productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
       <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
@@ -49,25 +50,17 @@
     <instrepo name="repository_1" priority="1" local="true">
       <source path="obs://openSUSE:Factory:NonFree/standard"/>
     </instrepo>
-    <instrepo name="repository_2" priority="2" local="true">
-      <source path="obs://openSUSE:Factory/standard"/>
-    </instrepo>
     <metadata>
       <repopackage name="skelcd-openSUSE-non-OSS" medium="0" removearch="src,nosrc" onlyarch="i586,x86_64"/>
     </metadata>
     <repopackages>
-      <repopackage name="7kaa-music"/>
-      <repopackage name="AdobeICCProfiles"/>
+      <repopackage name="*"/>
       <repopackage name="antlr-bootstrap" onlyarch="skipit"/>
       <repopackage name="bonnie-ctcs2-glue" onlyarch="skipit"/>
       <repopackage name="bootdisk" onlyarch="skipit"/>
       <repopackage name="bootpmac" onlyarch="skipit"/>
       <repopackage name="bootsplash-branding-SLED" onlyarch="skipit"/>
       <repopackage name="bootsplash-branding-SLES" onlyarch="skipit"/>
-      <repopackage name="bpg-fonts"/>
-      <repopackage name="cg"/>
-      <repopackage name="cg-32bit" arch="x86_64"/>
-      <repopackage name="cg-devel"/>
       <repopackage name="clicfs-profile-gnome" onlyarch="skipit"/>
       <repopackage name="clicfs-profile-kde" onlyarch="skipit"/>
       <repopackage name="compiz-branding-SLE" onlyarch="skipit"/>
@@ -92,13 +85,9 @@
       <repopackage name="desktop-data-SLED" onlyarch="skipit"/>
       <repopackage name="desktop-data-SLED-extra-gnome" onlyarch="skipit"/>
       <repopackage name="desktop-data-SLES-extra-gnome" onlyarch="skipit"/>
-      <repopackage name="discord" arch="x86_64"/>
       <repopackage name="dummy-release" onlyarch="skipit"/>
       <repopackage name="enchant-zemberek" onlyarch="skipit"/>
       <repopackage name="epiphany-branding-SLED" onlyarch="skipit"/>
-      <repopackage name="frogatto"/>
-      <repopackage name="frogatto-data"/>
-      <repopackage name="frogatto-lang"/>
       <repopackage name="gcc41" onlyarch="skipit"/>
       <repopackage name="gcc41-32bit" onlyarch="skipit"/>
       <repopackage name="gcc41-ada" onlyarch="skipit"/>
@@ -204,9 +193,6 @@
       <repopackage name="instlux" onlyarch="skipit"/>
       <repopackage name="instlux-local" onlyarch="skipit"/>
       <repopackage name="instlux-net" onlyarch="skipit"/>
-      <repopackage name="iozone"/>
-      <repopackage name="iozone-doc"/>
-      <repopackage name="ivtv-firmware"/>
       <repopackage name="java-1_7_0-bootstrap" onlyarch="skipit"/>
       <repopackage name="java-1_7_0-bootstrap-devel" onlyarch="skipit"/>
       <repopackage name="java-1_7_0-bootstrap-headless" onlyarch="skipit"/>
@@ -215,7 +201,6 @@
       <repopackage name="java-1_7_0-openjdk-bootstrap-headless" onlyarch="skipit"/>
       <repopackage name="java-cup-bootstrap" onlyarch="skipit"/>
       <repopackage name="jaxen-bootstrap" onlyarch="skipit"/>
-      <repopackage name="john-wordlists"/>
       <repopackage name="kiwi-image-livecd-gnome" onlyarch="skipit"/>
       <repopackage name="kiwi-image-livecd-gnome-original" onlyarch="skipit"/>
       <repopackage name="kiwi-image-livecd-gnome-promo" onlyarch="skipit"/>
@@ -385,13 +370,7 @@
       <repopackage name="libudev-mini-devel" onlyarch="skipit"/>
       <repopackage name="libudev-mini1" onlyarch="skipit"/>
       <repopackage name="libudf0-mini" onlyarch="skipit"/>
-      <repopackage name="libunrar-devel"/>
-      <repopackage name="libunrar5_6_8"/>
-      <repopackage name="mikachan-fonts"/>
-      <repopackage name="moneyplex-daten"/>
-      <repopackage name="moneyplex-suse"/>
       <repopackage name="MozillaFirefox-branding-SLED" onlyarch="skipit"/>
-      <repopackage name="netperf"/>
       <repopackage name="OpenOffice_org-branding-SLED" onlyarch="skipit"/>
       <repopackage name="openSUSE-Addon-Lang-release" onlyarch="skipit"/>
       <repopackage name="openSUSE-Addon-Lang-release-cd" onlyarch="skipit"/>
@@ -425,19 +404,12 @@
       <repopackage name="openSUSE-release-usb-gnome" onlyarch="skipit"/>
       <repopackage name="openSUSE-release-usb-kde" onlyarch="skipit"/>
       <repopackage name="openSUSE-release-usb-x11" onlyarch="skipit"/>
-      <repopackage name="openttd-opensfx"/>
-      <repopackage name="opera" arch="x86_64"/>
       <repopackage name="package-lists-openSUSE-GNOME-cd" onlyarch="skipit"/>
       <repopackage name="package-lists-openSUSE-images" onlyarch="skipit"/>
       <repopackage name="package-lists-openSUSE-KDE-cd" onlyarch="skipit"/>
       <repopackage name="package-lists-openSUSE-X11-cd" onlyarch="skipit"/>
-      <repopackage name="patterns-non_oss"/>
-      <repopackage name="patterns-non_oss_opt"/>
-      <repopackage name="perlref"/>
       <repopackage name="policycoreutils-gui" onlyarch="skipit"/>
       <repopackage name="promo-dvd-parts" onlyarch="skipit"/>
-      <repopackage name="Reaction"/>
-      <repopackage name="Reaction-data"/>
       <repopackage name="skelcd" onlyarch="skipit"/>
       <repopackage name="skelcd-control-openSUSE" onlyarch="skipit"/>
       <repopackage name="skelcd-control-openSUSE-LangAddOn" onlyarch="skipit"/>
@@ -448,13 +420,7 @@
       <repopackage name="sle-sdk-release-sp" onlyarch="skipit"/>
       <repopackage name="sled-release-sp" onlyarch="skipit"/>
       <repopackage name="sles-release-sp" onlyarch="skipit"/>
-      <repopackage name="snipl" arch="x86_64"/>
       <repopackage name="splashy-branding-SLED" onlyarch="skipit"/>
-      <repopackage name="steam"/>
-      <repopackage name="steam-controller"/>
-      <repopackage name="steam-vr"/>
-      <repopackage name="steamcmd"/>
-      <repopackage name="stream"/>
       <repopackage name="sysbench-ctcs-glue" onlyarch="skipit"/>
       <repopackage name="systemd-mini" onlyarch="skipit"/>
       <repopackage name="systemd-mini-analyze" onlyarch="skipit"/>
@@ -462,11 +428,7 @@
       <repopackage name="systemd-mini-devel" onlyarch="skipit"/>
       <repopackage name="systemd-mini-sysvinit" onlyarch="skipit"/>
       <repopackage name="sysvinit" onlyarch="skipit"/>
-      <repopackage name="THE"/>
-      <repopackage name="THE-doc"/>
       <repopackage name="udev-mini" onlyarch="skipit"/>
-      <repopackage name="unrar"/>
-      <repopackage name="xv"/>
       <repopackage name="yast2-all-packages" onlyarch="skipit"/>
       <repopackage name="yast2-branding-SLED" onlyarch="skipit"/>
       <repopackage name="yast2-branding-SLES" onlyarch="skipit"/>
diff --git a/openSUSE-Addon-NonOss-x86_64.group b/openSUSE-Addon-NonOss-x86_64.group
deleted file mode 100644
index ec17de64..00000000
--- a/openSUSE-Addon-NonOss-x86_64.group
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Autogenerated by https://github.com/openSUSE/package-lists -->
-<group name="Addon-NonOss-x86_64">
-  <conditional name="only_x86_64"/>
-  <packagelist>
-    <package name="cg-32bit"/>
-    <package name="discord"/>
-    <package name="opera"/>
-    <package name="snipl"/>
-  </packagelist>
-</group>
diff --git a/openSUSE-Addon-NonOss.group b/openSUSE-Addon-NonOss.group
deleted file mode 100644
index 341c0d47..00000000
--- a/openSUSE-Addon-NonOss.group
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Autogenerated by https://github.com/openSUSE/package-lists -->
-<group name="Addon-NonOss">
-  <packagelist>
-    <package name="7kaa-music"/>
-    <package name="AdobeICCProfiles"/>
-    <package name="Reaction"/>
-    <package name="Reaction-data"/>
-    <package name="THE"/>
-    <package name="THE-doc"/>
-    <package name="bpg-fonts"/>
-    <package name="cg"/>
-    <package name="cg-devel"/>
-    <package name="frogatto"/>
-    <package name="frogatto-data"/>
-    <package name="frogatto-lang"/>
-    <package name="iozone"/>
-    <package name="iozone-doc"/>
-    <package name="ivtv-firmware"/>
-    <package name="john-wordlists"/>
-    <package name="libunrar-devel"/>
-    <package name="libunrar5_6_8"/>
-    <package name="mikachan-fonts"/>
-    <package name="moneyplex-daten"/>
-    <package name="moneyplex-suse"/>
-    <package name="netperf"/>
-    <package name="openttd-opensfx"/>
-    <package name="patterns-non_oss"/>
-    <package name="patterns-non_oss_opt"/>
-    <package name="perlref"/>
-    <package name="steam"/>
-    <package name="steam-controller"/>
-    <package name="steam-vr"/>
-    <package name="steamcmd"/>
-    <package name="stream"/>
-    <package name="unrar"/>
-    <package name="xv"/>
-  </packagelist>
-</group>
diff --git a/openSUSE-Addon-NonOss.product b/openSUSE-Addon-NonOss.product
index 488187c9..de0e041a 100644
--- a/openSUSE-Addon-NonOss.product
+++ b/openSUSE-Addon-NonOss.product
@@ -4,7 +4,7 @@
  <product>
         <vendor>openSUSE</vendor>
         <name>openSUSE-Addon-NonOss</name>
-        <version>2014</version>
+        <version>20190115</version>
         <release>0</release> 
         <summary>openSUSE NonOSS Addon</summary>
         <shortsummary>non oss addon</shortsummary>
@@ -52,7 +52,6 @@
 
         <buildconfig>
             <producttheme>openSUSE</producttheme>
-            <!-- <betaversion>RC 1</betaversion> --> 
             <allowresolving>false</allowresolving>
         </buildconfig>
 
@@ -69,36 +68,11 @@
 
     <repositories>
         <repository path="obs://openSUSE:Factory:NonFree/standard"/>
-        <repository path="obs://openSUSE:Factory/standard"/>
     </repositories>
 
     <xi:include href="defaults-archsets.include" />
 
     <mediasets>
-        <media type="cd" 
-               name="openSUSE-Tumbleweed-Addon-NonOss-BiArch"
-               flavor="addon-nonoss"
-               sourcemedia="0"
-               mediastyle="suse-tumbleweed"
-               use_required="true" 
-               use_recommended="true" 
-               use_undecided="false"
-               use_suggested="false">
-          <use group="NON_FTP_PACKAGES" create_pattern="false" />
-          <use group="Addon-NonOss" create_pattern="false"/>
-          <use group="Addon-NonOss-x86_64" create_pattern="false"/>
-          <use group="Addon-NonOss-Deps" create_pattern="false"/>
-          <use group="Addon-NonOss-Deps-x86_64" create_pattern="false"/>
-
-          <archsets>                 
-            <archset ref="i586" />
-            <archset ref="x86_64" />
-          </archsets>
-          <metadata>
-              <package name="skelcd-openSUSE-non-OSS" />
-          </metadata>
-        </media>
-
         <!-- BEWARE: do not touch this without adapting the upload scripts ! -->
         <media type="ftp" 
                name="openSUSE-Addon-NonOss-FTP" 
@@ -107,13 +81,11 @@
                mediastyle="suse-tumbleweed"
                use_required="true" 
                use_recommended="true" 
-               use_undecided="false"
-               run_make_listings="false" 
+               use_undecided="true"
+               run_make_listings="true" 
                repo_only="true"
                use_suggested="false">
           <use group="NON_FTP_PACKAGES" create_pattern="false" />
-          <use group="Addon-NonOss" create_pattern="false"/>
-          <use group="Addon-NonOss-x86_64" create_pattern="false"/>
           <archsets>                 
             <archset ref="i586" />
             <archset ref="x86_64" />
@@ -125,9 +97,6 @@
     </mediasets>
 
     <xi:include href="defaults-conditionals.include" />
-    <xi:include href="openSUSE-Addon-NonOss.group" />
-    <xi:include href="openSUSE-Addon-NonOss-x86_64.group"/>
-    <xi:include href="openSUSE-Addon-NonOss-Deps.group" />
-    <xi:include href="openSUSE-Addon-NonOss-Deps-x86_64.group"/>
     <xi:include href="NON_FTP_PACKAGES.group"/>
+
 </productdefinition>