Accepting request 794024 from home:kukuk:container

- Use 'busybox' as 'busybox-container' was dropped
- Convert to use busybox-links
- busybox-container was merged with busybox
- Add kubernetes pause binary
- Use busybox-container, much smaller
- Add subcommand with /bin/sh, as the default /bin/bash does
  not exist
- Fix labels
- Move to official opensuse repository
- Lock root password
- Remove bash, kiwi >= 9.17.35 don't need them anymore
- Add workaround that .kconfig uses bash syntax
- Initial version

OBS-URL: https://build.opensuse.org/request/show/794024
OBS-URL: https://build.opensuse.org/package/show/devel:kubic:containers/tumbleweed-busybox-image?expand=0&rev=15
This commit is contained in:
Thorsten Kukuk 2020-04-15 06:34:48 +00:00 committed by Git OBS Bridge
parent 9286b5db75
commit 096a235e86
4 changed files with 34 additions and 19 deletions

View File

@ -4,7 +4,7 @@
<param name="file">tumbleweed-busybox-image.kiwi</param>
<param name="regex">%PKG_VERSION%</param>
<param name="parse-version">patch</param>
<param name="package">busybox-container</param>
<param name="package">busybox</param>
</service>
<service mode="buildtime" name="kiwi_label_helper"/>
</services>

View File

@ -1,4 +1,4 @@
#!/usr/bin/busybox-container sh
#!/usr/bin/busybox sh
#======================================
# Functions...
@ -12,21 +12,12 @@ test -f /.profile && . /.profile
#--------------------------------------
echo "Configure image: [$kiwi_iname]..."
/usr/bin/busybox-container ln -sf busybox-container /usr/bin/busybox
/usr/bin/busybox ln -sf ../usr/bin/busybox /bin/ln
/usr/bin/busybox ln -sf ../usr/bin/busybox /bin/rm
/usr/bin/busybox ln -sf ../usr/bin/busybox /bin/mkdir
/usr/bin/busybox ln -sf ../usr/bin/busybox /bin/chmod
/usr/bin/busybox ln -sf busybox /usr/bin/sort
/usr/bin/busybox ln -sf busybox /usr/bin/uniq
/usr/bin/busybox ln -sf busybox /usr/bin/install
/usr/bin/busybox ln -sf busybox /usr/bin/dirname
/usr/bin/busybox ln -sf busybox /usr/bin/basename
/usr/bin/busybox-container.install / --symlinks
/bin/rm linuxrc
/bin/rm /usr/bin/busybox
/bin/rm /usr/bin/busybox-container
/bin/rm /usr/bin/busybox-container.install
/bin/rm -rf /usr/share/busybox
/usr/bin/busybox ln -sf busybox /usr/bin/rpm
/usr/bin/busybox ln -sf busybox /usr/bin/rpm2cpio
/usr/bin/busybox ln -sf busybox /usr/bin/sh
/usr/bin/busybox ln -sf busybox /bin/sh ../usr/bin/sh
/usr/bin/busybox ln -sf busybox /usr/bin/find
/usr/bin/busybox ln -sf busybox /usr/bin/su
/usr/bin/busybox ln -sf busybox /bin/su ../usr/bin/su
exit 0

View File

@ -1,7 +1,17 @@
-------------------------------------------------------------------
Tue Apr 14 10:42:15 UTC 2020 - Richard Brown <rbrown@suse.com>
- Use 'busybox' as 'busybox-container' was dropped
- Use 'busybox' as 'busybox-container' was dropped
-------------------------------------------------------------------
Tue Mar 17 15:22:22 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>
- Convert to use busybox-links
-------------------------------------------------------------------
Fri Mar 13 21:06:35 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>
- busybox-container was merged with busybox
-------------------------------------------------------------------
Thu Mar 12 16:18:22 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>

View File

@ -38,6 +38,20 @@
</repository>
<packages type="bootstrap">
<package name="busybox"/>
<package name="busybox-links"/>
<package name="busybox-coreutils" replaces="coreutils"/>
<package name="busybox-findutils" replaces="findutils"/>
<package name="busybox-util-linux" replaces="util-linux"/>
<package name="busybox-grep" replaces="grep"/>
<package name="busybox-diffutils" replaces="diffutils"/>
<package name="busybox-sed" replaces="sed"/>
<package name="busybox-cpio" replaces="cpio"/>
<package name="busybox-gzip" replaces="gzip"/>
<package name="busybox-bzip2" replaces="bzip2"/>
<package name="busybox-xz" replaces="xz"/>
<package name="busybox-procps" replaces="procps"/>
<package name="busybox-kbd" replaces="kbd"/>
<package name="busybox-hostname" replaces="hostname"/>
<package name="kubernetes-pause"/>
</packages>
</image>