Accepting request 726502 from Base:System

OBS-URL: https://build.opensuse.org/request/show/726502
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/busybox?expand=0&rev=51

busybox-rpm-E.patch

@@ -1,30 +0,0 @@
---- archival/rpm.c
-+++ archival/rpm.c	2019/03/29 10:59:36
-@@ -358,7 +358,7 @@
- 	INIT_G();
- 	G.pagesize = getpagesize();
- 
--	while ((opt = getopt(argc, argv, "iqpldc")) != -1) {
-+	while ((opt = getopt(argc, argv, "iqpldcE:")) != -1) {
- 		switch (opt) {
- 		case 'i': /* First arg: Install mode, with q: Information */
- 			if (!func) func = rpm_install;
-@@ -382,6 +382,18 @@
- 			func |= rpm_query_list;
- 			func |= rpm_query_list_config;
- 			break;
-+		case 'E': /* special hack for kiwi */
-+		        if (strcmp (optarg, "%_dbpath") == 0)
-+			  {
-+			    if (access ("/usr/lib/sysimage/rpm", F_OK) == 0)
-+			      printf ("/usr/lib/sysimage/rpm\n");
-+			    else
-+			      printf ("/var/lib/rpm\n");
-+			    return 0;
-+			  }
-+			else
-+			  bb_show_usage();
-+			break;
- 		default:
- 			bb_show_usage();
- 		}

busybox.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+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).
+
 -------------------------------------------------------------------
 Thu Jul 25 15:29:03 CEST 2019 - kukuk@suse.de
 

busybox.spec

@@ -27,10 +27,9 @@ Source:         http://busybox.net/downloads/%{name}-%{version}.tar.bz2
 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 @@ full-featured GNU cousins. The options that are included provide the
 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 BUILD_VERBOSE=2
 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 @@ make -e doc busybox.links %{?_smp_mflags}
 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 @@ install -m 644 docs/BusyBox.1 %{buildroot}%{_mandir}/man1
 %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