Merge from bittboy/buildroot@db180c0

package/vde2/0001-no-cxx.patch

@@ -0,0 +1,22 @@
+configure: do not test for CXX, it's not needed
+
+There is no C++ source file, so no reason to require a C++ compiler.
+
+Reported-by: Peter Korsgaard <jacmet@uclibc.org>
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+---
+Patch sent upstream
+( not yet in archives, awaits moderator approval... :-/ )
+
+diff -durN vde2-2.3.2.orig/configure.ac vde2-2.3.2/configure.ac
+--- vde2-2.3.2.orig/configure.ac	2011-11-23 17:41:19.000000000 +0100
++++ vde2-2.3.2/configure.ac	2012-12-14 21:56:47.146319686 +0100
+@@ -11,7 +11,6 @@
+ AC_CONFIG_LIBOBJ_DIR(src/common)
+ 
+ # Checks for programs.
+-AC_PROG_CXX
+ AC_PROG_CC
+ AC_PROG_INSTALL
+ AC_PROG_LN_S

package/vde2/0002-fstp-Add-static-to-inline-functions.patch

@@ -0,0 +1,44 @@
+From 67bc8443ac7e8144a78d84dee30a5cac3b5c99a4 Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Sun, 27 Aug 2017 23:56:05 +0200
+Subject: [PATCH] fstp: Add static to inline functions
+
+From [1]
+"This is needed to avoid a link error where the inline functions appear
+missing at link time.
+From c99 standard inline function should either be declared static or
+have an extern instance in a c file for linking.
+This fix is necessary to build with gcc 7; for some reason it was not
+trigerred before."
+
+[1] https://git.buildroot.net/buildroot/commit/?id=21133ada326c87627f7bdee4493d8086587c3cca
+
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ src/vde_switch/fstp.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/vde_switch/fstp.c b/src/vde_switch/fstp.c
+index aab7324..b1e7ee8 100644
+--- a/src/vde_switch/fstp.c
++++ b/src/vde_switch/fstp.c
+@@ -30,14 +30,14 @@ static int numports;
+ #ifdef FSTP
+ #include <fstp.h>
+ /*********************** sending macro used by FSTP & Core ******************/
+-void inline ltonstring(unsigned long l,unsigned char *s) {
++static void inline ltonstring(unsigned long l,unsigned char *s) {
+ 	s[3]=l; l>>=8;
+ 	s[2]=l; l>>=8;
+ 	s[1]=l; l>>=8;
+ 	s[0]=l;
+ }
+ 
+-unsigned long inline nstringtol(unsigned char *s) {
++static unsigned long inline nstringtol(unsigned char *s) {
+ 	return (s[0]<<24)+(s[1]<<16)+(s[2]<<8)+s[3];
+ }
+ 
+-- 
+2.9.5
+

package/vde2/Config.in

@@ -0,0 +1,14 @@
+config BR2_PACKAGE_VDE2
+	bool "vde2"
+	depends on BR2_USE_MMU # fork()
+	depends on !BR2_STATIC_LIBS # dlopen()
+	help
+	  VDE is an ethernet compliant virtual network that can be
+	  spawned over a set of physical computers over the Internet.
+	  VDE is part of the virtualsquare project.
+
+	  http://vde.sourceforge.net/
+
+comment "vde2 needs a toolchain w/ dynamic library"
+	depends on BR2_USE_MMU
+	depends on BR2_STATIC_LIBS

package/vde2/vde2.hash

@@ -0,0 +1,5 @@
+# Locally computed:
+sha256  cbea9b7e03097f87a6b5e98b07890d2275848f1fe4b9fcda77b8994148bc9542  vde2-2.3.2.tar.bz2
+sha256  fb295d0c24b8ef4b39017ac68e772e8e6e839612ce10da12b9f48d1e8e512e2e  COPYING
+sha256  5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a  COPYING.libvdeplug
+sha256  d5ac74315b2d2f9c53f5839e311484f4646a9401b68d02d36f3dab386352e74d  COPYING.slirpvde

package/vde2/vde2.mk

@@ -0,0 +1,52 @@
+################################################################################
+#
+# vde2
+#
+################################################################################
+
+VDE2_VERSION = 2.3.2
+VDE2_SOURCE = vde2-$(VDE2_VERSION).tar.bz2
+VDE2_SITE = http://downloads.sourceforge.net/project/vde/vde2/$(VDE2_VERSION)
+VDE2_LICENSE = GPL-2.0+, LGPL-2.1+, BSD-3-Clause
+VDE2_LICENSE_FILES = COPYING COPYING.libvdeplug COPYING.slirpvde
+VDE2_INSTALL_STAGING = YES
+
+# We touch configure.ac, so we need to autoreconf
+VDE2_AUTORECONF = YES
+
+# Reasons for enabling/disabling stuff:
+# - tuntap is enabled in the hope we're using a recent-enough toolchain
+#   that does have if_tun.h (virtually everything these days)
+# - kvde_switch is disabled because it requires a patched kernel
+# - cryptcab is disabled to not depend on openSSL
+# - python is disabled to not depend on Python
+# - pcap is disabled to not depend on libpcap
+# - profiling is disabled because we do not want to debug/profile
+#
+# Note: disabled features can be added with corresponding dependencies
+#       in future commits.
+VDE2_CONF_OPTS = \
+	--disable-cryptcab \
+	--disable-experimental \
+	--disable-kernel-switch \
+	--disable-pcap \
+	--disable-profile \
+	--disable-python \
+	--enable-tuntap
+
+# Package does not build in parallel due to improper make rules
+VDE2_MAKE = $(MAKE1)
+
+HOST_VDE2_CONF_OPTS = \
+	--disable-cryptcab \
+	--disable-experimental \
+	--disable-kernel-switch \
+	--disable-pcap \
+	--disable-profile \
+	--disable-python \
+	--enable-tuntap
+
+HOST_VDE2_MAKE = $(MAKE1)
+
+$(eval $(autotools-package))
+$(eval $(host-autotools-package))