Hello community, here is the log from the commit of package busybox for openSUSE:Factory checked in at 2019-04-04 14:12:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/busybox (Old) and /work/SRC/openSUSE:Factory/.busybox.new.3908 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "busybox" Thu Apr 4 14:12:29 2019 rev:49 rq:690641 version:1.30.1 Changes: -------- --- /work/SRC/openSUSE:Factory/busybox/busybox.changes 2018-09-11 17:10:37.916028272 +0200 +++ /work/SRC/openSUSE:Factory/.busybox.new.3908/busybox.changes 2019-04-04 14:12:32.373302755 +0200 @@ -1,0 +2,17 @@ +Fri Mar 29 12:03:49 CET 2019 - ku...@suse.de + +- Implement rpm -E %_dbpath for kiwi (busybox-rpm-E.patch) +- Don't require /bin/sh, be self contained + +------------------------------------------------------------------- +Thu Mar 28 21:58:41 CET 2019 - ku...@suse.de + +- update to 1.30.1 + * many bugfixes and new features +- obsolete busybox-1.18.3-libarchive.patch +- obsolete busybox-resource.patch +- Update busybox*.config +- Merge busybox.spec and busybox-static.spec and build the static + binary as subpackage + +------------------------------------------------------------------- Old: ---- busybox-1.18.3-libarchive.patch busybox-1.26.2.tar.bz2 busybox-resource.patch busybox-static.SuSE.config busybox-static.changes busybox-static.spec busybox.SuSE.config New: ---- busybox-1.30.1.tar.bz2 busybox-rpm-E.patch busybox-static.config busybox.config ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ busybox.spec ++++++ --- /var/tmp/diff_new_pack.W5MpLM/_old 2019-04-04 14:12:34.857303948 +0200 +++ /var/tmp/diff_new_pack.W5MpLM/_new 2019-04-04 14:12:34.861303950 +0200 @@ -1,7 +1,7 @@ # # spec file for package busybox # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,24 +12,26 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: busybox -Version: 1.26.2 +Version: 1.30.1 Release: 0 Summary: The Swiss Army Knife of Embedded Linux -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/Base Url: http://www.busybox.net/ Source: http://busybox.net/downloads/%{name}-%{version}.tar.bz2 Source1: BusyBox.1 -Source2: busybox.SuSE.config +Source2: busybox.config +Source3: busybox-static.config # other patches -Patch100: busybox.install.patch -Patch101: %{name}-1.18.3-libarchive.patch -Patch103: busybox-resource.patch +Patch: busybox.install.patch +# kiwi requires "rpm -E %%_dbpath" working +Patch1: busybox-rpm-E.patch +BuildRequires: glibc-devel-static BuildRequires: libtirpc-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -44,13 +46,27 @@ expected functionality and behave very much like their GNU counterparts. +%package static +Summary: Static linked Swiss Army Knife of Embedded Linux +Group: System/Base + +%description static +The static linked 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 -%patch100 -p1 -%patch101 -p1 -%patch103 -p1 +%patch -p0 +%patch1 -p0 cp -a %{SOURCE1} docs/ -cp -a %{SOURCE2} .config find -name CVS | xargs rm -rf find -name .cvsignore | xargs rm -rf find -name .svn | xargs rm -rf @@ -63,6 +79,12 @@ export CFLAGS="%{optflags} -fno-strict-aliasing -I/usr/include/tirpc" export CC="gcc" export HOSTCC=gcc +cp -a %{SOURCE3} .config +make %{?_smp_mflags} -e oldconfig +make -e %{?_smp_mflags} +mv busybox busybox-static +make -e %{?_smp_mflags} clean +cp -a %{SOURCE2} .config make %{?_smp_mflags} -e oldconfig make -e %{?_smp_mflags} make -e doc busybox.links %{?_smp_mflags} @@ -70,19 +92,26 @@ %install install -d %{buildroot}/%{_bindir} install -d %{buildroot}/%{_datadir}/busybox -install busybox.links %{buildroot}%{_datadir}/busybox +install -m 0644 busybox.links %{buildroot}%{_datadir}/busybox install applets/install.sh %{buildroot}%{_bindir}/busybox.install -install busybox %{buildroot}/%{_bindir} +install -m 0755 busybox %{buildroot}/%{_bindir} +install -m 0755 busybox-static %{buildroot}/%{_bindir} install -d %{buildroot}%{_mandir}/man1 install -m 644 docs/BusyBox.1 %{buildroot}%{_mandir}/man1 %files %defattr(-,root,root) +%license LICENSE %doc docs/mdev.txt %doc %{_mandir}/man1/BusyBox.1.gz %{_bindir}/busybox %{_bindir}/busybox.install %dir %{_datadir}/busybox -%config %{_datadir}/busybox/busybox.links +%{_datadir}/busybox/busybox.links + +%files static +%defattr(-,root,root) +%license LICENSE +%{_bindir}/busybox-static %changelog ++++++ busybox-1.26.2.tar.bz2 -> busybox-1.30.1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/busybox/busybox-1.26.2.tar.bz2 /work/SRC/openSUSE:Factory/.busybox.new.3908/busybox-1.30.1.tar.bz2 differ: char 11, line 1 ++++++ busybox-rpm-E.patch ++++++ --- 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.install.patch ++++++ --- /var/tmp/diff_new_pack.W5MpLM/_old 2019-04-04 14:12:34.925303981 +0200 +++ /var/tmp/diff_new_pack.W5MpLM/_new 2019-04-04 14:12:34.925303981 +0200 @@ -1,25 +1,32 @@ -Index: busybox-1.19.4/applets/install.sh -=================================================================== ---- busybox-1.19.4.orig/applets/install.sh -+++ busybox-1.19.4/applets/install.sh -@@ -5,14 +5,14 @@ +--- applets/install.sh ++++ applets/install.sh 2019/03/29 09:03:34 +@@ -1,11 +1,11 @@ +-#!/bin/sh ++#!/usr/bin/busybox sh + + export LC_ALL=POSIX + export LC_CTYPE=POSIX prefix=$1 if [ -z "$prefix" ]; then -- echo "usage: applets/install.sh DESTINATION [--symlinks/--hardlinks/--binaries/--scriptwrapper]" -+ echo "usage: busybox.install DESTINATION [--symlinks/--hardlinks/--binaries/--scriptwrapper]" +- echo "usage: applets/install.sh DESTINATION TYPE [OPTS ...]" ++ echo "usage: busybox.install DESTINATION TYPE [OPTS ...]" + echo " TYPE is one of: --symlinks --hardlinks --binaries --scriptwrapper --none" + echo " OPTS is one or more of: --cleanup --noclobber" exit 1 - fi +@@ -13,9 +13,9 @@ + shift # Keep only remaining options # Source the configuration - . ./.config +-. ./.config ++#. ./.config -h=`sort busybox.links | uniq` +h=`sort /usr/share/busybox/busybox.links | uniq` sharedlib_dir="0_lib" -@@ -64,7 +64,7 @@ fi +@@ -78,7 +78,7 @@ rm -f "$prefix/bin/busybox" || exit 1 mkdir -p "$prefix/bin" || exit 1
