diff --git a/Makefile b/Makefile index c6e6a8e6..fbe8bbbd 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ ROOT_DIR := $(CURDIR) -BR_VER := 2020.02 +BR_VER := 2020.02.12 BR_DIR := $(ROOT_DIR)/buildroot-$(BR_VER) BR_EXT_DIR := $(ROOT_DIR)/br-ext-chip-$(PLATFORM) SCRIPTS_DIR := $(ROOT_DIR)/scripts diff --git a/br-ext-chip-hisilicon/Config.in b/br-ext-chip-hisilicon/Config.in index 386fc96c..92ab43de 100644 --- a/br-ext-chip-hisilicon/Config.in +++ b/br-ext-chip-hisilicon/Config.in @@ -7,3 +7,4 @@ source "$BR2_EXTERNAL_HISILICON_PATH/package/ipctool/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/libevent-mini/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/majestic/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/node-exporter/Config.in" +source "$BR2_EXTERNAL_HISILICON_PATH/package/vtund-lite/Config.in" diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_openipc_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_openipc_defconfig index 27c56813..8e4ba32a 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_openipc_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_openipc_defconfig @@ -9,7 +9,7 @@ BR2_DEFAULT_KERNEL_VERSION="4.9.37" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y # Toolchain -BR2_GCC_VERSION_8_X=y +BR2_GCC_VERSION_7_X=y # BR2_TOOLCHAIN_USES_UCLIBC is not set # BR2_TOOLCHAIN_BUILDROOT_UCLIBC is not set # BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc" @@ -54,14 +54,7 @@ BR2_PACKAGE_LAME=y BR2_PACKAGE_LIBEVENT_MINI=y BR2_PACKAGE_MAJESTIC=y BR2_PACKAGE_MINI_SNMPD=y - -# Unused -# BR2_SHARED_STATIC_LIBS is not set -# BR2_PACKAGE_JPEG_TURBO is not set -# BR2_PACKAGE_MINIHTTP is not set -# BR2_PACKAGE_MXML is not set -# BR2_PACKAGE_SSHPASS is not set -# BR2_PACKAGE_RTL8188EU is not set +BR2_PACKAGE_VTUND_LITE=y # Experimental BR2_PER_PACKAGE_DIRECTORIES=y @@ -74,3 +67,12 @@ BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y # Firmware BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y + +# Unused +# BR2_SHARED_STATIC_LIBS is not set +# BR2_PACKAGE_JPEG_TURBO is not set +# BR2_PACKAGE_MINIHTTP is not set +# BR2_PACKAGE_MXML is not set +# BR2_PACKAGE_SSHPASS is not set +# BR2_PACKAGE_RTL8188EU is not set + diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_dev_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_dev_defconfig index 18a86f72..b6cc41b3 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_dev_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_dev_defconfig @@ -9,7 +9,7 @@ BR2_DEFAULT_KERNEL_VERSION="4.9.37" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y # Toolchain -BR2_GCC_VERSION_8_X=y +BR2_GCC_VERSION_7_X=y # BR2_TOOLCHAIN_USES_UCLIBC is not set # BR2_TOOLCHAIN_BUILDROOT_UCLIBC is not set # BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc" @@ -54,6 +54,7 @@ BR2_PACKAGE_LAME=y BR2_PACKAGE_LIBEVENT_MINI=y BR2_PACKAGE_MAJESTIC=y BR2_PACKAGE_MINI_SNMPD=y +BR2_PACKAGE_VTUND_LITE=y # For @widgetii BR2_TOOLCHAIN_BUILDROOT_CXX=y @@ -69,14 +70,6 @@ BR2_PACKAGE_NCURSES=y BR2_PACKAGE_NCURSES_ADDITIONAL_TERMINFO="" BR2_PACKAGE_STRACE=y -# Unused -# BR2_SHARED_STATIC_LIBS is not set -# BR2_PACKAGE_JPEG_TURBO is not set -# BR2_PACKAGE_MINIHTTP is not set -# BR2_PACKAGE_MXML is not set -# BR2_PACKAGE_SSHPASS is not set -# BR2_PACKAGE_RTL8188EU is not set - # Experimental BR2_PER_PACKAGE_DIRECTORIES=y BR2_PACKAGE_WIRELESS_TOOLS=y @@ -99,3 +92,11 @@ BR2_PACKAGE_HAS_LUAINTERPRETER=y BR2_PACKAGE_LUASOCKET=y BR2_PACKAGE_LUA_CJSON=y BR2_PACKAGE_NODE_EXPORTER=y + +# Unused +# BR2_SHARED_STATIC_LIBS is not set +# BR2_PACKAGE_JPEG_TURBO is not set +# BR2_PACKAGE_MINIHTTP is not set +# BR2_PACKAGE_MXML is not set +# BR2_PACKAGE_SSHPASS is not set +# BR2_PACKAGE_RTL8188EU is not set diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_openipc_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_openipc_defconfig index 3b3d2c0a..f8b9be6d 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_openipc_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_openipc_defconfig @@ -9,7 +9,7 @@ BR2_DEFAULT_KERNEL_VERSION="4.9.37" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y # Toolchain -BR2_GCC_VERSION_8_X=y +BR2_GCC_VERSION_7_X=y # BR2_TOOLCHAIN_USES_UCLIBC is not set # BR2_TOOLCHAIN_BUILDROOT_UCLIBC is not set # BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc" @@ -54,14 +54,7 @@ BR2_PACKAGE_LAME=y BR2_PACKAGE_LIBEVENT_MINI=y BR2_PACKAGE_MAJESTIC=y BR2_PACKAGE_MINI_SNMPD=y - -# Unused -# BR2_SHARED_STATIC_LIBS is not set -# BR2_PACKAGE_JPEG_TURBO is not set -# BR2_PACKAGE_MINIHTTP is not set -# BR2_PACKAGE_MXML is not set -# BR2_PACKAGE_SSHPASS is not set -# BR2_PACKAGE_RTL8188EU is not set +BR2_PACKAGE_VTUND_LITE=y # Experimental BR2_PER_PACKAGE_DIRECTORIES=y @@ -74,3 +67,11 @@ BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y # Firmware BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y + +# Unused +# BR2_SHARED_STATIC_LIBS is not set +# BR2_PACKAGE_JPEG_TURBO is not set +# BR2_PACKAGE_MINIHTTP is not set +# BR2_PACKAGE_MXML is not set +# BR2_PACKAGE_SSHPASS is not set +# BR2_PACKAGE_RTL8188EU is not set diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev300_openipc_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev300_openipc_defconfig index fcb1aca3..e1eb65e4 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev300_openipc_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev300_openipc_defconfig @@ -9,7 +9,7 @@ BR2_DEFAULT_KERNEL_VERSION="4.9.37" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y # Toolchain -BR2_GCC_VERSION_8_X=y +BR2_GCC_VERSION_7_X=y # BR2_TOOLCHAIN_USES_UCLIBC is not set # BR2_TOOLCHAIN_BUILDROOT_UCLIBC is not set # BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc" @@ -54,14 +54,7 @@ BR2_PACKAGE_LAME=y BR2_PACKAGE_LIBEVENT_MINI=y BR2_PACKAGE_MAJESTIC=y BR2_PACKAGE_MINI_SNMPD=y - -# Unused -# BR2_SHARED_STATIC_LIBS is not set -# BR2_PACKAGE_JPEG_TURBO is not set -# BR2_PACKAGE_MINIHTTP is not set -# BR2_PACKAGE_MXML is not set -# BR2_PACKAGE_SSHPASS is not set -# BR2_PACKAGE_RTL8188EU is not set +BR2_PACKAGE_VTUND_LITE=y # Experimental BR2_PER_PACKAGE_DIRECTORIES=y @@ -74,3 +67,11 @@ BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y # Firmware BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y + +# Unused +# BR2_SHARED_STATIC_LIBS is not set +# BR2_PACKAGE_JPEG_TURBO is not set +# BR2_PACKAGE_MINIHTTP is not set +# BR2_PACKAGE_MXML is not set +# BR2_PACKAGE_SSHPASS is not set +# BR2_PACKAGE_RTL8188EU is not set diff --git a/br-ext-chip-hisilicon/external.mk b/br-ext-chip-hisilicon/external.mk index b439404b..35aaab54 100644 --- a/br-ext-chip-hisilicon/external.mk +++ b/br-ext-chip-hisilicon/external.mk @@ -7,3 +7,4 @@ include $(BR2_EXTERNAL_HISILICON_PATH)/package/ipctool/ipctool.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/libevent-mini/libevent-mini.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/majestic/majestic.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/node-exporter/node-exporter.mk +include $(BR2_EXTERNAL_HISILICON_PATH)/package/vtund-lite/vtund-lite.mk diff --git a/br-ext-chip-sigmastar/Config.in b/br-ext-chip-sigmastar/Config.in index 91f06f74..718b2180 100644 --- a/br-ext-chip-sigmastar/Config.in +++ b/br-ext-chip-sigmastar/Config.in @@ -5,3 +5,4 @@ source "$BR2_EXTERNAL_SIGMASTAR_PATH/package/fwprintenv-ng/Config.in" source "$BR2_EXTERNAL_SIGMASTAR_PATH/package/ipctool/Config.in" source "$BR2_EXTERNAL_SIGMASTAR_PATH/package/libevent-mini/Config.in" source "$BR2_EXTERNAL_SIGMASTAR_PATH/package/node-exporter/Config.in" +source "$BR2_EXTERNAL_SIGMASTAR_PATH/package/vtund-lite/Config.in" diff --git a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_dev_defconfig b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_dev_defconfig index a1838a3e..5b334ac1 100644 --- a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_dev_defconfig +++ b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_dev_defconfig @@ -9,7 +9,7 @@ BR2_DEFAULT_KERNEL_VERSION="4.9.84" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y # Toolchain -BR2_GCC_VERSION_8_X=y +BR2_GCC_VERSION_7_X=y # BR2_TOOLCHAIN_USES_UCLIBC is not set # BR2_TOOLCHAIN_BUILDROOT_UCLIBC is not set # BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc" diff --git a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_openipc_defconfig b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_openipc_defconfig index b3cc48c5..6d7a41f2 100644 --- a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_openipc_defconfig +++ b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_openipc_defconfig @@ -9,7 +9,7 @@ BR2_DEFAULT_KERNEL_VERSION="4.9.84" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y # Toolchain -BR2_GCC_VERSION_8_X=y +BR2_GCC_VERSION_7_X=y # BR2_TOOLCHAIN_USES_UCLIBC is not set # BR2_TOOLCHAIN_BUILDROOT_UCLIBC is not set # BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc" diff --git a/br-ext-chip-sigmastar/external.mk b/br-ext-chip-sigmastar/external.mk index 7ca06eea..74c178a4 100644 --- a/br-ext-chip-sigmastar/external.mk +++ b/br-ext-chip-sigmastar/external.mk @@ -5,4 +5,5 @@ include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/fwprintenv-ng/fwprintenv-ng.mk include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/ipctool/ipctool.mk include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/libevent-mini/libevent-mini.mk include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/node-exporter/node-exporter.mk +include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/vtund-lite/vtund-lite.mk diff --git a/br-ext-chip-xiongmai/Config.in b/br-ext-chip-xiongmai/Config.in index 25eb0533..8334540b 100644 --- a/br-ext-chip-xiongmai/Config.in +++ b/br-ext-chip-xiongmai/Config.in @@ -7,3 +7,4 @@ source "$BR2_EXTERNAL_XIONGMAI_PATH/package/ipctool/Config.in" source "$BR2_EXTERNAL_XIONGMAI_PATH/package/libevent-mini/Config.in" source "$BR2_EXTERNAL_XIONGMAI_PATH/package/majestic/Config.in" source "$BR2_EXTERNAL_XIONGMAI_PATH/package/node-exporter/Config.in" +source "$BR2_EXTERNAL_XIONGMAI_PATH/package/vtund-lite/Config.in" diff --git a/br-ext-chip-xiongmai/configs/unknown_unknown_xm510_openipc_defconfig b/br-ext-chip-xiongmai/configs/unknown_unknown_xm510_openipc_defconfig index bf27967a..6a9269a0 100644 --- a/br-ext-chip-xiongmai/configs/unknown_unknown_xm510_openipc_defconfig +++ b/br-ext-chip-xiongmai/configs/unknown_unknown_xm510_openipc_defconfig @@ -7,7 +7,7 @@ BR2_DEFAULT_KERNEL_VERSION="3.0.101" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_0=y # Toolchain -BR2_GCC_VERSION_8_X=y +BR2_GCC_VERSION_7_X=y # BR2_TOOLCHAIN_USES_UCLIBC is not set # BR2_TOOLCHAIN_BUILDROOT_UCLIBC is not set # BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc" diff --git a/br-ext-chip-xiongmai/configs/unknown_unknown_xm530_openipc_defconfig b/br-ext-chip-xiongmai/configs/unknown_unknown_xm530_openipc_defconfig index 8f4a9e6f..91131d11 100644 --- a/br-ext-chip-xiongmai/configs/unknown_unknown_xm530_openipc_defconfig +++ b/br-ext-chip-xiongmai/configs/unknown_unknown_xm530_openipc_defconfig @@ -7,7 +7,7 @@ BR2_DEFAULT_KERNEL_VERSION="3.10.103" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10=y # Toolchain -BR2_GCC_VERSION_8_X=y +BR2_GCC_VERSION_7_X=y # BR2_TOOLCHAIN_USES_UCLIBC is not set # BR2_TOOLCHAIN_BUILDROOT_UCLIBC is not set # BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc" diff --git a/br-ext-chip-xiongmai/external.mk b/br-ext-chip-xiongmai/external.mk index 0c715538..bd993e01 100644 --- a/br-ext-chip-xiongmai/external.mk +++ b/br-ext-chip-xiongmai/external.mk @@ -7,4 +7,5 @@ include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/ipctool/ipctool.mk include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/libevent-mini/libevent-mini.mk include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/majestic/majestic.mk include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/node-exporter/node-exporter.mk +include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/vtund-lite/vtund-lite.mk diff --git a/general/package/vtund-lite/0001-fix-installation.patch b/general/package/vtund-lite/0001-fix-installation.patch deleted file mode 100644 index d9659fa8..00000000 --- a/general/package/vtund-lite/0001-fix-installation.patch +++ /dev/null @@ -1,44 +0,0 @@ -Makefile.in: fix installation steps - -Not sure what the reason for that patch is, but originally added by Ulf -Samuelsson , when upgrading from 2.6.x to 3.0.2. - -yann.morin.1998@free.fr: the initial commit in the Buildroot tree had the -SoB by Ulf, but it was not explicitly reproduced here in the patch; so I -added it here directly in the patch. - -Somewhat-signed-off-by: Ulf Samuelsson -Signed-off-by: "Yann E. MORIN" -diff -durN vtun-3.0.3.orig/Makefile.in vtun-3.0.3/Makefile.in ---- vtun-3.0.3.orig/Makefile.in 2012-07-09 06:55:38.000000000 +0200 -+++ vtun-3.0.3/Makefile.in 2013-02-16 23:28:47.034036869 +0100 -@@ -28,7 +28,7 @@ - LEXFLAGS = -t - - INSTALL = @INSTALL@ --INSTALL_OWNER = -o root -g 0 -+INSTALL_OWNER = - - prefix = @prefix@ - exec_prefix = @exec_prefix@ -@@ -89,16 +89,15 @@ - - install_config: - $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(ETC_DIR) -- if [ ! -f $(ETC_DIR)/vtund.conf ]; then \ -- $(INSTALL) -m 600 $(INSTALL_OWNER) vtund.conf $(DESTDIR)$(ETC_DIR); \ -- fi -+ $(INSTALL) -m 600 $(INSTALL_OWNER) vtund.conf $(DESTDIR)$(ETC_DIR); -+ $(INSTALL) -m 600 $(INSTALL_OWNER) scripts/vtund-start.conf $(DESTDIR)$(ETC_DIR); - - install: vtund install_config install_man -- $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(VAR_DIR)/run - $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(STAT_DIR) - $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(LOCK_DIR) - $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(SBIN_DIR) - $(INSTALL) -m 755 $(INSTALL_OWNER) vtund $(DESTDIR)$(SBIN_DIR) -- $(BIN_DIR)/strip $(DESTDIR)$(SBIN_DIR)/vtund -+ $(INSTALL) -m 755 -D $(INSTALL_OWNER) scripts/vtund.rc.debian \ -+ $(DESTDIR)$(ETC_DIR)/init.d/S90vtun - - # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/general/package/vtund-lite/01_vtund-3.0.2_fix_makefile.patch b/general/package/vtund-lite/01_vtund-3.0.2_fix_makefile.patch new file mode 100644 index 00000000..cd9bcf18 --- /dev/null +++ b/general/package/vtund-lite/01_vtund-3.0.2_fix_makefile.patch @@ -0,0 +1,43 @@ +--- a/Makefile.in 2008-01-08 01:35:55.000000000 +0300 ++++ b/Makefile.in 2021-05-07 22:18:22.310801557 +0300 +@@ -74,27 +74,27 @@ + + distclean: clean + rm -f $(CONFIGURE_FILES) +- rm -f `cat vtun.drivers` ++ rm -f `cat vtun.drivers` + + install_man: +- $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(MAN_DIR)/man8 +- $(INSTALL) -m 644 $(INSTALL_OWNER) vtund.8 $(DESTDIR)$(MAN_DIR)/man8 +- $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(MAN_DIR)/man5 +- $(INSTALL) -m 644 $(INSTALL_OWNER) vtund.conf.5 $(DESTDIR)$(MAN_DIR)/man5 ++ $(INSTALL) -d -m 755 $(DESTDIR)$(MAN_DIR)/man8 ++ $(INSTALL) -m 644 vtund.8 $(DESTDIR)$(MAN_DIR)/man8 ++ $(INSTALL) -d -m 755 $(DESTDIR)$(MAN_DIR)/man5 ++ $(INSTALL) -m 644 $vtund.conf.5 $(DESTDIR)$(MAN_DIR)/man5 + rm -f $(DESTDIR)$(MAN_DIR)/man8/vtun.8 + ln -s vtund.8 $(DESTDIR)$(MAN_DIR)/man8/vtun.8 + + install_config: +- $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(ETC_DIR) ++ $(INSTALL) -d -m 755 $(DESTDIR)$(ETC_DIR) + if [ ! -f $(ETC_DIR)/vtund.conf ]; then \ +- $(INSTALL) -m 600 $(INSTALL_OWNER) vtund.conf $(DESTDIR)$(ETC_DIR); \ ++ $(INSTALL) -m 600 vtund.conf $(DESTDIR)$(ETC_DIR); \ + fi + +-install: vtund install_config install_man +- $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(VAR_DIR)/run +- $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(STAT_DIR) +- $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(LOCK_DIR) +- $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(SBIN_DIR) +- $(INSTALL) -m 755 $(INSTALL_OWNER) vtund $(DESTDIR)$(SBIN_DIR) ++install: vtund ++ $(INSTALL) -d -m 755 $(DESTDIR)$(VAR_DIR)/run ++ $(INSTALL) -d -m 755 $(DESTDIR)$(STAT_DIR) ++ $(INSTALL) -d -m 755 $(DESTDIR)$(LOCK_DIR) ++ $(INSTALL) -d -m 755 $(DESTDIR)$(SBIN_DIR) ++ $(INSTALL) -m 755 vtund $(DESTDIR)$(SBIN_DIR) + + # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/general/package/vtund-lite/Config.in b/general/package/vtund-lite/Config.in index 2cae104d..9ecee2c9 100644 --- a/general/package/vtund-lite/Config.in +++ b/general/package/vtund-lite/Config.in @@ -7,4 +7,6 @@ config BR2_PACKAGE_VTUND_LITE It supports IP, PPP, SLIP, Ethernet and other tunnel types. + No LZO/SSL/ZLIB version + http://vtun.sourceforge.net/ diff --git a/general/package/vtund-lite/files/S90vtun b/general/package/vtund-lite/files/S90vtun new file mode 100644 index 00000000..5158663f --- /dev/null +++ b/general/package/vtund-lite/files/S90vtun @@ -0,0 +1,61 @@ +#! /bin/sh +# +# submitted by Morgon Kanter +# + +PATH=/bin:/usr/bin:/sbin:/usr/sbin +DAEMON=/usr/sbin/vtund +CONFFILE=/etc/vtund-start.conf +PIDPREFIX=/var/run/vtund + +test -f $DAEMON || exit 0 + +case "$1" in + start) + # find all the defined tunnels + egrep -v '^[:space:]*(#.*)?$' $CONFFILE | while true; + do + read i + # no more lines available? done, then. + if [ $? != 0 ] ; then break; fi + SARGS=`echo $i|sed -ne 's/--server--\s*/-s -P /p'`; + if [ -n "$SARGS" ]; + then + echo "Starting vtund server." + start-stop-daemon --start --exec $DAEMON --pidfile $PIDPREFIX.pid -- $SARGS; + else + # split args into host and rest + HOST=`echo $i|cut -f 1 -d " "`; + TARGET=`echo $i|cut -f 2 -d " "`; + echo "Starting vtund client $HOST to $TARGET."; + start-stop-daemon --start --exec $DAEMON --pidfile $PIDPREFIX.$HOST.pid -- $i; + + fi + done + ;; + stop) + echo "Stopping vtund."; + for i in $PIDPREFIX*; + do + start-stop-daemon --stop --pidfile $i; + rm -f $i; + done + ;; + reload|force-reload) + echo "Reloading vtund."; + for i in $PIDPREFIX*; + do + start-stop-daemon --stop --signal 1 --pidfile $i; + done + ;; + restart) + $0 stop + sleep 1; + $0 start + ;; + *) + echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2 + exit 1 + ;; +esac +exit 0 diff --git a/general/package/vtund-lite/vtund-lite.hash b/general/package/vtund-lite/vtund-lite.hash deleted file mode 100644 index a13f4bd4..00000000 --- a/general/package/vtund-lite/vtund-lite.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From https://sourceforge.net/projects/vtun/files/vtun/3.0.4/ -md5 f952c5895ae8f40235aaad9a8f41a4bd vtun-3.0.4.tar.gz -sha1 2335c21b56fadf9ce851dd7f342fb0ed4f522c47 vtun-3.0.4.tar.gz -# Locally computed: -sha256 abf8df6b15e3febeaaeae2ce24ead7105eb1537ad4ec0d830c83cbb684fd98b9 vtun-3.0.4.tar.gz diff --git a/general/package/vtund-lite/vtund-lite.mk b/general/package/vtund-lite/vtund-lite.mk index 2a409b4b..81f11b1f 100644 --- a/general/package/vtund-lite/vtund-lite.mk +++ b/general/package/vtund-lite/vtund-lite.mk @@ -4,23 +4,16 @@ # ################################################################################ -VTUND_LITE_VERSION = 3.0.4 -VTUND_LITE_SITE = http://downloads.sourceforge.net/project/vtun/vtun/$(VTUND_LITE_VERSION) -VTUND_LITE_LICENSE = GPL-2.0+ with OpenSSL exception -VTUND_LITE_LICENSE_FILES = README.OpenSSL +VTUND_LITE_VERSION = 3.0.2 +VTUND_LITE_SOURCE = vtun-$(VTUND_LITE_VERSION).tar.gz +VTUND_LITE_SITE = http://prdownloads.sourceforge.net/vtun +VTUND_LITE_LICENSE = GPL-2.0+ +VTUND_LITE_LICENSE_FILES = LICENSE VTUND_LITE_DEPENDENCIES = host-bison host-flex host-pkgconf -VTUND_LITE_AUTORECONF = YES -VTUND_LITE_CONF_OPTS = \ - --without-ssl-headers=$(STAGING_DIR)/usr/include/openssl \ - --without-lzo-headers=$(STAGING_DIR)/usr/include/lzo \ - --without-lzo-lib=$(STAGING_DIR)/usr/lib +VTUND_LITE_CONF_OPTS += --disable-lzo --disable-ssl --disable-zlib # Assumes old-style gcc inline symbol visibility rules VTUND_LITE_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu89" -# configure.in forgets to link to dependent libraries of openssl breaking static -# linking -VTUND_LITE_CONF_ENV += LIBS=`$(PKG_CONFIG_HOST_BINARY)` - $(eval $(autotools-package))