Accepting request 729402 from home:kukuk:container

- Use busybox-container, much smaller

OBS-URL: https://build.opensuse.org/request/show/729402
OBS-URL: https://build.opensuse.org/package/show/devel:kubic:containers/tumbleweed-busybox-image?expand=0&rev=10
This commit is contained in:
Thorsten Kukuk 2019-09-09 11:06:42 +00:00 committed by Git OBS Bridge
parent 708fca56d4
commit 9a2b86eaa6
4 changed files with 12 additions and 5 deletions

View File

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

View File

@ -1,4 +1,4 @@
#!/usr/bin/busybox sh #!/usr/bin/busybox-container sh
#====================================== #======================================
# Functions... # Functions...
@ -12,6 +12,7 @@ test -f /.profile && . /.profile
#-------------------------------------- #--------------------------------------
echo "Configure image: [$kiwi_iname]..." 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/ln
/usr/bin/busybox ln -sf ../usr/bin/busybox /bin/rm /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/mkdir
@ -21,10 +22,11 @@ echo "Configure image: [$kiwi_iname]..."
/usr/bin/busybox ln -sf busybox /usr/bin/install /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/dirname
/usr/bin/busybox ln -sf busybox /usr/bin/basename /usr/bin/busybox ln -sf busybox /usr/bin/basename
/usr/bin/busybox.install / --symlinks /usr/bin/busybox-container.install / --symlinks
/bin/rm linuxrc /bin/rm linuxrc
/bin/rm /usr/bin/busybox /bin/rm /usr/bin/busybox
/bin/rm /usr/bin/busybox.install /bin/rm /usr/bin/busybox-container
/bin/rm /usr/bin/busybox-container.install
/bin/rm -rf /usr/share/busybox /bin/rm -rf /usr/share/busybox
exit 0 exit 0

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Aug 22 14:29:49 CEST 2019 - kukuk@suse.de
- Use busybox-container, much smaller
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Aug 2 12:54:52 UTC 2019 - Thorsten Kukuk <kukuk@suse.com> Fri Aug 2 12:54:52 UTC 2019 - Thorsten Kukuk <kukuk@suse.com>

View File

@ -37,6 +37,6 @@
<source path="obsrepositories:/"/> <source path="obsrepositories:/"/>
</repository> </repository>
<packages type="bootstrap"> <packages type="bootstrap">
<package name="busybox"/> <package name="busybox-container"/>
</packages> </packages>
</image> </image>