fix util-linux compile on avr32

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7860 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/util-linux/patches/801-cris-label.patch b/package/util-linux/patches/801-cris-label.patch
deleted file mode 100644 (file)
index 0ccfb52..0000000
--- a/package/util-linux/patches/801-cris-label.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- util-linux-2.12r.orig/fdisk/fdiskbsdlabel.h        2007-06-12 21:32:25.000000000 +0200
-+++ util-linux-2.12r/fdisk/fdiskbsdlabel.h     2007-06-12 21:33:20.000000000 +0200
-@@ -43,7 +43,7 @@
- 
- #define BSD_LINUX_BOOTDIR "/usr/ucb/mdec"
- 
--#if defined (i386) || defined (__sparc__) || defined (__arm__) || defined (__mips__) || defined (__s390__) || defined (__sh__) || defined(__x86_64__)
-+#if defined (i386) || defined (__sparc__) || defined (__arm__) || defined (__mips__) || defined (__s390__) || defined (__sh__) || defined(__x86_64__) || defined (__cris__)
- #define BSD_LABELSECTOR   1
- #define BSD_LABELOFFSET   0
- #elif defined (__alpha__) || defined (__powerpc__) || defined (__ia64__) || defined (__hppa__)

diff --git a/package/util-linux/patches/801-cris_avr32_label.patch b/package/util-linux/patches/801-cris_avr32_label.patch
new file mode 100644 (file)
index 0000000..d281949
--- /dev/null
+++ b/package/util-linux/patches/801-cris_avr32_label.patch
@@ -0,0 +1,11 @@
+--- util-linux-2.12r.orig/fdisk/fdiskbsdlabel.h        2007-06-12 21:32:25.000000000 +0200
++++ util-linux-2.12r/fdisk/fdiskbsdlabel.h     2007-06-12 21:33:20.000000000 +0200
+@@ -43,7 +43,7 @@
+ 
+ #define BSD_LINUX_BOOTDIR "/usr/ucb/mdec"
+ 
+-#if defined (i386) || defined (__sparc__) || defined (__arm__) || defined (__mips__) || defined (__s390__) || defined (__sh__) || defined(__x86_64__)
++#if defined (i386) || defined (__sparc__) || defined (__arm__) || defined (__mips__) || defined (__s390__) || defined (__sh__) || defined(__x86_64__) || defined (__cris__) || defined(__avr32__)
+ #define BSD_LABELSECTOR   1
+ #define BSD_LABELOFFSET   0
+ #elif defined (__alpha__) || defined (__powerpc__) || defined (__ia64__) || defined (__hppa__)