[oe-commits] Frans Meulenbroeks : util-linux-ng: added || defined(__nios2__)

[git version control]

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

Author: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>
Date:   Wed Jul  7 20:43:22 2010 +0200

util-linux-ng: added || defined(__nios2__)

added a defined for nios2 so it now also compiles for nios2

Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>

---

 .../util-linux-ng-2.17/fdiskbsdlabel.h-nios2.patch |   14 ++++++++++++++
 recipes/util-linux-ng/util-linux-ng_2.17.bb        |    3 ++-
 2 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/recipes/util-linux-ng/util-linux-ng-2.17/fdiskbsdlabel.h-nios2.patch b/recipes/util-linux-ng/util-linux-ng-2.17/fdiskbsdlabel.h-nios2.patch
new file mode 100644
index 0000000..5b5051e
--- /dev/null
+++ b/recipes/util-linux-ng/util-linux-ng-2.17/fdiskbsdlabel.h-nios2.patch
@@ -0,0 +1,14 @@
+Index: util-linux-ng-2.17/fdisk/fdiskbsdlabel.h
+===================================================================
+--- util-linux-ng-2.17.orig/fdisk/fdiskbsdlabel.h	2010-07-07 14:13:04.073530165 +0200
++++ util-linux-ng-2.17/fdisk/fdiskbsdlabel.h	2010-07-07 14:13:43.053535150 +0200
+@@ -48,7 +48,8 @@
+ 
+ #if defined (i386) || defined (__sparc__) || defined (__arm__) || \
+     defined (__mips__) || defined (__s390__) || defined (__sh__) || \
+-    defined(__x86_64__) || defined (__avr32__) || defined(__cris__)
++    defined(__x86_64__) || defined (__avr32__) || defined(__cris__) || \
++    defined (__nios2__)
+ #define BSD_LABELSECTOR   1
+ #define BSD_LABELOFFSET   0
+ #elif defined (__alpha__) || defined (__powerpc__) || defined (__ia64__) || defined (__hppa__)
diff --git a/recipes/util-linux-ng/util-linux-ng_2.17.bb b/recipes/util-linux-ng/util-linux-ng_2.17.bb
index b435211..e906abb 100644
--- a/recipes/util-linux-ng/util-linux-ng_2.17.bb
+++ b/recipes/util-linux-ng/util-linux-ng_2.17.bb
@@ -1,9 +1,10 @@
 require util-linux-ng.inc
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 
 SRC_URI += "file://uclibc-compile.patch \
 	    file://util-linux-ng-replace-siginterrupt.patch \
+	    file://fdiskbsdlabel.h-nios2.patch \
            "
 
 # fallocate is glibc 2.10, fallocate64 is glibc 2.11