[oe-commits] Frans Meulenbroeks : busybox-1.13.2: add __nios2__ conditional

git version control git at git.openembedded.org
Sat Jun 26 08:10:04 UTC 2010


Module: openembedded.git
Branch: org.openembedded.dev
Commit: ffd890c52fb83f05c83188c662f969bfdbb8675a
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=ffd890c52fb83f05c83188c662f969bfdbb8675a

Author: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>
Date:   Sat Jun 26 10:08:23 2010 +0200

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 at gmail.com>

---

 recipes/busybox/busybox-1.13.2/fdisk_nios2.patch |   13 +++++++++++++
 recipes/busybox/busybox_1.13.2.bb                |    3 ++-
 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 0000000..f023f11
--- /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 2b28c0b..0daa852 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 \





More information about the Openembedded-commits mailing list