aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/busybox
diff options
context:
space:
mode:
authorTom Rini <tom_rini@mentor.com>2011-04-06 15:51:53 -0700
committerTom Rini <tom_rini@mentor.com>2011-04-07 07:37:57 -0700
commit8280f2812a2c5e28d674e864fff62a81235356bf (patch)
treeea9402d607d09eb43176477aea9fa02d2ce13f03 /recipes/busybox
parent09401edbe07c2f59b3f10ad7ddf9e6baebc47056 (diff)
downloadopenembedded-8280f2812a2c5e28d674e864fff62a81235356bf.tar.gz
busybox: Add a patch to fix the location of iptunnel
Signed-off-by: Tom Rini <tom_rini@mentor.com>
Diffstat (limited to 'recipes/busybox')
-rw-r--r--recipes/busybox/busybox-1.18.4/fix-iptunnel-location.patch15
-rw-r--r--recipes/busybox/busybox_1.18.4.bb5
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 0000000000..2034fea305
--- /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 c6da996bbd..0a62d335dc 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"