diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2006-02-08 11:49:55 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-02-08 11:49:55 +0000 |
| commit | 5e89b38a2bb086165396b268dd0969ab666a2965 (patch) | |
| tree | 3d4cdf5b6c4d5bd1e392c635d86e83b7ab7f1524 | |
| parent | 4f1054d5202a7293ed17e29c104b75b5b06ef577 (diff) | |
busybox: Add fix for uclibc on x86 (from Stelios Koroneos - bug #657)
| -rw-r--r-- | packages/busybox/busybox-1.00/uclibc_posix.patch | 20 | ||||
| -rw-r--r-- | packages/busybox/busybox-1.01/uclibc_posix.patch | 20 | ||||
| -rw-r--r-- | packages/busybox/busybox_1.00.bb | 3 | ||||
| -rw-r--r-- | packages/busybox/busybox_1.01.bb | 3 |
4 files changed, 44 insertions, 2 deletions
diff --git a/packages/busybox/busybox-1.00/uclibc_posix.patch b/packages/busybox/busybox-1.00/uclibc_posix.patch new file mode 100644 index 0000000000..aefb994068 --- /dev/null +++ b/packages/busybox/busybox-1.00/uclibc_posix.patch @@ -0,0 +1,20 @@ +see http://www.busybox.net/lists/busybox/2004-December/013276.html + +--- 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 +@@ -19,6 +19,7 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + ++#include <asm/posix_types.h> + #include <stdio.h> + #include <errno.h> + #include <fcntl.h> +@@ -30,7 +31,6 @@ + /* Grumble... The 2.6.x kernel breaks asm/posix_types.h + * so we get to try and cope as best we can... */ + #include <linux/version.h> +-#include <asm/posix_types.h> + + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) + #define __bb_kernel_dev_t __kernel_old_dev_t diff --git a/packages/busybox/busybox-1.01/uclibc_posix.patch b/packages/busybox/busybox-1.01/uclibc_posix.patch new file mode 100644 index 0000000000..aefb994068 --- /dev/null +++ b/packages/busybox/busybox-1.01/uclibc_posix.patch @@ -0,0 +1,20 @@ +see http://www.busybox.net/lists/busybox/2004-December/013276.html + +--- 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 +@@ -19,6 +19,7 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + ++#include <asm/posix_types.h> + #include <stdio.h> + #include <errno.h> + #include <fcntl.h> +@@ -30,7 +31,6 @@ + /* Grumble... The 2.6.x kernel breaks asm/posix_types.h + * so we get to try and cope as best we can... */ + #include <linux/version.h> +-#include <asm/posix_types.h> + + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) + #define __bb_kernel_dev_t __kernel_old_dev_t diff --git a/packages/busybox/busybox_1.00.bb b/packages/busybox/busybox_1.00.bb index f1ea81a7b8..5b770669c1 100644 --- a/packages/busybox/busybox_1.00.bb +++ b/packages/busybox/busybox_1.00.bb @@ -10,7 +10,7 @@ HOMEPAGE = "http://www.busybox.net" LICENSE = "GPL" SECTION = "base" PRIORITY = "required" -PR = "r31" +PR = "r32" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://add-getkey-applet.patch;patch=1 \ @@ -28,6 +28,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://dhcp-hostname.patch;patch=1 \ file://gzip-spurious-const.patch;patch=1 \ file://ifupdown-spurious-environ.patch;patch=1 \ + file://uclibc_posix.patch;patch=1 \ file://defconfig \ file://busybox-cron \ file://busybox-httpd \ diff --git a/packages/busybox/busybox_1.01.bb b/packages/busybox/busybox_1.01.bb index 4b6101b8bf..3173294398 100644 --- a/packages/busybox/busybox_1.01.bb +++ b/packages/busybox/busybox_1.01.bb @@ -10,7 +10,7 @@ HOMEPAGE = "http://www.busybox.net" LICENSE = "GPL" SECTION = "base" PRIORITY = "required" -PR = "r6" +PR = "r7" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://udhcppidfile.patch;patch=1 \ @@ -28,6 +28,7 @@ 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://defconfig \ file://busybox-cron \ file://busybox-httpd \ |