summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrans Meulenbroeks <fransmeulenbroeks@gmail.com>2010-06-26 10:08:23 +0200
committerFrans Meulenbroeks <fransmeulenbroeks@gmail.com>2010-06-26 10:08:23 +0200
commitffd890c52fb83f05c83188c662f969bfdbb8675a (patch)
tree2c474cfdf039d5576b60a80d214db0b120d91d90
parentc85ba4175a751898b16d239b6078e21254ee2991 (diff)
busybox-1.13.2: add __nios2__ conditional
busybox fdisk has if defined(__arch__) statements. This patch adds the defined line for nios2 (__nios2__) Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
-rw-r--r--recipes/busybox/busybox-1.13.2/fdisk_nios2.patch13
-rw-r--r--recipes/busybox/busybox_1.13.2.bb3
2 files changed, 15 insertions, 1 deletions
diff --git a/recipes/busybox/busybox-1.13.2/fdisk_nios2.patch b/recipes/busybox/busybox-1.13.2/fdisk_nios2.patch
new file mode 100644
index 0000000000..f023f11f75
--- /dev/null
+++ b/recipes/busybox/busybox-1.13.2/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.13.2.bb b/recipes/busybox/busybox_1.13.2.bb
index 2b28c0b093..0daa852cbf 100644
--- a/recipes/busybox/busybox_1.13.2.bb
+++ b/recipes/busybox/busybox_1.13.2.bb
@@ -1,5 +1,5 @@
require busybox.inc
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
SRC_URI = "\
http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
@@ -15,6 +15,7 @@ SRC_URI = "\
file://busybox-1.13.2-top24.patch \
file://busybox-1.13.2-unzip.patch \
file://busybox-1.13.2-wget.patch \
+ file://fdisk_nios2.patch \
\
file://udhcpscript.patch \
file://udhcpc-fix-nfsroot.patch \