Accepting request 798585 from devel:kubic:containers
- Add busybox-sh (was splitted from busybox-ash because of bash) - Add LICENSE file - Use busybox-ash instead of busybox-sh - config.sh: don't create symlinks which we package now - list all packages, don't use busybox-links meta package - Use 'busybox' as 'busybox-container' was dropped - Convert to use busybox-links - busybox-container was merged with busybox OBS-URL: https://build.opensuse.org/request/show/798585 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tumbleweed-busybox-image?expand=0&rev=7
This commit is contained in:
Git OBS Bridge
17
LICENSE
Normal file
17
LICENSE
Normal file
@@ -0,0 +1,17 @@
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
2
_service
2
_service
@@ -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>
|
||||
|
||||
20
config.sh
20
config.sh
@@ -1,4 +1,4 @@
|
||||
#!/usr/bin/busybox-container sh
|
||||
#!/usr/bin/busybox sh
|
||||
|
||||
#======================================
|
||||
# Functions...
|
||||
@@ -12,21 +12,7 @@ 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
|
||||
|
||||
exit 0
|
||||
|
||||
@@ -1,3 +1,39 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 28 06:45:51 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>
|
||||
|
||||
- Add busybox-sh (was splitted from busybox-ash because of bash)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 20 09:05:00 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>
|
||||
|
||||
- Add LICENSE file
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Apr 18 19:26:08 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>
|
||||
|
||||
- Use busybox-ash instead of busybox-sh
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 15 07:23:13 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>
|
||||
|
||||
- config.sh: don't create symlinks which we package now
|
||||
- list all packages, don't use busybox-links meta package
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 14 10:42:15 UTC 2020 - Richard Brown <rbrown@suse.com>
|
||||
|
||||
- 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>
|
||||
|
||||
|
||||
@@ -37,7 +37,41 @@
|
||||
<source path="obsrepositories:/"/>
|
||||
</repository>
|
||||
<packages type="bootstrap">
|
||||
<package name="busybox-container"/>
|
||||
<package name="busybox"/>
|
||||
<package name="busybox-ash" replaces="bash"/>
|
||||
<package name="busybox-attr" replaces="attr"/>
|
||||
<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"/>
|
||||
<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-iproute2"/>
|
||||
<package name="busybox-iputils"/>
|
||||
<package name="busybox-kbd" replaces="kbd"/>
|
||||
<package name="busybox-kmod" replaces="kmod"/>
|
||||
<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-misc" replaces="shadow"/>
|
||||
<package name="busybox-misc" replaces="sysvinit-tools"/>
|
||||
<package name="busybox-ncurses-utils" replaces="ncurses-utils"/>
|
||||
<package name="busybox-net-tools"/>
|
||||
<package name="busybox-patch" replaces="patch"/>
|
||||
<package name="busybox-procps" replaces="procps"/>
|
||||
<package name="busybox-sed" replaces="sed"/>
|
||||
<package name="busybox-sh"/>
|
||||
<package name="busybox-sharutils"/>
|
||||
<package name="busybox-tar" replaces="tar"/>
|
||||
<package name="busybox-traceroute"/>
|
||||
<package name="busybox-util-linux" replaces="util-linux"/>
|
||||
<package name="busybox-which" replaces="which"/>
|
||||
<package name="busybox-xz" replaces="xz"/>
|
||||
<package name="kubernetes-pause"/>
|
||||
</packages>
|
||||
</image>
|
||||
|
||||
Reference in New Issue
Block a user