From 70244c5bffe133f6ad8822e5b9353afa32061703abe575f219ff97ab47ec3bdc Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Tue, 20 Nov 2018 09:12:04 +0000
Subject: [PATCH] - Allow binutils, but force-remove it in config.sh
 (bsc#1116665)

OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=6
---
 config.sh                    | 2 ++
 list-common.sh               | 2 --
 livecd-leap-gnome.kiwi       | 2 --
 livecd-leap-kde.kiwi         | 2 --
 livecd-leap-x11.kiwi         | 2 --
 livecd-openSUSE.changes      | 5 +++++
 livecd-tumbleweed-gnome.kiwi | 2 --
 livecd-tumbleweed-kde.kiwi   | 2 --
 livecd-tumbleweed-x11.kiwi   | 2 --
 9 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/config.sh b/config.sh
index 7f96101..b03fd6f 100644
--- a/config.sh
+++ b/config.sh
@@ -25,6 +25,8 @@ pl=$(rpmqpack | grep openSUSE-release-livecd-)
 # as <censored> kiwi does not make the flavor accessible
 desktop=$(echo "$pl" | awk -F- '{ print $4 }' | tr A-Z a-z)
 
+# Not needed, but required by suse-module-tools (bsc#1116665)
+rpm -q binutils && rpm -e --nodeps binutils
 # Not needed, but required by dracut-kiwi-live -> cdrkit-cdrtools-compat
 rpm -q wodim && rpm -e --nodeps wodim
 # Actually a hack: xrdb requires this, but on livecds it's not used
diff --git a/list-common.sh b/list-common.sh
index f757da0..b3f3cbf 100644
--- a/list-common.sh
+++ b/list-common.sh
@@ -65,8 +65,6 @@ buildignore libqmi-tools
 
 buildignore python3-pip
 
-buildignore binutils
-
 buildignore multipath-tools-rbd
 
 buildignore xorg-x11-Xvnc
diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi
index da8fe8c..0193e8f 100644
--- a/livecd-leap-gnome.kiwi
+++ b/livecd-leap-gnome.kiwi
@@ -170,8 +170,6 @@
     <ignore name="libqmi-tools"/>
     <package name="aaa_base" replaces="python3-pip"/>
     <ignore name="python3-pip"/>
-    <package name="aaa_base" replaces="binutils"/>
-    <ignore name="binutils"/>
     <package name="aaa_base" replaces="multipath-tools-rbd"/>
     <ignore name="multipath-tools-rbd"/>
     <package name="aaa_base" replaces="xorg-x11-Xvnc"/>
diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi
index 6f8379f..acd5e18 100644
--- a/livecd-leap-kde.kiwi
+++ b/livecd-leap-kde.kiwi
@@ -170,8 +170,6 @@
     <ignore name="libqmi-tools"/>
     <package name="aaa_base" replaces="python3-pip"/>
     <ignore name="python3-pip"/>
-    <package name="aaa_base" replaces="binutils"/>
-    <ignore name="binutils"/>
     <package name="aaa_base" replaces="multipath-tools-rbd"/>
     <ignore name="multipath-tools-rbd"/>
     <package name="aaa_base" replaces="xorg-x11-Xvnc"/>
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index d78782a..56e10ad 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -170,8 +170,6 @@
     <ignore name="libqmi-tools"/>
     <package name="aaa_base" replaces="python3-pip"/>
     <ignore name="python3-pip"/>
-    <package name="aaa_base" replaces="binutils"/>
-    <ignore name="binutils"/>
     <package name="aaa_base" replaces="multipath-tools-rbd"/>
     <ignore name="multipath-tools-rbd"/>
     <package name="aaa_base" replaces="xorg-x11-Xvnc"/>
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index 38337d0..ed2dab1 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Nov 20 09:11:15 UTC 2018 - Fabian Vogt <fvogt@suse.com>
+
+- Allow binutils, but force-remove it in config.sh (bsc#1116665)
+
 -------------------------------------------------------------------
 Wed Nov  7 12:49:31 UTC 2018 - Fabian Vogt <fvogt@suse.com>
 
diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi
index bb0a4bd..deee238 100644
--- a/livecd-tumbleweed-gnome.kiwi
+++ b/livecd-tumbleweed-gnome.kiwi
@@ -170,8 +170,6 @@
     <ignore name="libqmi-tools"/>
     <package name="aaa_base" replaces="python3-pip"/>
     <ignore name="python3-pip"/>
-    <package name="aaa_base" replaces="binutils"/>
-    <ignore name="binutils"/>
     <package name="aaa_base" replaces="multipath-tools-rbd"/>
     <ignore name="multipath-tools-rbd"/>
     <package name="aaa_base" replaces="xorg-x11-Xvnc"/>
diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi
index de68684..50c0e4e 100644
--- a/livecd-tumbleweed-kde.kiwi
+++ b/livecd-tumbleweed-kde.kiwi
@@ -170,8 +170,6 @@
     <ignore name="libqmi-tools"/>
     <package name="aaa_base" replaces="python3-pip"/>
     <ignore name="python3-pip"/>
-    <package name="aaa_base" replaces="binutils"/>
-    <ignore name="binutils"/>
     <package name="aaa_base" replaces="multipath-tools-rbd"/>
     <ignore name="multipath-tools-rbd"/>
     <package name="aaa_base" replaces="xorg-x11-Xvnc"/>
diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi
index e429f96..9c291ee 100644
--- a/livecd-tumbleweed-x11.kiwi
+++ b/livecd-tumbleweed-x11.kiwi
@@ -170,8 +170,6 @@
     <ignore name="libqmi-tools"/>
     <package name="aaa_base" replaces="python3-pip"/>
     <ignore name="python3-pip"/>
-    <package name="aaa_base" replaces="binutils"/>
-    <ignore name="binutils"/>
     <package name="aaa_base" replaces="multipath-tools-rbd"/>
     <ignore name="multipath-tools-rbd"/>
     <package name="aaa_base" replaces="xorg-x11-Xvnc"/>