NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/vde2: bump to version 2.3.3

Browse Source 
- Switch to github to get latest release
- Drop first and second patches (already in version)
- Drop third patch (not needed anymore)
- Drop BSD-3-Clause and COPYING.slirpvde (slirpvde removed with
  eda0a1bc1d
  14e1c9e06f)
- python removed with
  2c57c25075
- kernel switch removed with
  b196ecd5b7
- parallel build has been fixed with
  7dd9ed46d5
- openssl has been replaced by wolfssl with
  8599321526

https://github.com/virtualsquare/vde-2/releases/tag/v2.3.3

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine 2023-11-05 19:22:55 +01:00 committed by Thomas Petazzoni
parent 718a800828
commit d47fa52df5
7 changed files with 8 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.checkpackageignore
View File

@ -1416,9 +1416,6 @@ package/vboot-utils/0004-Disable-static-futility.patch Upstream
package/vboot-utils/0005-include-sys-sysmacros.h-for-major.patch Upstream
package/vboot-utils/0006-Update-for-openssl-1.1.patch Upstream
package/vboot-utils/0007-Make-vboot_version-extern-in-header.patch Upstream
package/vde2/0001-no-cxx.patch Upstream
package/vde2/0002-fstp-Add-static-to-inline-functions.patch Upstream
package/vde2/0003-vde_l3-Add-static-to-inline-functions.patch Upstream
package/vdr/0001-getloadavg.patch Upstream
package/vlc/0001-Disable-building-of-statically-linked-vlc-binary.patch Upstream
package/vlc/0002-automake-add-subdir-objects-option.patch Upstream

22
package/vde2/0001-no-cxx.patch
View File

@ -1,22 +0,0 @@
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

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

@ -1,44 +0,0 @@
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

37
package/vde2/0003-vde_l3-Add-static-to-inline-functions.patch
View File

@ -1,37 +0,0 @@
vde_l3: Add static to inline functions
Add static to inline functions to avoid the following build failure
with BR2_OPTIMIZE_0:
/home/autobuild/autobuild/instance-11/output-1/host/lib/gcc/mips64-buildroot-linux-uclibc/10.3.0/../../../../mips64-buildroot-linux-uclibc/bin/ld: vde_l3.o: in function `ip_output_ready':
vde_l3.c:(.text+0xb30): undefined reference to `iphead'
Fixes:
- http://autobuild.buildroot.org/results/5eeefcdac0b8974a424a885fdc2e82f7cb4b617d
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
diff -Nura vde2-2.3.2.orig/src/vde_l3/vde_l3.c vde2-2.3.2/src/vde_l3/vde_l3.c
--- vde2-2.3.2.orig/src/vde_l3/vde_l3.c 2022-04-21 11:05:17.393452698 +0200
+++ vde2-2.3.2/src/vde_l3/vde_l3.c 2022-04-21 11:10:36.509804404 +0200
@@ -100,17 +100,17 @@
};
-inline struct vde_ethernet_header *ethhead(struct vde_buff *vdb)
+static inline struct vde_ethernet_header *ethhead(struct vde_buff *vdb)
{
return (struct vde_ethernet_header*)(vdb->data);
}
-inline struct iphdr *iphead(struct vde_buff *vdb)
+static inline struct iphdr *iphead(struct vde_buff *vdb)
{
return (struct iphdr*)(vdb->data + 14);
}
-inline void *payload(struct vde_buff *vdb)
+static inline void *payload(struct vde_buff *vdb)
{
return (uint8_t*)(vdb->data + 14 + sizeof(struct iphdr));
}

2
package/vde2/Config.in
View File

@ -7,7 +7,7 @@ config BR2_PACKAGE_VDE2
spawned over a set of physical computers over the Internet.
VDE is part of the virtualsquare project.
http://vde.sourceforge.net/
https://github.com/virtualsquare/vde-2/
comment "vde2 needs a toolchain w/ dynamic library"
depends on BR2_USE_MMU

3
package/vde2/vde2.hash
View File

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

24
package/vde2/vde2.mk
View File

@ -4,24 +4,21 @@
#
################################################################################
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_VERSION = 2.3.3
VDE2_SITE = $(call github,virtualsquare,vde-2,v$(VDE2_VERSION))
VDE2_LICENSE = GPL-2.0+, LGPL-2.1+
VDE2_LICENSE_FILES = COPYING COPYING.libvdeplug
VDE2_CPE_ID_VENDOR = vde_project
VDE2_CPE_ID_PRODUCT = vde
VDE2_INSTALL_STAGING = YES
# We touch configure.ac, so we need to autoreconf
# From git
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
# - cryptcab is disabled to not depend on wolfssl
# - pcap is disabled to not depend on libpcap
# - profiling is disabled because we do not want to debug/profile
#
@ -30,25 +27,16 @@ VDE2_AUTORECONF = YES
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))