up openmptcprouter sync

patches/bbr2.patch

@@ -0,0 +1,27 @@
+--- a/package/kernel/linux/modules/netsupport.mk	2020-11-22 17:39:14.462349527 +0100
++++ b/package/kernel/linux/modules/netsupport.mk	2020-11-22 17:41:37.719620332 +0100
+@@ -948,6 +948,24 @@
+ 
+ $(eval $(call KernelPackage,tcp-bbr))
+ 
++define KernelPackage/tcp-bbr2
++  SUBMENU:=$(NETWORK_SUPPORT_MENU)
++  TITLE:=BBRv2 TCP congestion control
++  KCONFIG:= \
++	CONFIG_TCP_CONG_ADVANCED=y \
++	CONFIG_TCP_CONG_BBR2
++  FILES:=$(LINUX_DIR)/net/ipv4/tcp_bbr2.ko
++  AUTOLOAD:=$(call AutoLoad,74,tcp_bbr2)
++endef
++
++define KernelPackage/tcp-bbr2/description
++ Kernel module for BBRv2 (Bottleneck Bandwidth and RTT) TCP congestion
++ control. It requires the fq ("Fair Queue") pacing packet scheduler.
++ For kernel 4.13+, TCP internal pacing is implemented as fallback.
++endef
++
++$(eval $(call KernelPackage,tcp-bbr2))
++
+ define KernelPackage/tcp-nanqinlang
+   SUBMENU:=$(NETWORK_SUPPORT_MENU)
+   TITLE:=BBR NANQINLANG TCP congestion control

patches/check-rsync.patch

@@ -0,0 +1,14 @@
+diff --git a/include/prereq-build.mk b/include/prereq-build.mk
+index e7314b253b58..5045fabdfbde 100644
+--- a/include/prereq-build.mk
++++ b/include/prereq-build.mk
+@@ -170,9 +170,6 @@ $(eval $(call SetupHostCommand,git,Please install Git (git-core) >= 1.7.12.2, \
+ $(eval $(call SetupHostCommand,file,Please install the 'file' package, \
+ 	file --version 2>&1 | grep file))
+ 
+-$(eval $(call SetupHostCommand,rsync,Please install 'rsync', \
+-	rsync --version </dev/null))
+-
+ $(STAGING_DIR_HOST)/bin/mkhash: $(SCRIPT_DIR)/mkhash.c
+ 	mkdir -p $(dir $@)
+ 	$(CC) -O2 -I$(TOPDIR)/tools/include -o $@ $<

patches/download-ipv4.patch

@@ -0,0 +1,13 @@
+--- a/scripts/download.pl	2020-04-12 21:41:19.548645048 +0200
++++ b/scripts/download.pl	2020-04-12 21:41:28.752479609 +0200
+@@ -82,8 +82,8 @@
+ 	}
+ 
+ 	return $have_curl
+-		? (qw(curl -f --connect-timeout 20 --retry 5 --location --insecure), shellwords($ENV{CURL_OPTIONS} || ''), $url)
+-		: (qw(wget --tries=5 --timeout=20 --no-check-certificate --output-document=-), shellwords($ENV{WGET_OPTIONS} || ''), $url)
++		? (qw(curl -4 -f --connect-timeout 20 --retry 5 --location --insecure), shellwords($ENV{CURL_OPTIONS} || ''), $url)
++		: (qw(wget -4 --tries=5 --timeout=20 --no-check-certificate --output-document=-), shellwords($ENV{WGET_OPTIONS} || ''), $url)
+ 	;
+ }
+ 

patches/gtime.patch

@@ -0,0 +1,10 @@
+--- a/include/subdir.mk	2018-06-29 15:42:35.249190676 +0200
++++ b/include/b/include/subdir.mk	2018-06-29 15:42:42.373119326 +0200
+@@ -43,7 +43,6 @@
+ 	 $(if $(BUILD_LOG), \
+ 		set -o pipefail; \
+ 		mkdir -p $(BUILD_LOG_DIR)/$(1)$(if $(4),/$(4));) \
+-	env time -f "time: $(1)$(if $(4),/$(4))/$(if $(3),$(3)-)$(2)\#%U\#%S\#%e" -- \
+ 	$$(SUBMAKE) $(subdir_make_opts) $(if $(3),$(3)-)$(2) \
+ 		$(if $(BUILD_LOG),SILENT= 2>&1 | tee $(BUILD_LOG_DIR)/$(1)$(if $(4),/$(4))/$(if $(3),$(3)-)$(2).txt)
+ 

patches/images.patch

@@ -0,0 +1,42 @@
+--- a/config/Config-images.in.orig	2019-05-28 14:40:45.246749741 +0200
++++ b/config/Config-images.in	2019-05-28 14:41:14.866378695 +0200
+@@ -251,6 +251,13 @@
+ 		select TARGET_IMAGES_PAD
+ 		select PACKAGE_kmod-e1000
+ 
++	config VHDX_IMAGES
++		bool "Build Hyper-V image files (VHDX)"
++		depends on TARGET_x86
++		select GRUB_IMAGES
++		select TARGET_IMAGES_PAD
++		select PACKAGE_kmod-e1000
++
+ 	config TARGET_IMAGES_PAD
+ 		bool "Pad images to filesystem size (for JFFS2)"
+ 		depends on GRUB_IMAGES
+--- a/target/linux/x86/image/Makefile.orig	2019-06-03 14:32:39.094356089 +0200
++++ b/target/linux/x86/image/Makefile	2019-06-03 19:04:23.875965073 +0200
+@@ -143,6 +143,15 @@
+   endef
+ endif
+ 
++ifneq ($(CONFIG_VHDX_IMAGES),)
++    define Image/Build/vhdx
++	rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vhdx || true
++	qemu-img convert -f raw -O vhdx \
++		$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
++		$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vhdx
++  endef
++endif
++
+ define Image/Build/gzip
+ 	gzip -f9n $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img
+ 	gzip -f9n $(BIN_DIR)/$(IMG_PREFIX)-rootfs-$(1).img
+@@ -175,6 +184,7 @@
+ 	$(call Image/Build/grub2,$(1))
+ 	$(call Image/Build/vdi,$(1))
+ 	$(call Image/Build/vmdk,$(1))
++	$(call Image/Build/vhdx,$(1))
+ 	$(CP) $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-rootfs-$(1).img
+   else
+ 	$(CP) $(KDIR)/root.iso $(BIN_DIR)/$(IMG_PREFIX).iso

patches/ipt-nat6.patch

@@ -0,0 +1,14 @@
+--- a/package/kernel/linux/modules/netfilter.mk	2020-03-20 15:41:58.620893747 +0100
++++ b/package/kernel/linux/modules/netfilter.mk	2020-03-20 15:45:34.389015301 +0100
+@@ -483,8 +483,10 @@
+ define KernelPackage/ipt-nat6
+   TITLE:=IPv6 NAT targets
+   DEPENDS:=@IPV6
+   KCONFIG:=$(KCONFIG_IPT_NAT6)
+-  FILES:=$(foreach mod,$(IPT_NAT6-m),$(LINUX_DIR)/net/$(mod).ko)
++  FILES:= \
++	$(LINUX_DIR)/net/ipv6/netfilter/ip6t_NPT.ko \
++	$(LINUX_DIR)/net/ipv6/netfilter/ip6table_nat.ko
+   AUTOLOAD:=$(call AutoLoad,43,$(notdir $(IPT_NAT6-m)))
+   $(call AddDepends/ipt,+kmod-nf-nat6)
+   $(call AddDepends/ipt,+kmod-ipt-conntrack)

patches/luci-occitan.patch

@@ -0,0 +1,10 @@
+--- a/feeds/luci/luci.mk	2020-10-13 09:58:19.887513368 +0200
++++ b/feeds/luci/luci.mk	2020-10-13 09:04:51.724277184 +0200
+@@ -34,6 +34,7 @@
+ LUCI_LANG.ms=Bahasa Melayu (Malay)
+ LUCI_LANG.nb_NO=Norsk (Norwegian)
+ LUCI_LANG.nl=Nederlands (Dutch)
++LUCI_LANG.oc=Occitan
+ LUCI_LANG.pl=Polski (Polish)
+ LUCI_LANG.pt_BR=Português do Brasil (Brazilian Portuguese)
+ LUCI_LANG.pt=Português (Portuguese)

patches/nanqinlang.patch

@@ -0,0 +1,28 @@
+--- a/package/kernel/linux/modules/netsupport.mk	2019-12-18 18:31:28.865626571 +0100
++++ b/package/kernel/linux/modules/netsupport.mk	2019-12-18 18:33:31.175524777 +0100
+@@ -962,6 +962,25 @@
+ 
+ $(eval $(call KernelPackage,tcp-bbr))
+ 
++define KernelPackage/tcp-nanqinlang
++  SUBMENU:=$(NETWORK_SUPPORT_MENU)
++  TITLE:=BBR NANQINLANG TCP congestion control
++  DEPENDS:=+LINUX_4_9:kmod-sched
++  KCONFIG:= \
++	CONFIG_TCP_CONG_ADVANCED=y \
++	CONFIG_TCP_CONG_NANQINLANG
++  FILES:=$(LINUX_DIR)/net/ipv4/tcp_nanqinlang.ko
++  AUTOLOAD:=$(call AutoLoad,74,tcp_nanqinlang)
++endef
++
++define KernelPackage/tcp-nanqinlang/description
++ Kernel module for BBR (Bottleneck Bandwidth and RTT) TCP congestion
++ control. It requires the fq ("Fair Queue") pacing packet scheduler.
++ For kernel 4.13+, TCP internal pacing is implemented as fallback.
++endef
++
++$(eval $(call KernelPackage,tcp-nanqinlang))
++
+ 
+ define KernelPackage/ax25
+   SUBMENU:=$(NETWORK_SUPPORT_MENU)

patches/nocheck.patch

@@ -0,0 +1,10 @@
+--- a/include/package-ipkg.mk.1	2019-06-02 10:10:48.814882668 +0200
++++ b/include/package-ipkg.mk	2019-06-02 10:08:20.372736726 +0200
+@@ -79,7 +79,6 @@
+ 		if [ -f "$(PKG_INFO_DIR)/$(1).missing" ]; then \
+ 			echo "Package $(1) is missing dependencies for the following libraries:" >&2; \
+ 			cat "$(PKG_INFO_DIR)/$(1).missing" >&2; \
+-			false; \
+ 		fi; \
+ 	)
+   endef

patches/package-too-long.patch

@@ -0,0 +1,11 @@
+--- a/package/Makefile	2020-04-04 15:52:15.706831084 +0200
++++ b/package/Makefile	2020-04-04 15:53:54.645052663 +0200
+@@ -66,7 +66,7 @@
+ 	rm -rf $(TARGET_DIR) $(TARGET_DIR_ORIG)
+ 	mkdir -p $(TARGET_DIR)/tmp
+ 	$(call opkg,$(TARGET_DIR)) install \
+-		$(call opkg_package_files,$(foreach pkg,$(shell cat $(PACKAGE_INSTALL_FILES) 2>/dev/null),$(pkg)$(call GetABISuffix,$(pkg))))
++	$(subst $(TOPDIR)/,,$(call opkg_package_files,$(foreach pkg,$(shell cat $(PACKAGE_INSTALL_FILES) 2>/dev/null),$(pkg)$(call GetABISuffix,$(pkg)))))
+ 	@for file in $(PACKAGE_INSTALL_FILES); do \
+ 		[ -s $$file.flags ] || continue; \
+ 		for flag in `cat $$file.flags`; do \

patches/remove_abi.patch

@@ -0,0 +1,37 @@
+--- a/package/libs/libubox/Makefile	2021-02-17 14:45:19.981073050 +0100
++++ b/package/libs/libubox/Makefile	2021-02-17 14:45:57.232466168 +0100
+@@ -73,12 +73,12 @@
+ 
+ define Package/libubox/install
+ 	$(INSTALL_DIR) $(1)/lib/
+-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libubox.so.* $(1)/lib/
++	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libubox.so $(1)/lib/
+ endef
+ 
+ define Package/libblobmsg-json/install
+ 	$(INSTALL_DIR) $(1)/lib/
+-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libblobmsg_json.so.* $(1)/lib/
++	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libblobmsg_json.so $(1)/lib/
+ endef
+ 
+ define Package/jshn/install
+@@ -89,7 +89,7 @@
+ 
+ define Package/libjson-script/install
+ 	$(INSTALL_DIR) $(1)/lib/
+-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libjson_script.so.* $(1)/lib/
++	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libjson_script.so $(1)/lib/
+ endef
+ 
+ define Package/libubox-lua/install
+--- a/package/system/ubus/Makefile	2021-02-17 15:16:34.450301703 +0100
++++ b/package/system/ubus/Makefile	2021-02-17 15:16:55.289957767 +0100
+@@ -69,7 +69,7 @@
+ 
+ define Package/libubus/install
+ 	$(INSTALL_DIR) $(1)/lib
+-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libubus.so.* $(1)/lib/
++	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libubus.so $(1)/lib/
+ endef
+ 
+ define Package/libubus-lua/install

patches/smsc75xx.patch

@@ -0,0 +1,26 @@
+Index: package/kernel/linux/modules/usb.mk
+===================================================================
+--- a/package/kernel/linux/modules/usb.mk	(revisione 42462)
++++ b/package/kernel/linux/modules/usb.mk	(copia locale)
+@@ -1091,8 +1091,21 @@
+ endef
+ 
+ $(eval $(call KernelPackage,usb-net-smsc95xx))
++
++define KernelPackage/usb-net-smsc75xx
++  TITLE:=SMSC LAN75XX based USB 2.0 Gigabit ethernet devices
++  KCONFIG:=CONFIG_USB_NET_SMSC75XX
++  FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/smsc75xx.ko
++  AUTOLOAD:=$(call AutoProbe,smsc75xx)
++  $(call AddDepends/usb-net, +kmod-lib-crc16)
++endef
+ 
++define KernelPackage/usb-net-smsc75xx/description
++ Kernel module for SMSC LAN75XX based devices
++endef
+ 
++$(eval $(call KernelPackage,usb-net-smsc75xx))
++
+ define KernelPackage/usb-net-dm9601-ether
+   TITLE:=Support for DM9601 ethernet connections
+   KCONFIG:=CONFIG_USB_NET_DM9601