From 3bfdc5d399b12e5d677f2ed6ef944fe2107ab6c6e1680351042f556d1a143ea9 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 18 Jul 2012 16:11:10 +0000 Subject: [PATCH 1/2] Accepting request 128187 from home:a_jaeger:FactoryFix Add missing sys/resource include (glibc 2.16) (fixed changes entry) OBS-URL: https://build.opensuse.org/request/show/128187 OBS-URL: https://build.opensuse.org/package/show/Base:System/busybox?expand=0&rev=22 --- busybox-resource.patch | 12 ++++++++++++ busybox-static.changes | 5 +++++ busybox-static.spec | 2 ++ busybox.changes | 5 +++++ busybox.spec | 2 ++ 5 files changed, 26 insertions(+) create mode 100644 busybox-resource.patch diff --git a/busybox-resource.patch b/busybox-resource.patch new file mode 100644 index 0000000..bcab138 --- /dev/null +++ b/busybox-resource.patch @@ -0,0 +1,12 @@ +Index: busybox-1.19.4/include/libbb.h +=================================================================== +--- busybox-1.19.4.orig/include/libbb.h ++++ busybox-1.19.4/include/libbb.h +@@ -35,6 +35,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/busybox-static.changes b/busybox-static.changes index 7851adb..8a78616 100644 --- a/busybox-static.changes +++ b/busybox-static.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jul 18 07:44:02 UTC 2012 - aj@suse.de + +- Add missing sys/resource include (glibc 2.16) + ------------------------------------------------------------------- Wed Jun 6 13:02:52 UTC 2012 - seife+obs@b1-systems.com diff --git a/busybox-static.spec b/busybox-static.spec index 3c2c1da..d3f8301 100644 --- a/busybox-static.spec +++ b/busybox-static.spec @@ -33,6 +33,7 @@ Patch99: busybox.uClibc-build-fix.patch Patch100: busybox.install.patch Patch101: busybox-1.18.3-libarchive.patch Patch102: busybox-1.19.4-ext2fs_h.diff +Patch103: busybox-resource.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: uClibc-devel @@ -53,6 +54,7 @@ counterparts. %patch100 -p1 %patch101 -p1 %patch102 -p1 +%patch103 -p1 %{__cp} -a %{S:1} docs/ %{__cp} -a %{S:2} .config find -name CVS | xargs rm -rf diff --git a/busybox.changes b/busybox.changes index b764997..0d95130 100644 --- a/busybox.changes +++ b/busybox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jul 18 07:43:58 UTC 2012 - aj@suse.de + +- Add missing sys/resource include (glibc 2.16) + ------------------------------------------------------------------- Wed Jun 6 13:02:52 UTC 2012 - seife+obs@b1-systems.com diff --git a/busybox.spec b/busybox.spec index cbfbaf9..b36e1dd 100644 --- a/busybox.spec +++ b/busybox.spec @@ -32,6 +32,7 @@ Source4: mkinitrd-boot.sh Patch100: busybox.install.patch Patch101: %{name}-1.18.3-libarchive.patch Patch102: busybox-1.19.4-ext2fs_h.diff +Patch103: busybox-resource.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -50,6 +51,7 @@ counterparts. %patch100 -p1 %patch101 -p1 %patch102 -p1 +%patch103 -p1 %{__cp} -a %{S:1} docs/ %{__cp} -a %{S:2} .config find -name CVS | xargs rm -rf From 57fa87d4933d454187a468a9ee32922e19e6f1857c330c7eb8e20a5689926cdc Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Wed, 1 Aug 2012 14:17:18 +0000 Subject: [PATCH 2/2] - fix path in busybox.install (bnc#680153) OBS-URL: https://build.opensuse.org/package/show/Base:System/busybox?expand=0&rev=23 --- busybox.changes | 5 +++++ busybox.install.patch | 20 ++++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/busybox.changes b/busybox.changes index 0d95130..fb6132e 100644 --- a/busybox.changes +++ b/busybox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 1 14:15:40 UTC 2012 - lnussel@suse.de + +- fix path in busybox.install (bnc#680153) + ------------------------------------------------------------------- Wed Jul 18 07:43:58 UTC 2012 - aj@suse.de diff --git a/busybox.install.patch b/busybox.install.patch index 17ad22a..3c33f30 100644 --- a/busybox.install.patch +++ b/busybox.install.patch @@ -1,6 +1,13 @@ ---- busybox-1.19.4/applets/install.sh +Index: busybox-1.19.4/applets/install.sh +=================================================================== +--- busybox-1.19.4.orig/applets/install.sh +++ busybox-1.19.4/applets/install.sh -@@ -9,7 +9,7 @@ +@@ -5,11 +5,11 @@ export LC_CTYPE=POSIX + + prefix=$1 + if [ -z "$prefix" ]; then +- echo "usage: applets/install.sh DESTINATION [--symlinks/--hardlinks/--scriptwrapper]" ++ echo "usage: busybox.install DESTINATION [--symlinks/--hardlinks/--scriptwrapper]" exit 1 fi @@ -9,3 +16,12 @@ linkopts="" scriptwrapper="n" +@@ -64,7 +64,7 @@ fi + + rm -f "$prefix/bin/busybox" || exit 1 + mkdir -p "$prefix/bin" || exit 1 +-install -m 755 busybox "$prefix/bin/busybox" || exit 1 ++install -m 755 /usr/bin/busybox "$prefix/bin/busybox" || exit 1 + + for i in $h; do + appdir=`dirname "$i"`