From b259626b391917dffa7af122343d5f56566eeced Mon Sep 17 00:00:00 2001 From: cronyx <xcronyx@gmail.com> Date: Tue, 13 Dec 2022 17:49:51 +0300 Subject: [PATCH] add wg to ingenic, zt version up (#591) --- br-ext-chip-ingenic/board/t21/kernel/t10.generic.config | 2 +- br-ext-chip-ingenic/board/t21/kernel/t20.generic.config | 2 +- br-ext-chip-ingenic/board/t21/kernel/t21.generic.config | 2 +- br-ext-chip-ingenic/board/t31/kernel/t30.generic.config | 2 +- br-ext-chip-ingenic/board/t31/kernel/t31.generic.config | 2 +- br-ext-chip-ingenic/configs/t10_lite_defconfig | 4 ++-- br-ext-chip-ingenic/configs/t20_lite_defconfig | 4 ++-- br-ext-chip-ingenic/configs/t21_lite_defconfig | 4 ++-- br-ext-chip-ingenic/configs/t30_lite_defconfig | 4 ++-- br-ext-chip-ingenic/configs/t31_lite_defconfig | 4 ++-- br-ext-chip-ingenic/configs/t31_ultimate_defconfig | 4 ++-- general/package/zerotier-one/zerotier-one.mk | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/br-ext-chip-ingenic/board/t21/kernel/t10.generic.config b/br-ext-chip-ingenic/board/t21/kernel/t10.generic.config index 738bc07d..b4e5dbfb 100644 --- a/br-ext-chip-ingenic/board/t21/kernel/t10.generic.config +++ b/br-ext-chip-ingenic/board/t21/kernel/t10.generic.config @@ -437,7 +437,7 @@ CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y # CONFIG_IP_PNP_BOOTP is not set # CONFIG_IP_PNP_RARP is not set -# CONFIG_NET_IPIP is not set +CONFIG_NET_IPIP=y # CONFIG_NET_IPGRE_DEMUX is not set # CONFIG_NET_IP_TUNNEL is not set # CONFIG_IP_MROUTE is not set diff --git a/br-ext-chip-ingenic/board/t21/kernel/t20.generic.config b/br-ext-chip-ingenic/board/t21/kernel/t20.generic.config index ecf2e092..c89bdab5 100644 --- a/br-ext-chip-ingenic/board/t21/kernel/t20.generic.config +++ b/br-ext-chip-ingenic/board/t21/kernel/t20.generic.config @@ -440,7 +440,7 @@ CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y # CONFIG_IP_PNP_BOOTP is not set # CONFIG_IP_PNP_RARP is not set -# CONFIG_NET_IPIP is not set +CONFIG_NET_IPIP=y # CONFIG_NET_IPGRE_DEMUX is not set # CONFIG_NET_IP_TUNNEL is not set # CONFIG_IP_MROUTE is not set diff --git a/br-ext-chip-ingenic/board/t21/kernel/t21.generic.config b/br-ext-chip-ingenic/board/t21/kernel/t21.generic.config index 46a5a4fd..35e0336b 100644 --- a/br-ext-chip-ingenic/board/t21/kernel/t21.generic.config +++ b/br-ext-chip-ingenic/board/t21/kernel/t21.generic.config @@ -439,7 +439,7 @@ CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y # CONFIG_IP_PNP_BOOTP is not set # CONFIG_IP_PNP_RARP is not set -# CONFIG_NET_IPIP is not set +CONFIG_NET_IPIP=y # CONFIG_NET_IPGRE_DEMUX is not set # CONFIG_NET_IP_TUNNEL is not set # CONFIG_IP_MROUTE is not set diff --git a/br-ext-chip-ingenic/board/t31/kernel/t30.generic.config b/br-ext-chip-ingenic/board/t31/kernel/t30.generic.config index b6692d55..43cbe0a0 100644 --- a/br-ext-chip-ingenic/board/t31/kernel/t30.generic.config +++ b/br-ext-chip-ingenic/board/t31/kernel/t30.generic.config @@ -438,7 +438,7 @@ CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y # CONFIG_IP_PNP_BOOTP is not set # CONFIG_IP_PNP_RARP is not set -# CONFIG_NET_IPIP is not set +CONFIG_NET_IPIP=y # CONFIG_NET_IPGRE_DEMUX is not set # CONFIG_NET_IP_TUNNEL is not set # CONFIG_IP_MROUTE is not set diff --git a/br-ext-chip-ingenic/board/t31/kernel/t31.generic.config b/br-ext-chip-ingenic/board/t31/kernel/t31.generic.config index 5e8ad05d..c4c9148c 100644 --- a/br-ext-chip-ingenic/board/t31/kernel/t31.generic.config +++ b/br-ext-chip-ingenic/board/t31/kernel/t31.generic.config @@ -440,7 +440,7 @@ CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y # CONFIG_IP_PNP_BOOTP is not set # CONFIG_IP_PNP_RARP is not set -# CONFIG_NET_IPIP is not set +CONFIG_NET_IPIP=y # CONFIG_NET_IPGRE_DEMUX is not set # CONFIG_NET_IP_TUNNEL is not set # CONFIG_IP_MROUTE is not set diff --git a/br-ext-chip-ingenic/configs/t10_lite_defconfig b/br-ext-chip-ingenic/configs/t10_lite_defconfig index 2dcc4604..92184990 100644 --- a/br-ext-chip-ingenic/configs/t10_lite_defconfig +++ b/br-ext-chip-ingenic/configs/t10_lite_defconfig @@ -98,8 +98,8 @@ BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MT7601U=y # BR2_PACKAGE_RTL8188EU is not set # WIREGUARD -# BR2_PACKAGE_WIREGUARD_LINUX_COMPAT is not set -# BR2_PACKAGE_WIREGUARD_TOOLS is not set +BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y +BR2_PACKAGE_WIREGUARD_TOOLS=y # DEBUG BR2_PACKAGE_HOST_GDB=y diff --git a/br-ext-chip-ingenic/configs/t20_lite_defconfig b/br-ext-chip-ingenic/configs/t20_lite_defconfig index ced7baf1..fc60d917 100644 --- a/br-ext-chip-ingenic/configs/t20_lite_defconfig +++ b/br-ext-chip-ingenic/configs/t20_lite_defconfig @@ -98,8 +98,8 @@ BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MT7601U=y # BR2_PACKAGE_RTL8188EU is not set # WIREGUARD -# BR2_PACKAGE_WIREGUARD_LINUX_COMPAT is not set -# BR2_PACKAGE_WIREGUARD_TOOLS is not set +BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y +BR2_PACKAGE_WIREGUARD_TOOLS=y # DEBUG BR2_PACKAGE_HOST_GDB=y diff --git a/br-ext-chip-ingenic/configs/t21_lite_defconfig b/br-ext-chip-ingenic/configs/t21_lite_defconfig index 5896abfc..e98997dd 100644 --- a/br-ext-chip-ingenic/configs/t21_lite_defconfig +++ b/br-ext-chip-ingenic/configs/t21_lite_defconfig @@ -98,8 +98,8 @@ BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MT7601U=y # BR2_PACKAGE_RTL8188EU is not set # WIREGUARD -# BR2_PACKAGE_WIREGUARD_LINUX_COMPAT is not set -# BR2_PACKAGE_WIREGUARD_TOOLS is not set +BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y +BR2_PACKAGE_WIREGUARD_TOOLS=y # DEBUG BR2_PACKAGE_HOST_GDB=y diff --git a/br-ext-chip-ingenic/configs/t30_lite_defconfig b/br-ext-chip-ingenic/configs/t30_lite_defconfig index 2414363a..51e8f38e 100644 --- a/br-ext-chip-ingenic/configs/t30_lite_defconfig +++ b/br-ext-chip-ingenic/configs/t30_lite_defconfig @@ -98,8 +98,8 @@ BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MT7601U=y # BR2_PACKAGE_RTL8188EU is not set # WIREGUARD -# BR2_PACKAGE_WIREGUARD_LINUX_COMPAT is not set -# BR2_PACKAGE_WIREGUARD_TOOLS is not set +BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y +BR2_PACKAGE_WIREGUARD_TOOLS=y # DEBUG BR2_PACKAGE_HOST_GDB=y diff --git a/br-ext-chip-ingenic/configs/t31_lite_defconfig b/br-ext-chip-ingenic/configs/t31_lite_defconfig index 6a7cf126..538a909f 100644 --- a/br-ext-chip-ingenic/configs/t31_lite_defconfig +++ b/br-ext-chip-ingenic/configs/t31_lite_defconfig @@ -98,8 +98,8 @@ BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MT7601U=y # BR2_PACKAGE_RTL8188EU is not set # WIREGUARD -# BR2_PACKAGE_WIREGUARD_LINUX_COMPAT is not set -# BR2_PACKAGE_WIREGUARD_TOOLS is not set +BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y +BR2_PACKAGE_WIREGUARD_TOOLS=y # DEBUG BR2_PACKAGE_HOST_GDB=y diff --git a/br-ext-chip-ingenic/configs/t31_ultimate_defconfig b/br-ext-chip-ingenic/configs/t31_ultimate_defconfig index 28dfd8b1..691572b1 100644 --- a/br-ext-chip-ingenic/configs/t31_ultimate_defconfig +++ b/br-ext-chip-ingenic/configs/t31_ultimate_defconfig @@ -100,8 +100,8 @@ BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MT7601U=y # BR2_PACKAGE_RTL8188EU is not set # WIREGUARD -# BR2_PACKAGE_WIREGUARD_LINUX_COMPAT is not set -# BR2_PACKAGE_WIREGUARD_TOOLS is not set +BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y +BR2_PACKAGE_WIREGUARD_TOOLS=y # ZEROTIER BR2_PACKAGE_ZEROTIER_ONE=y diff --git a/general/package/zerotier-one/zerotier-one.mk b/general/package/zerotier-one/zerotier-one.mk index 3b97538f..8ee6c2eb 100644 --- a/general/package/zerotier-one/zerotier-one.mk +++ b/general/package/zerotier-one/zerotier-one.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZEROTIER_ONE_VERSION = 1.10.1 +ZEROTIER_ONE_VERSION = 1.10.2 ZEROTIER_ONE_SITE = $(call github,zerotier,ZeroTierOne,$(ZEROTIER_ONE_VERSION)) ZEROTIER_ONE_LICENSE = BUSL-1.1 ZEROTIER_ONE_LICENSE_FILES = LICENSE.txt