[oe-commits] Tom Rini : busybox: Add a patch to fix the location of iptunnel

[git version control]

Module: openembedded.git
Branch: master
Commit: 8280f2812a2c5e28d674e864fff62a81235356bf
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=8280f2812a2c5e28d674e864fff62a81235356bf

Author: Tom Rini <tom_rini at mentor.com>
Date:   Wed Apr  6 15:51:53 2011 -0700

busybox: Add a patch to fix the location of iptunnel

Signed-off-by: Tom Rini <tom_rini at mentor.com>

---

 .../busybox-1.18.4/fix-iptunnel-location.patch     |   15 +++++++++++++++
 recipes/busybox/busybox_1.18.4.bb                  |    5 ++++-
 2 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/recipes/busybox/busybox-1.18.4/fix-iptunnel-location.patch b/recipes/busybox/busybox-1.18.4/fix-iptunnel-location.patch
new file mode 100644
index 0000000..2034fea
--- /dev/null
+++ b/recipes/busybox/busybox-1.18.4/fix-iptunnel-location.patch
@@ -0,0 +1,15 @@
+The iptunnel applet belongs in /sbin not /bin to match other systems
+as well as the full version from net-tools.
+Index: busybox-1.18.4/include/applets.src.h
+===================================================================
+--- busybox-1.18.4.orig/include/applets.src.h
++++ busybox-1.18.4/include/applets.src.h
+@@ -249,7 +249,7 @@ IF_IPCS(APPLET(ipcs, _BB_DIR_USR_BIN, _B
+ IF_IPLINK(APPLET(iplink, _BB_DIR_BIN, _BB_SUID_DROP))
+ IF_IPROUTE(APPLET(iproute, _BB_DIR_BIN, _BB_SUID_DROP))
+ IF_IPRULE(APPLET(iprule, _BB_DIR_BIN, _BB_SUID_DROP))
+-IF_IPTUNNEL(APPLET(iptunnel, _BB_DIR_BIN, _BB_SUID_DROP))
++IF_IPTUNNEL(APPLET(iptunnel, _BB_DIR_SBIN, _BB_SUID_DROP))
+ IF_KBD_MODE(APPLET(kbd_mode, _BB_DIR_USR_BIN, _BB_SUID_DROP))
+ IF_KILL(APPLET(kill, _BB_DIR_BIN, _BB_SUID_DROP))
+ IF_KILLALL(APPLET_ODDNAME(killall, kill, _BB_DIR_USR_BIN, _BB_SUID_DROP, killall))
diff --git a/recipes/busybox/busybox_1.18.4.bb b/recipes/busybox/busybox_1.18.4.bb
index c6da996..0a62d33 100644
--- a/recipes/busybox/busybox_1.18.4.bb
+++ b/recipes/busybox/busybox_1.18.4.bb
@@ -1,5 +1,8 @@
 require busybox_1.1x.inc
-PR = "${INC_PR}.0"
+
+SRC_URI += "file://fix-iptunnel-location.patch"
+
+PR = "${INC_PR}.1"
 
 SRC_URI[md5sum] = "b03c5b46ced732679e525a920a1a62f5"
 SRC_URI[sha256sum] = "4d24d37bd6f1bd153e8cf9a984ec2f32f18464f73ca535e2cc2e8be9694097fa"