From 8226538a167ab417250cb0054a3eead0335a7fe41a1d307c9b247d70f76a96fe Mon Sep 17 00:00:00 2001
From: Thorsten Kukuk <kukuk@suse.com>
Date: Wed, 27 Jan 2021 15:12:05 +0000
Subject: [PATCH] Accepting request 867212 from home:favogt:boo1180263

- Make use of ExpandFlags: kiwi-nobasepackages:
  * Drop replaces
  * Add workaround for bug in obs-build

OBS-URL: https://build.opensuse.org/request/show/867212
OBS-URL: https://build.opensuse.org/package/show/devel:kubic:containers/tumbleweed-busybox-image?expand=0&rev=34
---
 tumbleweed-busybox-image.changes |  7 ++++
 tumbleweed-busybox-image.kiwi    | 59 ++++++++++++++++----------------
 2 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/tumbleweed-busybox-image.changes b/tumbleweed-busybox-image.changes
index 98159fc..b332241 100644
--- a/tumbleweed-busybox-image.changes
+++ b/tumbleweed-busybox-image.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Dec  1 09:42:43 UTC 2020 - Fabian Vogt <fvogt@suse.com>
+
+- Make use of ExpandFlags: kiwi-nobasepackages:
+  * Drop replaces
+  * Add workaround for bug in obs-build
+
 -------------------------------------------------------------------
 Wed Sep 30 14:36:10 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>
 
diff --git a/tumbleweed-busybox-image.kiwi b/tumbleweed-busybox-image.kiwi
index cdacbb1..c5f2b97 100644
--- a/tumbleweed-busybox-image.kiwi
+++ b/tumbleweed-busybox-image.kiwi
@@ -37,59 +37,58 @@
     <source path="obsrepositories:/"/>
   </repository>
   <packages type="bootstrap">
-    <package name="busybox"/>
-    <package name="busybox-adduser" replaces="shadow"/>
-    <package name="busybox-attr" replaces="attr"/>
-    <package name="busybox-bc" replaces="bc"/>
-    <package name="busybox-bind-utils" replaces="bind-utils"/>
-    <package name="busybox-bzip2" replaces="bzip2"/>
-    <package name="busybox-coreutils" replaces="coreutils"/>
-    <package name="busybox-cpio" replaces="cpio"/>
-    <package name="busybox-diffutils" replaces="diffutils"/>
+    <!-- Workaround for https://github.com/openSUSE/obs-build/issues/562 -->
+    <package name="busybox" replaces="kiwi-packagemanager:zypper"/>
+    <package name="busybox-adduser"/>
+    <package name="busybox-attr"/>
+    <package name="busybox-bc"/>
+    <package name="busybox-bind-utils"/>
+    <package name="busybox-bzip2"/>
+    <package name="busybox-coreutils"/>
+    <package name="busybox-cpio"/>
+    <package name="busybox-diffutils"/>
     <package name="busybox-dos2unix"/>
     <package name="busybox-ed"/>
-    <package name="busybox-findutils" replaces="findutils"/>
-    <package name="busybox-gawk" replaces="gawk"/>
-    <package name="busybox-grep" replaces="grep"/>
-    <package name="busybox-gzip" replaces="gzip"/>
-    <package name="busybox-hostname" replaces="hostname"/>
+    <package name="busybox-findutils"/>
+    <package name="busybox-gawk"/>
+    <package name="busybox-grep"/>
+    <package name="busybox-gzip"/>
+    <package name="busybox-hostname"/>
     <package name="busybox-iproute2"/>
     <package name="busybox-iputils"/>
-    <package name="busybox-kbd" replaces="kbd"/>
-    <package name="busybox-kmod" replaces="kmod"/>
-    <package name="busybox-less" replaces="less"/>
+    <package name="busybox-kbd"/>
+    <package name="busybox-kmod"/>
+    <package name="busybox-less"/>
     <package name="busybox-man"/>
-    <package name="busybox-misc" replaces="binutils"/>
-    <package name="busybox-misc" replaces="dosfstools"/>
-    <package name="busybox-misc" replaces="e2fsprogs"/>
-    <package name="busybox-ncurses-utils" replaces="ncurses-utils"/>
+    <package name="busybox-misc"/>
+    <package name="busybox-ncurses-utils"/>
     <package name="busybox-net-tools"/>
     <package name="busybox-netcat"/>
-    <package name="busybox-patch" replaces="patch"/>
+    <package name="busybox-patch"/>
     <package name="busybox-policycoreutils"/>
-    <package name="busybox-procps" replaces="procps"/>
+    <package name="busybox-procps"/>
     <package name="busybox-psmisc"/>
-    <package name="busybox-sed" replaces="sed"/>
+    <package name="busybox-sed"/>
     <package name="busybox-selinux-tools"/>
     <package name="busybox-sendmail"/>
     <package name="busybox-sh"/>
     <package name="busybox-sharutils"/>
     <package name="busybox-syslogd"/>
-    <package name="busybox-sysvinit-tools" replaces="sysvinit-tools"/>
-    <package name="busybox-tar" replaces="tar"/>
+    <package name="busybox-sysvinit-tools"/>
+    <package name="busybox-tar"/>
     <package name="busybox-telnet"/>
     <package name="busybox-tftp"/>
     <package name="busybox-time"/>
     <package name="busybox-traceroute"/>
     <package name="busybox-tunctl"/>
     <package name="busybox-unzip"/>
-    <package name="busybox-util-linux" replaces="util-linux"/>
+    <package name="busybox-util-linux"/>
     <package name="busybox-vi"/>
     <package name="busybox-vlan"/>
     <package name="busybox-wget"/>
-    <package name="busybox-which" replaces="which"/>
-    <package name="busybox-whois" replaces="whois"/>
-    <package name="busybox-xz" replaces="xz"/>
+    <package name="busybox-which"/>
+    <package name="busybox-whois"/>
+    <package name="busybox-xz"/>
     <package name="kubernetes-pause"/>
   </packages>
 </image>