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
This commit is contained in:
Thorsten Kukuk 2021-01-27 15:12:05 +00:00 committed by Git OBS Bridge
parent 9eac636f2f
commit 8226538a16
2 changed files with 36 additions and 30 deletions

View File

@ -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> Wed Sep 30 14:36:10 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>

View File

@ -37,59 +37,58 @@
<source path="obsrepositories:/"/> <source path="obsrepositories:/"/>
</repository> </repository>
<packages type="bootstrap"> <packages type="bootstrap">
<package name="busybox"/> <!-- Workaround for https://github.com/openSUSE/obs-build/issues/562 -->
<package name="busybox-adduser" replaces="shadow"/> <package name="busybox" replaces="kiwi-packagemanager:zypper"/>
<package name="busybox-attr" replaces="attr"/> <package name="busybox-adduser"/>
<package name="busybox-bc" replaces="bc"/> <package name="busybox-attr"/>
<package name="busybox-bind-utils" replaces="bind-utils"/> <package name="busybox-bc"/>
<package name="busybox-bzip2" replaces="bzip2"/> <package name="busybox-bind-utils"/>
<package name="busybox-coreutils" replaces="coreutils"/> <package name="busybox-bzip2"/>
<package name="busybox-cpio" replaces="cpio"/> <package name="busybox-coreutils"/>
<package name="busybox-diffutils" replaces="diffutils"/> <package name="busybox-cpio"/>
<package name="busybox-diffutils"/>
<package name="busybox-dos2unix"/> <package name="busybox-dos2unix"/>
<package name="busybox-ed"/> <package name="busybox-ed"/>
<package name="busybox-findutils" replaces="findutils"/> <package name="busybox-findutils"/>
<package name="busybox-gawk" replaces="gawk"/> <package name="busybox-gawk"/>
<package name="busybox-grep" replaces="grep"/> <package name="busybox-grep"/>
<package name="busybox-gzip" replaces="gzip"/> <package name="busybox-gzip"/>
<package name="busybox-hostname" replaces="hostname"/> <package name="busybox-hostname"/>
<package name="busybox-iproute2"/> <package name="busybox-iproute2"/>
<package name="busybox-iputils"/> <package name="busybox-iputils"/>
<package name="busybox-kbd" replaces="kbd"/> <package name="busybox-kbd"/>
<package name="busybox-kmod" replaces="kmod"/> <package name="busybox-kmod"/>
<package name="busybox-less" replaces="less"/> <package name="busybox-less"/>
<package name="busybox-man"/> <package name="busybox-man"/>
<package name="busybox-misc" replaces="binutils"/> <package name="busybox-misc"/>
<package name="busybox-misc" replaces="dosfstools"/> <package name="busybox-ncurses-utils"/>
<package name="busybox-misc" replaces="e2fsprogs"/>
<package name="busybox-ncurses-utils" replaces="ncurses-utils"/>
<package name="busybox-net-tools"/> <package name="busybox-net-tools"/>
<package name="busybox-netcat"/> <package name="busybox-netcat"/>
<package name="busybox-patch" replaces="patch"/> <package name="busybox-patch"/>
<package name="busybox-policycoreutils"/> <package name="busybox-policycoreutils"/>
<package name="busybox-procps" replaces="procps"/> <package name="busybox-procps"/>
<package name="busybox-psmisc"/> <package name="busybox-psmisc"/>
<package name="busybox-sed" replaces="sed"/> <package name="busybox-sed"/>
<package name="busybox-selinux-tools"/> <package name="busybox-selinux-tools"/>
<package name="busybox-sendmail"/> <package name="busybox-sendmail"/>
<package name="busybox-sh"/> <package name="busybox-sh"/>
<package name="busybox-sharutils"/> <package name="busybox-sharutils"/>
<package name="busybox-syslogd"/> <package name="busybox-syslogd"/>
<package name="busybox-sysvinit-tools" replaces="sysvinit-tools"/> <package name="busybox-sysvinit-tools"/>
<package name="busybox-tar" replaces="tar"/> <package name="busybox-tar"/>
<package name="busybox-telnet"/> <package name="busybox-telnet"/>
<package name="busybox-tftp"/> <package name="busybox-tftp"/>
<package name="busybox-time"/> <package name="busybox-time"/>
<package name="busybox-traceroute"/> <package name="busybox-traceroute"/>
<package name="busybox-tunctl"/> <package name="busybox-tunctl"/>
<package name="busybox-unzip"/> <package name="busybox-unzip"/>
<package name="busybox-util-linux" replaces="util-linux"/> <package name="busybox-util-linux"/>
<package name="busybox-vi"/> <package name="busybox-vi"/>
<package name="busybox-vlan"/> <package name="busybox-vlan"/>
<package name="busybox-wget"/> <package name="busybox-wget"/>
<package name="busybox-which" replaces="which"/> <package name="busybox-which"/>
<package name="busybox-whois" replaces="whois"/> <package name="busybox-whois"/>
<package name="busybox-xz" replaces="xz"/> <package name="busybox-xz"/>
<package name="kubernetes-pause"/> <package name="kubernetes-pause"/>
</packages> </packages>
</image> </image>