[oe-commits] Steffen Sledz : busybox-1.11.3: undefined reference __cpu_to_be16 fixed for busybox-static

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: ab0b2217fe5aa32e68f7a7b26c820fb425f4da3c
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=ab0b2217fe5aa32e68f7a7b26c820fb425f4da3c

Author: Steffen Sledz <sledz at dresearch.de>
Date:   Thu Oct 29 13:01:06 2009 +0100

busybox-1.11.3: undefined reference __cpu_to_be16 fixed for busybox-static

A patch fixing this problem inside the linux kernel was not accepted.
For details see:
- http://lkml.org/lkml/2009/6/18/223
- http://patchwork.kernel.org/patch/31164/

Signed-off-by: Steffen Sledz <sledz at dresearch.de>

---

 recipes/busybox/busybox-1.11.3/iptunnel.patch |   11 +++++++++++
 recipes/busybox/busybox.inc                   |    2 +-
 recipes/busybox/busybox_1.11.3.bb             |    1 +
 3 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/recipes/busybox/busybox-1.11.3/iptunnel.patch b/recipes/busybox/busybox-1.11.3/iptunnel.patch
new file mode 100644
index 0000000..18734fc
--- /dev/null
+++ b/recipes/busybox/busybox-1.11.3/iptunnel.patch
@@ -0,0 +1,11 @@
+diff -Nurd busybox-1.11.3.orig//networking/libiproute/iptunnel.c busybox-1.11.3/networking/libiproute/iptunnel.c
+--- busybox-1.11.3.orig//networking/libiproute/iptunnel.c	2009-10-29 12:49:58.000000000 +0100
++++ busybox-1.11.3/networking/libiproute/iptunnel.c	2009-10-29 12:50:33.000000000 +0100
+@@ -21,6 +21,7 @@
+ #ifndef __constant_htons
+ #define __constant_htons htons
+ #endif
++#include <asm/byteorder.h>
+ #include <linux/if_tunnel.h>
+ 
+ #include "ip_common.h"  /* #include "libbb.h" is inside */
diff --git a/recipes/busybox/busybox.inc b/recipes/busybox/busybox.inc
index 0ff65a4..753b402 100644
--- a/recipes/busybox/busybox.inc
+++ b/recipes/busybox/busybox.inc
@@ -11,7 +11,7 @@ LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
 
-INC_PR = "r22"
+INC_PR = "r23"
 
 SRC_URI = "\
   http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
diff --git a/recipes/busybox/busybox_1.11.3.bb b/recipes/busybox/busybox_1.11.3.bb
index 293608b..0ec753f 100644
--- a/recipes/busybox/busybox_1.11.3.bb
+++ b/recipes/busybox/busybox_1.11.3.bb
@@ -7,6 +7,7 @@ SRC_URI = "\
   file://udhcpscript.patch;patch=1 \
   file://B921600.patch;patch=1 \
   file://fdisk_lineedit_segfault.patch;patch=1 \
+  file://iptunnel.patch;patch=1 \
   file://busybox-appletlib-dependency.patch;patch=1 \
   file://busybox-cron \
   file://busybox-httpd \