Merge pull request #27 from coolsnowwolf/master

Pull
DeakeyTan · Jan 17, 2021 · 2efc7e8 · 2efc7e8
2 parents d1e0dcc + faf254a
commit 2efc7e8
Show file tree

Hide file tree

Showing 96 changed files with 1,339 additions and 381 deletions.
diff --git a/include/kernel-version.mk b/include/kernel-version.mk
@@ -8,11 +8,11 @@ endif
 
 LINUX_VERSION-4.14 = .195
 LINUX_VERSION-4.19 = .138
-LINUX_VERSION-5.4 = .84
+LINUX_VERSION-5.4 = .86
 
 LINUX_KERNEL_HASH-4.14.195 = 394f28798670240baacd9e2cce521fbd79f8da5e1fc191695b0e11381445a021
 LINUX_KERNEL_HASH-4.19.138 = d15c27d05f6c527269b75b30cc72972748e55720e7e00ad8abbaa4fe3b1d5e02
-LINUX_KERNEL_HASH-5.4.84 = 0985fcf6cdcebceca63cb70abab66d12e75fac61014a796ce71272b33f831515
+LINUX_KERNEL_HASH-5.4.86 = eb36b5fc6ef7b953acba0a3e62d872e0330c4d34b38d58f5714493a4fe3b0e8b
 
 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
 sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))

diff --git a/include/target.mk b/include/target.mk
@@ -62,7 +62,7 @@ endif
 DEFAULT_PACKAGES += $(DEFAULT_PACKAGES.$(DEVICE_TYPE))
 
 filter_packages = $(filter-out -% $(patsubst -%,%,$(filter -%,$(1))),$(1))
-extra_packages = $(if $(filter wpad-mini wpad-basic wpad-basic-wolfssl wpad nas,$(1)),iwinfo)
+extra_packages = $(if $(filter wpad wpad-% nas,$(1)),iwinfo)
 
 define ProfileDefault
   NAME:=
@@ -229,7 +229,9 @@ ifeq ($(DUMP),1)
     .PRECIOUS: $(TMP_CONFIG)
 
     ifdef KERNEL_TESTING_PATCHVER
-      FEATURES += testing-kernel
+      ifneq ($(KERNEL_TESTING_PATCHVER),$(KERNEL_PATCHVER))
+        FEATURES += testing-kernel
+      endif
     endif
     ifneq ($(CONFIG_OF),)
       FEATURES += dt

diff --git a/package/boot/uboot-envtools/Makefile b/package/boot/uboot-envtools/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=uboot-envtools
 PKG_DISTNAME:=u-boot
 PKG_VERSION:=2020.04
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 PKG_SOURCE:=$(PKG_DISTNAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:= \

diff --git a/package/boot/uboot-envtools/files/ath79 b/package/boot/uboot-envtools/files/ath79
@@ -24,9 +24,12 @@ arduino,yun|\
 buffalo,bhr-4grv2|\
 devolo,magic-2-wifi|\
 engenius,eap300-v2|\
+engenius,ecb1200|\
 engenius,ecb1750|\
+engenius,ecb350-v1|\
 engenius,enh202-v1|\
 engenius,ens202ext-v1|\
+engenius,enstationac-v1|\
 etactica,eg200|\
 glinet,gl-ar750s-nor|\
 glinet,gl-ar750s-nor-nand|\
@@ -79,6 +82,10 @@ netgear,wndr4300tn|\
 netgear,wndr4300sw)
 	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x40000" "0x20000"
 	;;
+plasmacloud,pa300|\
+plasmacloud,pa300e)
+	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x40000" "0x40000"
+	;;
 qihoo,c301)
 	ubootenv_add_uci_config "/dev/mtd9" "0x0" "0x10000" "0x10000"
 	;;

diff --git a/package/boot/uboot-kirkwood/Makefile b/package/boot/uboot-kirkwood/Makefile
@@ -59,6 +59,11 @@ define U-Boot/l-50
   BUILD_DEVICES:=checkpoint_l-50
 endef
 
+define U-Boot/nas220
+  NAME:=Seagate Blackarmor NAS220
+  BUILD_DEVICES:=seagate_blackarmor-nas220
+endef
+
 define U-Boot/nsa310
   NAME:=Zyxel NSA310
   BUILD_DEVICES:=zyxel_nsa310b
@@ -95,6 +100,7 @@ UBOOT_TARGETS := \
 	ib62x0 ib62x0_second_stage \
 	iconnect iconnect_second_stage \
 	l-50 \
+	nas220 \
 	nsa310 \
 	nsa310s \
 	nsa325 \

diff --git a/package/boot/uboot-kirkwood/patches/201-blackarmor-nas220.patch b/package/boot/uboot-kirkwood/patches/201-blackarmor-nas220.patch
@@ -0,0 +1,29 @@
+--- a/include/configs/nas220.h
++++ b/include/configs/nas220.h
+@@ -54,17 +54,22 @@
+ /*
+  * Default environment variables
+  */
+-#define CONFIG_BOOTCOMMAND ""
++#define CONFIG_BOOTCOMMAND \
++	"ubi part ubi; " \
++	"ubi read 0x800000 kernel; " \
++	"bootm 0x800000"
+
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+ 	"bootargs=console=ttyS0,115200\0" \
+ 	"mtdparts=mtdparts=orion_nand:0xa0000@0x0(uboot),"\
+ 	"0x010000@0xa0000(env),"\
+-	"0x500000@0xc0000(uimage),"\
+-	"0x1a40000@0x5c0000(rootfs)\0" \
++	"0x1e80000@0xc0000(ubi)\0"\
+ 	"mtdids=nand0=orion_nand\0"\
+ 	"autostart=no\0"\
+-	"autoload=no\0"
++	"autoload=no\0"\
++	"ipaddr=10.4.50.165\0"\
++	"serverip=10.4.50.5\0"\
++	"bootdelay=3"
+
+ /*
+  * Ethernet Driver configuration
diff --git a/package/boot/uboot-tegra/Makefile b/package/boot/uboot-tegra/Makefile
@@ -6,10 +6,10 @@
 #
 include $(TOPDIR)/rules.mk
 
-PKG_VERSION := 2019.04
+PKG_VERSION := 2020.04
 PKG_RELEASE := 1
 
-PKG_HASH := 76b7772d156b3ddd7644c8a1736081e55b78828537ff714065d21dbade229bef
+PKG_HASH := fe732aaf037d9cc3c0909bad8362af366ae964bbdac6913a34081ff4ad565372
 
 PKG_MAINTAINER := Tomasz Maciej Nowak <tmn505@gmail.com>
 

diff --git a/package/kernel/linux/files/sysctl-br-netfilter.conf b/package/kernel/linux/files/sysctl-br-netfilter.conf
@@ -2,6 +2,6 @@
 # /etc/sysctl.conf can be used to customize sysctl settings
 
 # disable bridge firewalling by default
-net.bridge.bridge-nf-call-arptables=1
-net.bridge.bridge-nf-call-ip6tables=1
-net.bridge.bridge-nf-call-iptables=1
+net.bridge.bridge-nf-call-arptables=0
+net.bridge.bridge-nf-call-ip6tables=0
+net.bridge.bridge-nf-call-iptables=0
diff --git a/package/kernel/linux/modules/iio.mk b/package/kernel/linux/modules/iio.mk
@@ -446,6 +446,56 @@ endef
 $(eval $(call KernelPackage,iio-tsl4531))
 
 
+define KernelPackage/iio-fxas21002c
+  SUBMENU:=$(IIO_MENU)
+  TITLE:=Freescale FXAS21002C 3-axis gyro driver
+  DEPENDS:=+kmod-iio-core +kmod-regmap-core +kmod-industrialio-triggered-buffer
+  KCONFIG:= CONFIG_FXAS21002C
+  FILES:=$(LINUX_DIR)/drivers/iio/gyro/fxas21002c_core.ko
+  AUTOLOAD:=$(call AutoLoad,56,fxas21002c)
+endef
+
+define KernelPackage/iio-fxas21002c/description
+ Support for Freescale FXAS21002C 3-axis gyro.
+endef
+
+$(eval $(call KernelPackage,iio-fxas21002c))
+
+
+define KernelPackage/iio-fxas21002c-i2c
+  SUBMENU:=$(IIO_MENU)
+  TITLE:=Freescale FXAS21002C 3-axis gyro driver (I2C)
+  DEPENDS:=+kmod-iio-fxas21002c +kmod-i2c-core +kmod-regmap-i2c
+  KCONFIG:= CONFIG_FXAS21002C_I2C
+  FILES:=$(LINUX_DIR)/drivers/iio/gyro/fxas21002c_i2c.ko
+  AUTOLOAD:=$(call AutoLoad,56,fxas21002c_i2c)
+endef
+
+define KernelPackage/iio-fxas21002c-i2c/description
+ Support for Freescale FXAS21002C 3-axis gyro
+ connected via I2C.
+endef
+
+
+$(eval $(call KernelPackage,iio-fxas21002c-i2c))
+
+define KernelPackage/iio-fxas21002c-spi
+  SUBMENU:=$(IIO_MENU)
+  DEPENDS:=+kmod-iio-fxas21002c +kmod-regmap-spi
+  TITLE:=Freescale FXAS21002C 3-axis gyro driver (SPI)
+  KCONFIG:= CONFIG_FXAS21002C_SPI
+  FILES:=$(LINUX_DIR)/drivers/iio/gyro/fxas21002c_spi.ko
+  AUTOLOAD:=$(call AutoLoad,56,fxas21002c_spi)
+endef
+
+define KernelPackage/iio-fxas21002c-spi/description
+ Support for Freescale FXAS21002C 3-axis gyro
+ connected via SPI.
+endef
+
+$(eval $(call KernelPackage,iio-fxas21002c-spi))
+
+
 define KernelPackage/iio-fxos8700
   SUBMENU:=$(IIO_MENU)
   TITLE:=Freescale FXOS8700 3-axis accelerometer driver

diff --git a/package/kernel/linux/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk
@@ -1168,3 +1168,15 @@ define KernelPackage/nft-fib
 endef
 
 $(eval $(call KernelPackage,nft-fib))
+
+
+define KernelPackage/nft-queue
+  SUBMENU:=$(NF_MENU)
+  TITLE:=Netfilter nf_tables queue support
+  DEPENDS:=+kmod-nft-core +kmod-nfnetlink-queue
+  FILES:=$(foreach mod,$(NFT_QUEUE-m),$(LINUX_DIR)/net/$(mod).ko)
+  AUTOLOAD:=$(call AutoProbe,$(notdir $(NFT_QUEUE-m)))
+  KCONFIG:=$(KCONFIG_NFT_QUEUE)
+endef
+
+$(eval $(call KernelPackage,nft-queue))
diff --git a/package/lean/UnblockNeteaseMusicGo/Makefile b/package/lean/UnblockNeteaseMusicGo/Makefile
@@ -63,7 +63,7 @@ define Build/Compile
 	$(eval GO_PKG_BUILD_PKG:=$(GO_PKG))
 	$(call GoPackage/Build/Configure)
 	$(call GoPackage/Build/Compile)
-	$(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/UnblockNeteaseMusic
+	$(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/UnblockNeteaseMusic || true
 	chmod +wx $(GO_PKG_BUILD_BIN_DIR)/UnblockNeteaseMusic
 endef
 

diff --git a/package/lean/autocore/Makefile b/package/lean/autocore/Makefile
@@ -9,16 +9,16 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=autocore
 PKG_VERSION:=1
-PKG_RELEASE:=35
+PKG_RELEASE:=36
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/autocore-arm
   TITLE:=Arm auto core loadbalance script.
   MAINTAINER:=CN_SZTL
-  DEPENDS:=@(TARGET_bcm27xx||TARGET_bcm53xx||TARGET_mvebu||TARGET_ipq40xx||TARGET_ipq806x||TARGET_rockchip) \
-    +TARGET_bcm53xx:nvram \
-    +TARGET_ipq40xx:lm-sensors
+  DEPENDS:=@(TARGET_bcm27xx||TARGET_bcm53xx||TARGET_ipq40xx||TARGET_ipq806x||TARGET_mvebu||TARGET_rockchip) \
+    +TARGET_bcm27xx:bcm27xx-userland +TARGET_bcm53xx:nvram \
+    +(TARGET_ipq40xx||TARGET_ipq806x):lm-sensors
   VARIANT:=arm
 endef
 

diff --git a/package/lean/autocore/files/arm/sbin/cpuinfo b/package/lean/autocore/files/arm/sbin/cpuinfo
@@ -4,7 +4,9 @@ cpu_arch="$(cat "/proc/cpuinfo" | grep "model name" | sed -n "1p" | awk -F ': '
 [ -z "${cpu_arch}" ] && cpu_arch="ARMv8 Processor"
 cpu_cores="$(cat "/proc/cpuinfo" | grep "processor" | wc -l)"
 
-if grep -q "bcm53xx" "/etc/openwrt_release"; then
+if grep -q "bcm27xx" "/etc/openwrt_release"; then
+	cpu_freq="$(vcgencmd get_config arm_freq | awk -F '=' '{print $2}')Mhz"
+elif grep -q "bcm53xx" "/etc/openwrt_release"; then
 	cpu_freq="$(nvram get clkfreq | awk -F ',' '{print $1}')MHz"
 elif grep -q "mvebu" "/etc/openwrt_release"; then
 	cpu_freq="$(cat "/proc/cpuinfo" | grep "BogoMIPS" | sed -n "1p" | awk -F ': ' '{print $2}')MHz"

diff --git a/package/lean/ddns-scripts_aliyun/update_aliyun_com.sh b/package/lean/ddns-scripts_aliyun/update_aliyun_com.sh
@@ -17,6 +17,7 @@
 [ -z "$password" ] && write_log 14 "配置错误！保存阿里云API访问密钥的'密码'不能为空"
 
 # 检查外部调用工具
+WGET_SSL='wget'
 [ -n "$WGET_SSL" ] || write_log 13 "使用阿里云API需要 GNU Wget 支持，请先安装"
 command -v sed >/dev/null 2>&1 || write_log 13 "使用阿里云API需要 sed 支持，请先安装"
 command -v openssl >/dev/null 2>&1 || write_log 13 "使用阿里云API需要 openssl-util 支持，请先安装"

diff --git a/package/lean/ddns-scripts_dnspod/update_dnspod_cn.sh b/package/lean/ddns-scripts_dnspod/update_dnspod_cn.sh
@@ -5,6 +5,7 @@
 [ -z "$password" ] && write_log 14 "Configuration error! [Password] cannot be empty"
 
 #检查外部调用工具
+WGET_SSL='wget'
 [ -n "$WGET_SSL" ] || write_log 13 "GNU Wget support is required to use Alibaba Cloud API. Please install first"
 
 # 变量声明

diff --git a/package/lean/ddns-scripts_dnspod/update_dnspod_com.sh b/package/lean/ddns-scripts_dnspod/update_dnspod_com.sh
@@ -5,6 +5,7 @@
 [ -z "$password" ] && write_log 14 "Configuration error! [Password] cannot be empty"
 
 #检查外部调用工具
+WGET_SSL='wget'
 [ -n "$WGET_SSL" ] || write_log 13 "GNU Wget support is required to use Alibaba Cloud API. Please install first"
 
 # 变量声明

diff --git a/package/lean/frp/Makefile b/package/lean/frp/Makefile
@@ -55,7 +55,7 @@ define frp/templates
 	$$(INSTALL_DIR) $$(1)/usr/bin
 	$$(INSTALL_BIN) $$(PKG_INSTALL_DIR)/usr/bin/$(1) $$(1)/usr/bin/
 
-	$(STAGING_DIR_HOST)/bin/upx --lzma --best $$(1)/usr/bin/$(1)
+	$(STAGING_DIR_HOST)/bin/upx --lzma --best $$(1)/usr/bin/$(1) || true
   endef
 endef
 

diff --git a/package/lean/luci-app-ssrserver-python/luasrc/controller/ssrs.lua b/package/lean/luci-app-ssrserver-python/luasrc/controller/ssrs.lua
@@ -15,7 +15,7 @@ end
 
 function act_status()
   local e={}
-  e.running=luci.sys.call("ps | grep server.py |grep -v grep >/dev/null") == 0
+  e.running=luci.sys.call("ps -w | grep ssrs.json |grep -v grep >/dev/null") == 0
   luci.http.prepare_content("application/json")
   luci.http.write_json(e)
 end
diff --git a/package/lean/luci-app-syncdial/root/bin/genwancfg b/package/lean/luci-app-syncdial/root/bin/genwancfg
@@ -86,11 +86,11 @@ pppoe_if_add() {
 	NEW_MACADDR=$(openssl rand -hex 6 | sed 's/\(..\)/\1:/g; s/.$//')
 	#gen wan if
 	uci set network.${1}=interface
-	uci set network.${1}.ifname=${2}
+	uci set network.${1}.ifname=${3}
 	uci set network.${1}.proto=pppoe
-	uci set network.${1}.username=${3}
-	uci set network.${1}.password=${4}
-	uci set network.${1}.metric=${5}
+	uci set network.${1}.username=${4}
+	uci set network.${1}.password=${5}
+	uci set network.${1}.metric=${2}
 	uci set network.${1}.macaddr=$NEW_MACADDR
 	#gen firewall
 	uci add_list firewall.@zone[1].network=${1}
@@ -227,11 +227,11 @@ if [ "$wannum" -gt 0 ]; then
 	do
 		[ "$old_frame" -eq 0 ] && macvlan_dev_add macvlan$i $pppoe_ifname
 		if [ "$bindwan" != "" -a "$bindwan" == "1" ]; then
-			pppoe_if_add vwan$i $pppoe_ifname $pppoe_user $pppoe_password $((40+$i))
+			pppoe_if_add vwan$i $((40+$i)) $pppoe_ifname $pppoe_user $pppoe_password 
 		else
-			pppoe_if_add vwan$i macvlan$i $pppoe_user $pppoe_password $((40+$i))
+			pppoe_if_add vwan$i $((40+$i)) macvlan$i $pppoe_user $pppoe_password 
 		fi
-		[ "$nomwan" -ne 1 ] && mwan_cfg_add vwan$i
+		[ "$nomwan" -ne 1 ] && mwan_cfg_add vwan$i $((40+$i))
 	done
 else
 	[ "$nomwan" -ne 1 ] && mwan_cfg_add $wanselect
@@ -261,11 +261,11 @@ fi
 		do
 			[ "$old_frame" -eq 0 ] && macvlan_dev_add macvlan$(($wannum+$i)) $pppoe_ifname2
 			if [ "$bindwan2" != "" -a "$bindwan2" == "1" ]; then
-				pppoe_if_add vwan$(($wannum+$i)) $pppoe_ifname2 $pppoe_user2 $pppoe_password2 $((60+$i))
+				pppoe_if_add vwan$(($wannum+$i)) $((60+$i)) $pppoe_ifname2 $pppoe_user2 $pppoe_password2 
 			else
-				pppoe_if_add vwan$(($wannum+$i)) macvlan$(($wannum+$i)) $pppoe_user2 $pppoe_password2 $((60+$i))
+				pppoe_if_add vwan$(($wannum+$i)) $((60+$i)) macvlan$(($wannum+$i)) $pppoe_user2 $pppoe_password2 
 			fi
-			[ "$nomwan" -ne 1 ] && mwan_cfg_add vwan$(($wannum+$i))
+			[ "$nomwan" -ne 1 ] && mwan_cfg_add vwan$(($wannum+$i)) $((60+$i)) 
 		done
 	else
 		[ "$nomwan" -ne 1 ] && mwan_cfg_add $wanselect2