diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2009-11-04 11:48:39 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2009-11-04 11:48:39 +0000 |
| commit | 4b5a2ca27aeadda74fc48931e2a0e66ddb4ced5b (patch) | |
| tree | b88a6875af3ddbc7c61d90e3302f21e1221214f8 /recipes/busybox | |
| parent | 6ccc0b7bd8208c36ed7f581c0f9e45df7e686468 (diff) | |
| parent | 2f0ed0594046903fb8033852e05a0de6b1f02914 (diff) | |
Merge branch 'org.openembedded.dev' of git+ssh://git@git.openembedded.org/openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/busybox')
| -rw-r--r-- | recipes/busybox/busybox-1.11.3/iptunnel.patch | 11 | ||||
| -rw-r--r-- | recipes/busybox/busybox.inc | 2 | ||||
| -rw-r--r-- | 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 0000000000..18734fc527 --- /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 0ff65a41bc..753b402bee 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 293608bcb3..0ec753f951 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 \ |