Hello community, here is the log from the commit of package busybox for openSUSE:Factory checked in at 2019-09-07 11:25:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/busybox (Old) and /work/SRC/openSUSE:Factory/.busybox.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "busybox" Sat Sep 7 11:25:28 2019 rev:51 rq:726502 version:1.30.1 Changes: -------- --- /work/SRC/openSUSE:Factory/busybox/busybox.changes 2019-08-15 12:22:40.730646927 +0200 +++ /work/SRC/openSUSE:Factory/.busybox.new.7948/busybox.changes 2019-09-07 11:25:30.262494312 +0200 @@ -1,0 +2,7 @@ +Thu Aug 22 15:27:18 CEST 2019 - kukuk@suse.de + +- Drop busybox-rpm-E.patch, not needed anymore +- Create new "container" subpackage with special stripped down + version for container images (8MB instead of 15MB). + +------------------------------------------------------------------- Old: ---- busybox-rpm-E.patch New: ---- busybox-container.config ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ busybox.spec ++++++ --- /var/tmp/diff_new_pack.jTqr6r/_old 2019-09-07 11:25:31.038494204 +0200 +++ /var/tmp/diff_new_pack.jTqr6r/_new 2019-09-07 11:25:31.042494203 +0200 @@ -27,10 +27,9 @@ Source1: BusyBox.1 Source2: busybox.config Source3: busybox-static.config +Source4: busybox-container.config # other patches Patch: busybox.install.patch -# kiwi requires "rpm -E %%_dbpath" working -Patch1: busybox-rpm-E.patch Provides: useradd_or_adduser_dep BuildRequires: glibc-devel-static BuildRequires: libtirpc-devel @@ -62,11 +61,28 @@ expected functionality and behave very much like their GNU counterparts. +%package container +Summary: Swiss Army Knife of Embedded Linux configured for container +Group: System/Base +Provides: useradd_or_adduser_dep + +%description container +This is a very small BusyBox version which contains only the tools which +makes sense in a container. +BusyBox combines tiny versions of many common UNIX utilities into a +small single executable. It provides minimalist replacements for most +of the utilities usually found in fileutils, shellutils, findutils, +textutils, grep, gzip, tar, and more. BusyBox provides a fairly +complete POSIX environment for any small or embedded system. The +utilities in BusyBox generally have fewer options than their +full-featured GNU cousins. The options that are included provide the +expected functionality and behave very much like their GNU +counterparts. + %prep %setup -q %patch -p0 -%patch1 -p0 cp -a %{SOURCE1} docs/ find -name CVS | xargs rm -rf find -name .cvsignore | xargs rm -rf @@ -80,6 +96,13 @@ export CFLAGS="%{optflags} -fno-strict-aliasing -I/usr/include/tirpc" export CC="gcc" export HOSTCC=gcc +cp -a %{SOURCE4} .config +make %{?_smp_mflags} -e oldconfig +make -e %{?_smp_mflags} +mv busybox busybox-container +make busybox.links +mv busybox.links busybox-container.links +sed -e 's|busybox.links|busybox-container.links|g' -e 's|/usr/bin/busybox|/usr/bin/busybox-container|g' applets/install.sh > busybox-container.install cp -a %{SOURCE3} .config make %{?_smp_mflags} -e oldconfig make -e %{?_smp_mflags} @@ -94,9 +117,12 @@ install -d %{buildroot}/%{_bindir} install -d %{buildroot}/%{_datadir}/busybox install -m 0644 busybox.links %{buildroot}%{_datadir}/busybox +install -m 0644 busybox-container.links %{buildroot}%{_datadir}/busybox install applets/install.sh %{buildroot}%{_bindir}/busybox.install +install busybox-container.install %{buildroot}%{_bindir}/busybox-container.install install -m 0755 busybox %{buildroot}/%{_bindir} install -m 0755 busybox-static %{buildroot}/%{_bindir} +install -m 0755 busybox-container %{buildroot}/%{_bindir} install -d %{buildroot}%{_mandir}/man1 install -m 644 docs/BusyBox.1 %{buildroot}%{_mandir}/man1 @@ -115,4 +141,11 @@ %license LICENSE %{_bindir}/busybox-static +%files container +%defattr(-,root,root) +%license LICENSE +%{_bindir}/busybox-container +%{_bindir}/busybox-container.install +%{_datadir}/busybox/busybox-container.links + %changelog