From: Peter Korsgaard <jacmet@uclibc.org>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] openvpn: adjust iproute2 logic
Date: Thu, 04 Apr 2013 22:51:53 +0200 [thread overview]
Message-ID: <878v4y3tp2.fsf@dell.be.48ers.dk> (raw)
In-Reply-To: <1365094499-21046-1-git-send-email-gustavo@zacarias.com.ar> (Gustavo Zacarias's message of "Thu, 4 Apr 2013 13:54:59 -0300")
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Gustavo> As reported in bug #6164 when using busybox iproute2 openvpn can fail to
Gustavo> locate the 'ip' utility.
Gustavo> This was correct until busybox 1.21.0 was released since it changed the
Gustavo> location of /bin/ip to /sbin/ip (what iproute2 proper does).
Gustavo> So adjust the ip path accordingly.
Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Gustavo> ---
Gustavo> package/openvpn/openvpn.mk | 10 +++++++---
Gustavo> 1 file changed, 7 insertions(+), 3 deletions(-)
Gustavo> diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk
Gustavo> index c911465..28f7238 100644
Gustavo> --- a/package/openvpn/openvpn.mk
Gustavo> +++ b/package/openvpn/openvpn.mk
Gustavo> @@ -17,10 +17,14 @@ OPENVPN_CONF_OPT += --enable-small --disable-plugins \
Gustavo> --disable-debug --disable-eurephia
Gustavo> endif
Gustavo> -ifeq ($(BR2_PACKAGE_IPROUTE2),y)
Gustavo> -OPENVPN_CONF_ENV += IPROUTE=/sbin/ip
Gustavo> -else
Gustavo> +# Busybox 1.21+ places the ip applet in the "correct" place
Gustavo> +# but previous versions didn't.
Gustavo> +ifneq ($(BR2_PACKAGE_IPROUTE2),y)
Gustavo> +ifneq ($(BR2_PACKAGE_BUSYBOX_VERSION_1_21_X),y)
We'll most likely forget to update this next time we bump the busybox
version, and not notice it as it's a runtime issue.
Could you invert the logic so you explicitly check for the old busybox
versions instead?
--
Bye, Peter Korsgaard
next prev parent reply other threads:[~2013-04-04 20:51 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-04 16:54 [Buildroot] [PATCH] openvpn: adjust iproute2 logic Gustavo Zacarias
2013-04-04 20:51 ` Peter Korsgaard [this message]
2013-04-04 21:33 ` Gustavo Zacarias
2013-04-07 7:43 ` Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=878v4y3tp2.fsf@dell.be.48ers.dk \
--to=jacmet@uclibc.org \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.