diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2006-05-18 10:52:30 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-05-18 10:52:30 +0000 |
| commit | ec6a0a6478eb6c0cdad2a22febd667672bfd159e (patch) | |
| tree | 888c4f2141cd38aed784d065c780f70f991c7360 /packages | |
| parent | ac0214c0b84b53bc043ef643ff7857d3cce8d54e (diff) | |
busybox-1.01: improve uclibc-posix patch to not break the glibc build. closes #657
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/busybox/busybox-1.01/uclibc_posix.patch | 7 | ||||
| -rw-r--r-- | packages/busybox/busybox_1.01.bb | 15 |
2 files changed, 12 insertions, 10 deletions
diff --git a/packages/busybox/busybox-1.01/uclibc_posix.patch b/packages/busybox/busybox-1.01/uclibc_posix.patch index aefb994068..186f3f9c3a 100644 --- a/packages/busybox/busybox-1.01/uclibc_posix.patch +++ b/packages/busybox/busybox-1.01/uclibc_posix.patch @@ -1,12 +1,13 @@ see http://www.busybox.net/lists/busybox/2004-December/013276.html +and http://bugs.openembedded.org/show_bug.cgi?id=657 ---- busybox-old/libbb/loop.c 2004-08-16 04:36:28.000000000 -0400 -+++ busybox/libbb/loop.c 2004-12-04 23:45:58.000000000 -0500 +--- busybox-1.01/libbb/loop.c 2006/03/13 22:18:47 1.1 ++++ busybox-1.01/libbb/loop.c 2006/03/13 22:19:57 @@ -19,6 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -+#include <asm/posix_types.h> ++#include <linux/types.h> #include <stdio.h> #include <errno.h> #include <fcntl.h> diff --git a/packages/busybox/busybox_1.01.bb b/packages/busybox/busybox_1.01.bb index 996b5418a4..1e2f41fcba 100644 --- a/packages/busybox/busybox_1.01.bb +++ b/packages/busybox/busybox_1.01.bb @@ -10,12 +10,12 @@ HOMEPAGE = "http://www.busybox.net" LICENSE = "GPL" SECTION = "base" PRIORITY = "required" -PR = "r11" +PR = "r12" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://udhcppidfile.patch;patch=1 \ file://udhcppidfile-breakage.patch;patch=1 \ - file://add-getkey-applet.patch;patch=1 \ + file://add-getkey-applet.patch;patch=1 \ file://below.patch;patch=1 \ file://dhcp-hostname.patch;patch=1 \ file://dhcpretrytime.patch;patch=1 \ @@ -28,14 +28,15 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://rmmod.patch;patch=1 \ file://udhcpscript.patch;patch=1 \ file://thumb-bsdlabel.patch;patch=1 \ - file://uclibc_posix.patch;patch=1 \ - file://glibc2.4-icmp6.patch;patch=1 \ - file://defconfig \ - file://busybox-cron \ + file://glibc2.4-icmp6.patch;patch=1 \ + file://uclibc_posix.patch;patch=1 \ + \ + file://defconfig \ + file://busybox-cron \ file://busybox-httpd \ file://busybox-udhcpd \ file://syslog \ - file://hwclock.sh \ + file://hwclock.sh \ file://default.script \ file://syslog.conf \ file://mount.busybox \ |