[oe-commits] Frans Meulenbroeks : busybox 1.16.2: added a defined(__nios2__)

git version control git at git.openembedded.org
Fri Jul 9 15:14:28 UTC 2010


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

Author: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>
Date:   Fri Jul  9 17:13:26 2010 +0200

busybox 1.16.2: added a defined(__nios2__)

(actually as there were two entries for __s390__ hijacked one of it

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

---

 recipes/busybox/busybox-1.16.2/fdisk_nios2.patch |   13 +++++++++++++
 recipes/busybox/busybox_1.16.2.bb                |    3 ++-
 2 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/recipes/busybox/busybox-1.16.2/fdisk_nios2.patch b/recipes/busybox/busybox-1.16.2/fdisk_nios2.patch
new file mode 100644
index 0000000..648e68e
--- /dev/null
+++ b/recipes/busybox/busybox-1.16.2/fdisk_nios2.patch
@@ -0,0 +1,13 @@
+Index: busybox-1.15.3/util-linux/fdisk_osf.c
+===================================================================
+--- busybox-1.15.3.orig/util-linux/fdisk_osf.c
++++ busybox-1.15.3/util-linux/fdisk_osf.c
+@@ -44,7 +44,7 @@
+ #define BSD_LINUX_BOOTDIR "/usr/ucb/mdec"
+ 
+ #if defined(i386) || defined(__sparc__) || defined(__arm__) \
+- || defined(__m68k__) || defined(__mips__) || defined(__s390__) \
++ || defined(__m68k__) || defined(__mips__) || defined(__nios2__) \
+  || defined(__s390__) || defined(__s390x__) \
+  || defined(__sh__) || defined(__x86_64__) || defined(__avr32__)
+ # define BSD_LABELSECTOR   1
diff --git a/recipes/busybox/busybox_1.16.2.bb b/recipes/busybox/busybox_1.16.2.bb
index 2175607..c5d27b7 100644
--- a/recipes/busybox/busybox_1.16.2.bb
+++ b/recipes/busybox/busybox_1.16.2.bb
@@ -1,11 +1,12 @@
 require busybox.inc
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_shr = "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 \





More information about the Openembedded-commits mailing list