From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from eddie.linux-mips.org ([148.251.95.138] helo=cvs.linux-mips.org) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1idAy6-0003jm-8U for ptxdist@pengutronix.de; Fri, 06 Dec 2019 11:36:14 +0100 Received: (from localhost user: 'ladis' uid#1021 fake: STDIN (ladis@eddie.linux-mips.org)) by eddie.linux-mips.org id S23992514AbfLFKgOFxcky (ORCPT ); Fri, 6 Dec 2019 11:36:14 +0100 Date: Fri, 6 Dec 2019 11:36:13 +0100 From: Ladislav Michl Message-ID: <20191206103613.GB2137842@lenoch> MIME-Version: 1.0 Content-Disposition: inline Subject: [ptxdist] [PATCH] openvpn: allow use of iproute2 List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: ptxdist@pengutronix.de Let OpenVPN use ip command when BUSYBOX_IP is not selected. This allows OpenVPN to be used in Busybox-less environments. Signed-off-by: Ladislav Michl --- rules/openvpn.in | 10 +++++++--- rules/openvpn.make | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/rules/openvpn.in b/rules/openvpn.in index 6958e2940..af8cf1dda 100644 --- a/rules/openvpn.in +++ b/rules/openvpn.in @@ -11,9 +11,9 @@ menuconfig OPENVPN select BRIDGE_UTILS if OPENVPN_INSTALL_SAMPLE_SCRIPTS && RUNTIME select IPROUTE2 if !BUSYBOX_IP && RUNTIME select IPROUTE2_IP if !BUSYBOX_IP && RUNTIME - select BUSYBOX_IFCONFIG if RUNTIME - select BUSYBOX_NETSTAT if RUNTIME - select BUSYBOX_ROUTE if RUNTIME + select BUSYBOX_IFCONFIG if BUSYBOX_IP && RUNTIME + select BUSYBOX_NETSTAT if BUSYBOX_IP && RUNTIME + select BUSYBOX_ROUTE if BUSYBOX_IP && RUNTIME help virtual private network daemon @@ -35,6 +35,10 @@ menuconfig OPENVPN if OPENVPN +config OPENVPN_IPROUTE2 + bool + default !BUSYBOX_IP + config OPENVPN_SMALL bool prompt "Enable smaller executable size" diff --git a/rules/openvpn.make b/rules/openvpn.make index dc05384df..0c4f99ff2 100644 --- a/rules/openvpn.make +++ b/rules/openvpn.make @@ -67,7 +67,7 @@ OPENVPN_CONF_OPT := \ --enable-port-share \ --disable-debug \ --$(call ptx/endis, PTXCONF_OPENVPN_SMALL)-small \ - --disable-iproute2 \ + --$(call ptx/endis, PTXCONF_OPENVPN_IPROUTE2)-iproute2 \ --enable-def-auth \ --enable-pf \ --disable-plugin-auth-pam \ -- 2.24.0 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de