summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2013-04-04 11:32:53 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2013-04-07 07:43:32 (GMT)
commit1627fb54715406d6c76461d5104ee11dabbf5870 (patch)
tree7363f6b775a050af98bc6abd734b5259e28f0e7a
parentb392cb4c743cce128c2c777f3b2116d546118ec6 (diff)
downloadbuildroot-1627fb54715406d6c76461d5104ee11dabbf5870.tar.gz
buildroot-1627fb54715406d6c76461d5104ee11dabbf5870.tar.bz2
openvpn: adjust iproute2 path logic
As reported in bug #6164 when using busybox iproute2 openvpn can fail to locate the 'ip' utility. This was correct until busybox 1.21.0 was released since it changed the location of /bin/ip to /sbin/ip (what iproute2 proper does). So adjust the ip path accordingly. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/openvpn/openvpn.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk
index c911465..7a4385b 100644
--- a/package/openvpn/openvpn.mk
+++ b/package/openvpn/openvpn.mk
@@ -17,10 +17,14 @@ OPENVPN_CONF_OPT += --enable-small --disable-plugins \
--disable-debug --disable-eurephia
endif
+# Busybox 1.21+ places the ip applet in the "correct" place
+# but previous versions didn't.
ifeq ($(BR2_PACKAGE_IPROUTE2),y)
OPENVPN_CONF_ENV += IPROUTE=/sbin/ip
-else
+else ifeq ($(BR2_BUSYBOX_VERSION_1_19_X)$(BR2_BUSYBOX_VERSION_1_20_X),y)
OPENVPN_CONF_ENV += IPROUTE=/bin/ip
+else
+OPENVPN_CONF_ENV += IPROUTE=/sbin/ip
endif
ifeq ($(BR2_PACKAGE_OPENVPN_LZO),y)