[oe-commits] Ben Shelton : openvpn: bypass check for /sbin/ip on the host

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: 6aee5729848d48f57fdab9c6aafc61f86ad86135
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=6aee5729848d48f57fdab9c6aafc61f86ad86135

Author: Ben Shelton <ben.shelton at ni.com>
Date:   Wed Oct 29 09:39:07 2014 -0500

openvpn: bypass check for /sbin/ip on the host

In the commit 'openvpn: use default iproute2 path', the configure flag
to explicitly set the iproute2 path was removed, since busybox now
provides the 'ip' applet at the default path.  However, setting this
flag is necessary to bypass the configure-time check for /sbin/ip on the
host, which will otherwise fail if iproute2 is not installed on the
host.  Add back the flag (pointing to the correct path), and add a
comment to describe why this is necessary.

Signed-off-by: Ben Shelton <ben.shelton at ni.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-networking/recipes-support/openvpn/openvpn_2.3.4.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-networking/recipes-support/openvpn/openvpn_2.3.4.bb b/meta-networking/recipes-support/openvpn/openvpn_2.3.4.bb
index 53801cb..1fb722a 100644
--- a/meta-networking/recipes-support/openvpn/openvpn_2.3.4.bb
+++ b/meta-networking/recipes-support/openvpn/openvpn_2.3.4.bb
@@ -19,6 +19,9 @@ CFLAGS += "-fno-inline"
 EXTRA_OECONF += "--enable-password-save --enable-iproute2"
 EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'pam', '', '--disable-plugin-auth-pam', d)}"
 
+# Explicitly specify IPROUTE to bypass the configure-time check for /sbin/ip on the host.
+EXTRA_OECONF += "IPROUTE=/sbin/ip"
+
 do_install_append() {
     install -d ${D}/${sysconfdir}/init.d
     install -d ${D}/${sysconfdir}/openvpn