Hello community, here is the log from the commit of package busybox for openSUSE:Factory checked in at 2013-08-19 13:33:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/busybox (Old) and /work/SRC/openSUSE:Factory/.busybox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "busybox" Changes: -------- --- /work/SRC/openSUSE:Factory/busybox/busybox-static.changes 2012-12-14 06:34:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.busybox.new/busybox-static.changes 2013-08-19 13:33:24.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Jun 6 15:07:49 UTC 2013 - dd...@suse.com + +- Build against glibc-devel-static to work around uClibc segfault; + (bnc#758843). + * Remove uClibc specific busybox.uClibc-build-fix.patch. + * Add busybox-static.SuSE.config, which specifies CONFIG_STATIC=y. + +------------------------------------------------------------------- Old: ---- busybox.uClibc-build-fix.patch New: ---- busybox-static.SuSE.config ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ busybox-static.spec ++++++ --- /var/tmp/diff_new_pack.gKBG5J/_old 2013-08-19 13:33:25.000000000 +0200 +++ /var/tmp/diff_new_pack.gKBG5J/_new 2013-08-19 13:33:25.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package busybox-static # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,16 +25,15 @@ Group: System/Base Source: http://busybox.net/downloads/busybox-%{version}.tar.bz2 Source1: BusyBox.1 -Source2: busybox.SuSE.config +Source2: busybox-static.SuSE.config Source3: mkinitrd-setup.sh Source4: mkinitrd-boot.sh # other patches -Patch99: busybox.uClibc-build-fix.patch Patch100: busybox.install.patch Patch101: busybox-1.18.3-libarchive.patch Patch103: busybox-resource.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: uClibc-devel +BuildRequires: glibc-devel-static %description BusyBox combines tiny versions of many common UNIX utilities into a @@ -49,7 +48,6 @@ %prep %setup -q -n busybox-%{version} -%patch99 -p1 %patch100 -p1 %patch101 -p1 %patch103 -p1 @@ -66,11 +64,8 @@ export CFLAGS="%{optflags} -fno-strict-aliasing" export CC="%{__cc}" export HOSTCC=gcc -# somehow uClibc prefers it's own ar.h header, so rename it -mv include/ar.h include/b_ar.h -sed -i -e 's/"ar.h"/"b_ar.h"/' archival/*.c archival/*/*.c make -e oldconfig -make -e CC=gcc-uClibc %{?_smp_mflags} +make -e %{?_smp_mflags} %install install -d $RPM_BUILD_ROOT/%{_bindir} ++++++ busybox.spec ++++++ --- /var/tmp/diff_new_pack.gKBG5J/_old 2013-08-19 13:33:25.000000000 +0200 +++ /var/tmp/diff_new_pack.gKBG5J/_new 2013-08-19 13:33:25.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package busybox # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++++++ busybox-static.SuSE.config ++++++ ++++ 970 lines (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
