aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrans Meulenbroeks <fransmeulenbroeks@gmail.com>2010-07-09 17:01:43 +0200
committerFrans Meulenbroeks <fransmeulenbroeks@gmail.com>2010-07-09 17:01:43 +0200
commit1620c1459b9a319e98239d7da81ae0d89768b032 (patch)
tree96a6ccab4bcc31393e4d1d1c34c9b1ea4f85f0b2
parentb364659466f93a7361eee691bf25f63f382b6ec9 (diff)
downloadopenembedded-1620c1459b9a319e98239d7da81ae0d89768b032.tar.gz
busybox 1.14.3: added a defined(__nios2__)
Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
-rw-r--r--recipes/busybox/busybox-1.14.3/fdisk_nios2.patch13
-rw-r--r--recipes/busybox/busybox_1.14.3.bb3
2 files changed, 15 insertions, 1 deletions
diff --git a/recipes/busybox/busybox-1.14.3/fdisk_nios2.patch b/recipes/busybox/busybox-1.14.3/fdisk_nios2.patch
new file mode 100644
index 0000000000..f023f11f75
--- /dev/null
+++ b/recipes/busybox/busybox-1.14.3/fdisk_nios2.patch
@@ -0,0 +1,13 @@
+Index: busybox-1.13.2/util-linux/fdisk_osf.c
+===================================================================
+--- busybox-1.13.2.orig/util-linux/fdisk_osf.c 2010-06-07 07:29:28.000000000 +0200
++++ busybox-1.13.2/util-linux/fdisk_osf.c 2010-06-07 07:29:32.000000000 +0200
+@@ -45,7 +45,7 @@
+
+ #if defined(i386) || defined(__sparc__) || defined(__arm__) \
+ || defined(__m68k__) || defined(__mips__) || defined(__s390__) \
+- || defined(__sh__) || defined(__x86_64__)
++ || defined(__sh__) || defined(__x86_64__) || defined (__nios2__)
+ #define BSD_LABELSECTOR 1
+ #define BSD_LABELOFFSET 0
+ #elif defined(__alpha__) || defined(__powerpc__) || defined(__ia64__) \
diff --git a/recipes/busybox/busybox_1.14.3.bb b/recipes/busybox/busybox_1.14.3.bb
index ebe018cc78..ffbd71eea5 100644
--- a/recipes/busybox/busybox_1.14.3.bb
+++ b/recipes/busybox/busybox_1.14.3.bb
@@ -1,10 +1,11 @@
require busybox.inc
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
DEFAULT_PREFERENCE = "-1"
SRC_URI = "\
http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
+ file://fdisk_nios2.patch \
\
file://udhcpscript.patch \
file://udhcpc-fix-nfsroot.patch \