ucentral-schema: update to latest HEAD

* minor fixes to handling of boolean values

Signed-off-by: John Crispin <john@phrozen.org>

backports/0001-build-build-kernel-image-before-building-modules-pac.patch

@@ -1,7 +1,7 @@
-From 08be0915e06fb6f2b62c022099e82bb4d849a8c6 Mon Sep 17 00:00:00 2001
+From c51ac602aff1a9b0093687fe39164a3b895fd4a2 Mon Sep 17 00:00:00 2001
 From: Felix Fietkau <nbd@nbd.name>
 Date: Thu, 22 Oct 2020 10:29:34 +0200
-Subject: [PATCH 1/9] build: build kernel image before building
+Subject: [PATCH 01/27] build: build kernel image before building
  modules/packages
 
 This is needed for linux 5.10, where modules.builtin is generated from
@@ -13,10 +13,10 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk
-index e5a0ba367b..b069c1e671 100644
+index 3aa1baa761..c02e0d34ca 100644
 --- a/include/kernel-defaults.mk
 +++ b/include/kernel-defaults.mk
-@@ -113,7 +113,7 @@ endef
+@@ -115,7 +115,7 @@ endef
  
  define Kernel/CompileModules/Default
  	rm -f $(LINUX_DIR)/vmlinux $(LINUX_DIR)/System.map
@@ -25,7 +25,7 @@ index e5a0ba367b..b069c1e671 100644
  endef
  
  OBJCOPY_STRIP = -R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id
-@@ -137,7 +137,7 @@ endef
+@@ -139,7 +139,7 @@ endef
  
  define Kernel/CompileImage/Default
  	rm -f $(TARGET_DIR)/init
@@ -34,7 +34,7 @@ index e5a0ba367b..b069c1e671 100644
  	$(call Kernel/CopyImage)
  endef
  
-@@ -147,7 +147,7 @@ define Kernel/CompileImage/Initramfs
+@@ -149,7 +149,7 @@ define Kernel/CompileImage/Initramfs
  	$(CP) $(GENERIC_PLATFORM_DIR)/other-files/init $(TARGET_DIR)/init
  	$(if $(SOURCE_DATE_EPOCH),touch -hcd "@$(SOURCE_DATE_EPOCH)" $(TARGET_DIR)/init)
  	rm -rf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/usr/initramfs_data.cpio*

backports/0002-build-fix-build-with-CONFIG_STRIP_KERNEL_EXPORTS.patch

@@ -1,7 +1,7 @@
-From 6d2e2ff2778ca6360af9bf1e712d7ff276afa54b Mon Sep 17 00:00:00 2001
+From 6c50e27b166b30c0b3f7b730717ab4b7f446e4d0 Mon Sep 17 00:00:00 2001
 From: Felix Fietkau <nbd@nbd.name>
 Date: Wed, 17 Feb 2021 13:49:14 +0100
-Subject: [PATCH 2/9] build: fix build with CONFIG_STRIP_KERNEL_EXPORTS
+Subject: [PATCH 02/27] build: fix build with CONFIG_STRIP_KERNEL_EXPORTS
 
 Only use symtab.h on the final kernel link
 
@@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk
-index b069c1e671..93eed54ae1 100644
+index c02e0d34ca..f9316fc3f9 100644
 --- a/include/kernel-defaults.mk
 +++ b/include/kernel-defaults.mk
 @@ -3,7 +3,7 @@
@@ -23,7 +23,7 @@ index b069c1e671..93eed54ae1 100644
  	EXTRA_LDSFLAGS="-I$(KERNEL_BUILD_DIR) -include symtab.h"
  endif
  
-@@ -137,7 +137,7 @@ endef
+@@ -139,7 +139,7 @@ endef
  
  define Kernel/CompileImage/Default
  	rm -f $(TARGET_DIR)/init
@@ -32,7 +32,7 @@ index b069c1e671..93eed54ae1 100644
  	$(call Kernel/CopyImage)
  endef
  
-@@ -147,7 +147,7 @@ define Kernel/CompileImage/Initramfs
+@@ -149,7 +149,7 @@ define Kernel/CompileImage/Initramfs
  	$(CP) $(GENERIC_PLATFORM_DIR)/other-files/init $(TARGET_DIR)/init
  	$(if $(SOURCE_DATE_EPOCH),touch -hcd "@$(SOURCE_DATE_EPOCH)" $(TARGET_DIR)/init)
  	rm -rf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/usr/initramfs_data.cpio*

backports/0003-kernel-add-linux-5.10-support.patch

@@ -1,7 +1,7 @@
-From 0f37bb5919d96aaca7b0d06b56d37dabba87b190 Mon Sep 17 00:00:00 2001
+From 369794a62050fadc47b617acb29e19d6f536fe3f Mon Sep 17 00:00:00 2001
 From: Felix Fietkau <nbd@nbd.name>
 Date: Sat, 24 Oct 2020 21:14:16 +0200
-Subject: [PATCH 01/45] kernel: add linux 5.10 support
+Subject: [PATCH 03/27] kernel: add linux 5.10 support
 
 Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
@@ -422,7 +422,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  create mode 100644 target/linux/generic/pending-5.10/920-mangle_bootargs.patch
 
 diff --git a/include/image-commands.mk b/include/image-commands.mk
-index 51e745958e..bddbed6052 100644
+index 4d54a14ba4..2c917d613e 100644
 --- a/include/image-commands.mk
 +++ b/include/image-commands.mk
 @@ -200,11 +200,12 @@ define Build/fit
@@ -744,7 +744,7 @@ index b46fcebc08..e2bb1d0681 100644
    AUTOLOAD:=$(call AutoProbe,$(notdir $(NFT_CORE-m)))
    KCONFIG:= \
 diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
-index d050165df3..3dd20a0696 100644
+index 93f99f7cbe..4191590ba7 100644
 --- a/package/kernel/linux/modules/usb.mk
 +++ b/package/kernel/linux/modules/usb.mk
 @@ -1387,7 +1387,7 @@ define KernelPackage/usb-net-cdc-ncm
@@ -12418,10 +12418,10 @@ index 0000000000..4eb5607f17
 +# CONFIG_ZSMALLOC is not set
 +# CONFIG_ZX_TDM is not set
 diff --git a/target/linux/generic/config-5.4 b/target/linux/generic/config-5.4
-index 91dc0b0f49..d3e9325f71 100644
+index 50e627297e..da0e2e2186 100644
 --- a/target/linux/generic/config-5.4
 +++ b/target/linux/generic/config-5.4
-@@ -3273,6 +3273,7 @@ CONFIG_MTD_ROOTFS_ROOT_DEV=y
+@@ -3287,6 +3287,7 @@ CONFIG_MTD_ROOTFS_ROOT_DEV=y
  CONFIG_MTD_SPI_NOR_USE_4K_SECTORS_LIMIT=4096
  CONFIG_MTD_SPLIT=y
  # CONFIG_MTD_SPLIT_BCM_WFI_FW is not set

backports/0004-mediatek-update-to-latest-trunk-version.patch

@@ -1,7 +1,7 @@
-From 583b54e2f10ee14b5756d7035e641f7a1bb3095c Mon Sep 17 00:00:00 2001
+From 29f60bb65745d63e7d8cce273bd3f773fda251ff Mon Sep 17 00:00:00 2001
 From: Felix Fietkau <nbd@nbd.name>
 Date: Thu, 9 Apr 2020 09:53:24 +0200
-Subject: [PATCH 01/43] mediatek: update to latest trunk version
+Subject: [PATCH 04/27] mediatek: update to latest trunk version
 
 Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
@@ -101957,7 +101957,7 @@ diff --git a/target/linux/mediatek/mt7622/config-5.4 b/target/linux/mediatek/mt7
 similarity index 67%
 rename from target/linux/mediatek/mt7622/config-5.4
 rename to target/linux/mediatek/mt7622/config-5.10
-index b873bdc40c..2d7f82ce23 100644
+index 282cd0bab5..e6696bd50a 100644
 --- a/target/linux/mediatek/mt7622/config-5.4
 +++ b/target/linux/mediatek/mt7622/config-5.10
 @@ -1,59 +1,6 @@
@@ -102116,7 +102116,7 @@ index b873bdc40c..2d7f82ce23 100644
  # CONFIG_FUJITSU_ERRATUM_010001 is not set
  CONFIG_FW_LOADER_PAGED_BUF=y
  CONFIG_GENERIC_ALLOCATOR=y
-@@ -267,102 +201,19 @@ CONFIG_GLOB=y
+@@ -267,103 +201,20 @@ CONFIG_GLOB=y
  CONFIG_GPIOLIB=y
  CONFIG_GRO_CELLS=y
  CONFIG_HANDLE_DOMAIN_IRQ=y
@@ -102184,6 +102184,7 @@ index b873bdc40c..2d7f82ce23 100644
 -CONFIG_HAVE_UID16=y
 -CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
  CONFIG_HOLES_IN_ZONE=y
+ # CONFIG_HW_RANDOM_MTK is not set
  CONFIG_HZ=250
  CONFIG_HZ_250=y
 -CONFIG_I2C=y
@@ -102219,7 +102220,7 @@ index b873bdc40c..2d7f82ce23 100644
  CONFIG_IO_URING=y
  CONFIG_IRQCHIP=y
  CONFIG_IRQ_DOMAIN=y
-@@ -370,9 +221,10 @@ CONFIG_IRQ_DOMAIN_HIERARCHY=y
+@@ -371,9 +222,10 @@ CONFIG_IRQ_DOMAIN_HIERARCHY=y
  CONFIG_IRQ_FORCED_THREADING=y
  CONFIG_IRQ_TIME_ACCOUNTING=y
  CONFIG_IRQ_WORK=y
@@ -102231,7 +102232,7 @@ index b873bdc40c..2d7f82ce23 100644
  CONFIG_LOCK_DEBUGGING_SUPPORT=y
  CONFIG_LOCK_SPIN_ON_OWNER=y
  CONFIG_LZO_COMPRESS=y
-@@ -380,21 +232,25 @@ CONFIG_LZO_DECOMPRESS=y
+@@ -381,21 +233,25 @@ CONFIG_LZO_DECOMPRESS=y
  CONFIG_MAGIC_SYSRQ=y
  CONFIG_MDIO_BUS=y
  CONFIG_MDIO_DEVICE=y
@@ -102259,7 +102260,7 @@ index b873bdc40c..2d7f82ce23 100644
  CONFIG_MTD_RAW_NAND=y
  CONFIG_MTD_SPI_NAND=y
  CONFIG_MTD_SPI_NOR=y
-@@ -422,7 +278,6 @@ CONFIG_NET_DSA=y
+@@ -423,7 +279,6 @@ CONFIG_NET_DSA=y
  CONFIG_NET_DSA_MT7530=y
  CONFIG_NET_DSA_TAG_MTK=y
  CONFIG_NET_FLOW_LIMIT=y
@@ -102267,7 +102268,7 @@ index b873bdc40c..2d7f82ce23 100644
  CONFIG_NET_MEDIATEK_SOC=y
  CONFIG_NET_SWITCHDEV=y
  CONFIG_NET_VENDOR_MEDIATEK=y
-@@ -447,7 +302,6 @@ CONFIG_PARTITION_PERCPU=y
+@@ -448,7 +303,6 @@ CONFIG_PARTITION_PERCPU=y
  CONFIG_PCI=y
  CONFIG_PCIEAER=y
  CONFIG_PCIEASPM=y
@@ -102275,7 +102276,7 @@ index b873bdc40c..2d7f82ce23 100644
  # CONFIG_PCIEASPM_DEFAULT is not set
  CONFIG_PCIEASPM_PERFORMANCE=y
  # CONFIG_PCIEASPM_POWERSAVE is not set
-@@ -460,6 +314,7 @@ CONFIG_PCI_DOMAINS=y
+@@ -461,6 +315,7 @@ CONFIG_PCI_DOMAINS=y
  CONFIG_PCI_DOMAINS_GENERIC=y
  CONFIG_PCI_MSI=y
  CONFIG_PCI_MSI_IRQ_DOMAIN=y
@@ -102283,7 +102284,7 @@ index b873bdc40c..2d7f82ce23 100644
  CONFIG_PGTABLE_LEVELS=3
  CONFIG_PHYLIB=y
  CONFIG_PHYLINK=y
-@@ -477,7 +332,7 @@ CONFIG_PINCTRL_MT7622=y
+@@ -478,7 +333,7 @@ CONFIG_PINCTRL_MT7622=y
  CONFIG_PINCTRL_MT8516=y
  CONFIG_PINCTRL_MTK=y
  CONFIG_PINCTRL_MTK_MOORE=y
@@ -102292,7 +102293,7 @@ index b873bdc40c..2d7f82ce23 100644
  CONFIG_PM=y
  CONFIG_PM_CLK=y
  CONFIG_PM_GENERIC_DOMAINS=y
-@@ -487,6 +342,20 @@ CONFIG_POWER_RESET=y
+@@ -488,6 +343,20 @@ CONFIG_POWER_RESET=y
  CONFIG_POWER_RESET_SYSCON=y
  CONFIG_POWER_SUPPLY=y
  CONFIG_PRINTK_TIME=y
@@ -102313,7 +102314,7 @@ index b873bdc40c..2d7f82ce23 100644
  CONFIG_PWM=y
  CONFIG_PWM_MEDIATEK=y
  # CONFIG_PWM_MTK_DISP is not set
-@@ -499,7 +368,9 @@ CONFIG_RATIONAL=y
+@@ -500,7 +369,9 @@ CONFIG_RATIONAL=y
  CONFIG_RCU_NEED_SEGCBLIST=y
  CONFIG_RCU_STALL_COMMON=y
  CONFIG_REALTEK_PHY=y
@@ -102324,7 +102325,7 @@ index b873bdc40c..2d7f82ce23 100644
  CONFIG_REGMAP=y
  CONFIG_REGMAP_MMIO=y
  CONFIG_REGULATOR=y
-@@ -552,7 +423,6 @@ CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
+@@ -555,7 +426,6 @@ CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
  CONFIG_THERMAL_EMULATION=y
  CONFIG_THERMAL_GOV_BANG_BANG=y
  CONFIG_THERMAL_GOV_FAIR_SHARE=y
@@ -102332,7 +102333,7 @@ index b873bdc40c..2d7f82ce23 100644
  CONFIG_THERMAL_GOV_STEP_WISE=y
  CONFIG_THERMAL_GOV_USER_SPACE=y
  CONFIG_THERMAL_OF=y
-@@ -584,6 +454,9 @@ CONFIG_WATCHDOG_PRETIMEOUT_GOV_PANIC=y
+@@ -587,6 +457,9 @@ CONFIG_WATCHDOG_PRETIMEOUT_GOV_PANIC=y
  CONFIG_WATCHDOG_PRETIMEOUT_GOV_SEL=m
  CONFIG_WATCHDOG_SYSFS=y
  CONFIG_XPS=y

backports/0005-sysupgrade-nand-allow-limiting-rootfs_data-by-settin.patch

@@ -1,7 +1,7 @@
-From 0a0953b5c81a2b5b366a3f0f543db71ffc81f713 Mon Sep 17 00:00:00 2001
+From 7ed003d57f1c5273fecddabcdc7bd6845c3854a0 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Sat, 20 Feb 2021 08:36:43 +0100
-Subject: [PATCH 5/9] sysupgrade-nand: allow limiting rootfs_data by setting
+Subject: [PATCH 05/27] sysupgrade-nand: allow limiting rootfs_data by setting
  env variable
 
 Check if firmware environment variable 'rootfs_data_max' exists and is

backports/0006-uboot-mediatek-add-support-for-linksys-e8450.patch

@@ -1,7 +1,7 @@
-From eed2e31cb32b565a3ebcc3bc2e9d7dc7a9550b4b Mon Sep 17 00:00:00 2001
+From 3c6515c9db444da27192c1182fa1e9ab8ba6e2f6 Mon Sep 17 00:00:00 2001
 From: Daniel Golle <daniel@makrotopia.org>
 Date: Sat, 30 Jan 2021 13:58:16 +0000
-Subject: [PATCH 01/36] uboot-mediatek: add support for linksys e8450
+Subject: [PATCH 06/27] uboot-mediatek: add support for linksys e8450
 
 Build U-Boot for the Linksys E8450 in order to have support for UBI.
 The loader has a default environment with scripts handling the reset

backports/0007-uboot-envtools-add-defaults-for-linksys-e8450-ubi.patch

@@ -1,7 +1,7 @@
-From 7837219939ea5d8ecab21acf943a8199bea7e89a Mon Sep 17 00:00:00 2001
+From 1a9921bab861dd2c89337c3e4833c716a0474653 Mon Sep 17 00:00:00 2001
 From: Daniel Golle <daniel@makrotopia.org>
 Date: Fri, 12 Feb 2021 03:09:39 +0000
-Subject: [PATCH 7/9] uboot-envtools: add defaults for linksys-e8450-ubi
+Subject: [PATCH 07/27] uboot-envtools: add defaults for linksys-e8450-ubi
 
 Add U-Boot environment configuration for the Linksys E8450 (UBI) to
 allow access to the bootloader environment from OpenWrt via
@@ -9,17 +9,16 @@ allow access to the bootloader environment from OpenWrt via
 
 Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 ---
- package/boot/uboot-envtools/files/mediatek | 25 ++++++++++++++++++++++
- 1 file changed, 25 insertions(+)
+ package/boot/uboot-envtools/files/mediatek | 46 ++++++++++++++++++++++
+ 1 file changed, 46 insertions(+)
  create mode 100644 package/boot/uboot-envtools/files/mediatek
 
 diff --git a/package/boot/uboot-envtools/files/mediatek b/package/boot/uboot-envtools/files/mediatek
 new file mode 100644
-index 0000000000..92a04ea73d
+index 0000000000..495a837274
 --- /dev/null
 +++ b/package/boot/uboot-envtools/files/mediatek
-@@ -0,0 +1,25 @@
-+#!/bin/sh
+@@ -0,0 +1,46 @@
 +#
 +# Copyright (C) 2021 OpenWrt.org
 +#
@@ -34,10 +33,32 @@ index 0000000000..92a04ea73d
 +board=$(board_name)
 +
 +case "$board" in
-+"linksys,e8450,ubi")
++linksys,e8450-ubi)
 +	ubootenv_add_uci_config "/dev/ubi0_0" "0x0" "0x1f000" "0x1f000" "1"
 +	ubootenv_add_uci_config "/dev/ubi0_1" "0x0" "0x1f000" "0x1f000" "1"
 +	;;
++bananapi,bpi-r64)
++	. /lib/upgrade/common.sh
++	export_bootdevice
++	export_partdevice rootdev 0
++	case "$rootdev" in
++	mmc*)
++		local envdev=/dev/$(get_partition_by_name $rootdev ubootenv)
++		ubootenv_add_uci_config "$envdev" "0x0" "0x80000" "0x80000" "1"
++		ubootenv_add_uci_config "$envdev" "0x80000" "0x80000" "0x80000" "1"
++		;;
++	*)
++		ubootenv_add_uci_config "/dev/ubi0_0" "0x0" "0x1f000" "0x1f000" "1"
++		ubootenv_add_uci_config "/dev/ubi0_1" "0x0" "0x1f000" "0x1f000" "1"
++		;;
++	esac
++	;;
++buffalo,wsr-2533dhp2)
++	ubootenv_add_uci_config "/dev/mtd3" "0x0" "0x1000" "0x20000"
++	;;
++ubnt,unifi-6-lr-ubootmod)
++	ubootenv_add_uci_config "/dev/mtd2" "0x0" "0x4000" "0x10000"
++	;;
 +esac
 +
 +config_load ubootenv

backports/0009-include-set-kernel-version.mk.patch

@@ -1,7 +1,7 @@
-From 3b896a540de03ca8dfd5596881f9ec6dc15d72c9 Mon Sep 17 00:00:00 2001
+From 4ed9b7d04405d5109681643f3ceebbd25f3f28e2 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Wed, 7 Apr 2021 10:46:26 +0200
-Subject: [PATCH 01/32] include: set kernel-version.mk
+Subject: [PATCH 09/27] include: set kernel-version.mk
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -9,7 +9,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
  1 file changed, 6 insertions(+)
 
 diff --git a/include/kernel-version.mk b/include/kernel-version.mk
-index 52e5c11d75..547f57fa11 100644
+index fe81dbf603..3c109c13c8 100644
 --- a/include/kernel-version.mk
 +++ b/include/kernel-version.mk
 @@ -6,9 +6,15 @@ ifdef CONFIG_TESTING_KERNEL
@@ -18,12 +18,12 @@ index 52e5c11d75..547f57fa11 100644
  
 +LINUX_VERSION-4.4 = .60
 +LINUX_VERSION-4.14 = .193
- LINUX_VERSION-5.4 = .111
+ LINUX_VERSION-5.4 = .142
 +LINUX_VERSION-5.10 = .27
  
 +LINUX_KERNEL_HASH-4.4.60 = 2cd8df6f1ac6a5329c5a286ec9b5956215977221a1b731597ed169fff74a9659
 +LINUX_KERNEL_HASH-4.14.193 = 0b0fb41d4430e1a42738b341cbfd2f41951aa5cd02acabbd53f076119c8b9f03
- LINUX_KERNEL_HASH-5.4.111 = 21626132658dc34cb41b7aa7b80ecf83751890a71ac1a63d77aea9d488271a03
+ LINUX_KERNEL_HASH-5.4.142 = 99785728968564ba27c7e552d024b560072dcbc885540912eabb5c021e231451
 +LINUX_KERNEL_HASH-5.10.27 = d99dc9662951299c53a0a8d8c8d0a72a16ff861d20e927c0f9b14f63282d69d9
  
  remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))

backports/0010-ar71xx-forward-port-target-to-get-routerboard-suppor.patch

@@ -1,7 +1,7 @@
-From b6a89df399cae510f531473e04b5fd938b811ed7 Mon Sep 17 00:00:00 2001
+From a5f4e99a365f392feca84f29b7011fb507771f0e Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Tue, 20 Apr 2021 11:13:20 +0200
-Subject: [PATCH 02/32] ar71xx: forward port target to get routerboard support
+Subject: [PATCH 10/27] ar71xx: forward port target to get routerboard support
 
 This is only a 1 month interim until the new nand driver for ath79 is ready
 
@@ -1462,7 +1462,7 @@ index 2921cd5bca..b869ccae70 100644
  			default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_lantiq
  			default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_mpc85xx
 diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
-index 3dd20a0696..d3752c22b4 100644
+index 4191590ba7..592affe494 100644
 --- a/package/kernel/linux/modules/usb.mk
 +++ b/package/kernel/linux/modules/usb.mk
 @@ -1590,7 +1590,7 @@ $(eval $(call KernelPackage,usbip-server))

backports/0011-backport-mkits.sh.patch

@@ -1,7 +1,7 @@
-From 43f832c25bb9dee1a817370ab11531e81348f177 Mon Sep 17 00:00:00 2001
+From ad860cb413d1934332de60658d5eb8fb64d19663 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Sun, 9 May 2021 12:23:00 +0200
-Subject: [PATCH 42/43] backport: mkits.sh
+Subject: [PATCH 11/27] backport: mkits.sh
 
 969083634481c3ab5fb80509f385ef10ab45b55f
 e991c1b8a2385397fc1e657ed73878938997d951
@@ -17,10 +17,10 @@ Signed-off-by: John Crispin <john@phrozen.org>
  5 files changed, 95 insertions(+), 12 deletions(-)
 
 diff --git a/include/image-commands.mk b/include/image-commands.mk
-index bde6e030bc..f97d4363d1 100644
+index 2c917d613e..c6e8eb0293 100644
 --- a/include/image-commands.mk
 +++ b/include/image-commands.mk
-@@ -204,7 +204,7 @@ define Build/fit
+@@ -203,7 +203,7 @@ define Build/fit
  		$(if $(word 3,$(1)),-r $(IMAGE_ROOTFS) -f $(subst _,$(comma),$(DEVICE_NAME))) \
  		-a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \
  		$(if $(DEVICE_FDT_NUM),-n $(DEVICE_FDT_NUM)) \
@@ -30,7 +30,7 @@ index bde6e030bc..f97d4363d1 100644
  	PATH=$(LINUX_DIR)/scripts/dtc:$(PATH) mkimage $(if $(word 3,$(1)),-E -B 0x1000 -p 0x1000) -f $@.its $@.new
  	@mv $@.new $@
 diff --git a/include/image.mk b/include/image.mk
-index fc46012e87..7a48b789af 100644
+index b6e8ab3c84..7c2dcf0e8b 100644
 --- a/include/image.mk
 +++ b/include/image.mk
 @@ -139,7 +139,7 @@ endef

backports/0012-libubox-update-to-latest-HEAD.patch

@@ -1,29 +1,24 @@
-From 029282d8ef8e4e813817d1c7d4aeae4208bc2da5 Mon Sep 17 00:00:00 2001
+From 2af08d2e85ee946de5f53bbd0ddf239de9b78f6d Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Tue, 18 May 2021 10:46:43 +0200
-Subject: [PATCH 01/52] libubox: update to latest HEAD
+Subject: [PATCH 12/27] libubox: update to latest HEAD
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
- package/libs/libubox/Makefile | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
+ package/libs/libubox/Makefile | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/package/libs/libubox/Makefile b/package/libs/libubox/Makefile
-index 4d582eacfd..33aa73eef7 100644
+index d2c07783e1..33aa73eef7 100644
 --- a/package/libs/libubox/Makefile
 +++ b/package/libs/libubox/Makefile
-@@ -1,13 +1,13 @@
- include $(TOPDIR)/rules.mk
- 
- PKG_NAME:=libubox
--PKG_RELEASE=1
-+PKG_RELEASE=2
+@@ -5,9 +5,9 @@ PKG_RELEASE=2
  
  PKG_SOURCE_PROTO:=git
  PKG_SOURCE_URL=$(PROJECT_GIT)/project/libubox.git
--PKG_MIRROR_HASH:=97dc4eba01cf2c5d6a6d0db3747e0cdc0d95cb87e51b3115272e7d3e69a8b255
--PKG_SOURCE_DATE:=2020-12-12
--PKG_SOURCE_VERSION:=357877693ca363b12e6e7e14d345639b2440cd07
+-PKG_MIRROR_HASH:=7dd1db1e0074a9c7c722db654cce3111b3bd3cff0bfd791c4497cb0f6c22d3ca
+-PKG_SOURCE_DATE:=2021-05-16
+-PKG_SOURCE_VERSION:=b14c4688612c05c78ce984d7bde633bce8703b1e
 +PKG_MIRROR_HASH:=1cdb91ac0ee925f133ee9f70eac131a99def312fe7cf0aed44df84eb1762e30b
 +PKG_SOURCE_DATE:=2021-08-19
 +PKG_SOURCE_VERSION:=d716ac4bc4236031d4c3cc1ed362b502e20e3787

backports/0013-iw-update-to-latest-HEAD.patch

@@ -1,167 +0,0 @@
-From 0ddce2498be815e098154867d0b18293fe613f12 Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Thu, 27 May 2021 11:57:10 +0200
-Subject: [PATCH 13/13] iw: update to latest HEAD
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- package/network/utils/iw/Makefile             | 11 +++----
- .../utils/iw/patches/200-reduce_size.patch    | 30 +++++++++----------
- 2 files changed, 21 insertions(+), 20 deletions(-)
-
-diff --git a/package/network/utils/iw/Makefile b/package/network/utils/iw/Makefile
-index 6db9aaf105..8e11046189 100644
---- a/package/network/utils/iw/Makefile
-+++ b/package/network/utils/iw/Makefile
-@@ -8,12 +8,13 @@
- include $(TOPDIR)/rules.mk
- 
- PKG_NAME:=iw
--PKG_VERSION:=5.9
--PKG_RELEASE:=1
-+PKG_VERSION:=5.9-8fab0c9e
-+PKG_RELEASE:=$(AUTORELEASE)
- 
--PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
--PKG_SOURCE_URL:=@KERNEL/software/network/iw
--PKG_HASH:=293a07109aeb7e36267cf59e3ce52857e9ffae3a6666eb8ac77894b1839fe1f2
-+PKG_SOURCE_PROTO:=git
-+PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/linux/kernel/git/jberg/iw.git
-+PKG_SOURCE_VERSION:=8fab0c9ee9db217587a58efcc37421c86edcb638
-+PKG_MIRROR_HASH:=797b322bc03952f3127ae0a7da476c14ada1bbe9a9ae234a56dd6f864c568e16
- 
- PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
- PKG_LICENSE:=GPL-2.0
-diff --git a/package/network/utils/iw/patches/200-reduce_size.patch b/package/network/utils/iw/patches/200-reduce_size.patch
-index af30876012..83e11405cb 100644
---- a/package/network/utils/iw/patches/200-reduce_size.patch
-+++ b/package/network/utils/iw/patches/200-reduce_size.patch
-@@ -1,6 +1,6 @@
- --- a/event.c
- +++ b/event.c
--@@ -944,6 +944,7 @@ static int print_event(struct nl_msg *ms
-+@@ -956,6 +956,7 @@ static int print_event(struct nl_msg *ms
-  	}
-  
-  	switch (gnlh->cmd) {
-@@ -8,7 +8,7 @@
-  	case NL80211_CMD_NEW_WIPHY:
-  		printf("renamed to %s\n", nla_get_string(tb[NL80211_ATTR_WIPHY_NAME]));
-  		break;
--@@ -979,6 +980,7 @@ static int print_event(struct nl_msg *ms
-+@@ -991,6 +992,7 @@ static int print_event(struct nl_msg *ms
-  	case NL80211_CMD_SCHED_SCAN_RESULTS:
-  		printf("got scheduled scan results\n");
-  		break;
-@@ -16,7 +16,7 @@
-  	case NL80211_CMD_WIPHY_REG_CHANGE:
-  	case NL80211_CMD_REG_CHANGE:
-  		if (gnlh->cmd == NL80211_CMD_WIPHY_REG_CHANGE)
--@@ -1061,6 +1063,7 @@ static int print_event(struct nl_msg *ms
-+@@ -1073,6 +1075,7 @@ static int print_event(struct nl_msg *ms
-  		mac_addr_n2a(macbuf, nla_data(tb[NL80211_ATTR_MAC]));
-  		printf("del station %s\n", macbuf);
-  		break;
-@@ -24,7 +24,7 @@
-  	case NL80211_CMD_JOIN_IBSS:
-  		mac_addr_n2a(macbuf, nla_data(tb[NL80211_ATTR_MAC]));
-  		printf("IBSS %s joined\n", macbuf);
--@@ -1254,9 +1257,9 @@ static int print_event(struct nl_msg *ms
-+@@ -1271,9 +1274,9 @@ static int print_event(struct nl_msg *ms
-  	case NL80211_CMD_CH_SWITCH_NOTIFY:
-  		parse_ch_switch_notify(tb, gnlh->cmd);
-  		break;
-@@ -134,7 +134,7 @@
-  {
- --- a/scan.c
- +++ b/scan.c
--@@ -1297,6 +1297,9 @@ static void print_ht_op(const uint8_t ty
-+@@ -1306,6 +1306,9 @@ static void print_ht_op(const uint8_t ty
-  	printf("\t\t * secondary channel offset: %s\n",
-  		ht_secondary_offset[data[1] & 0x3]);
-  	printf("\t\t * STA channel width: %s\n", sta_chan_width[(data[1] & 0x4)>>2]);
-@@ -144,7 +144,7 @@
-  	printf("\t\t * RIFS: %d\n", (data[1] & 0x8)>>3);
-  	printf("\t\t * HT protection: %s\n", protection[data[2] & 0x3]);
-  	printf("\t\t * non-GF present: %d\n", (data[2] & 0x4) >> 2);
--@@ -1707,6 +1710,14 @@ static void print_ie(const struct ie_pri
-+@@ -1716,6 +1719,14 @@ static void print_ie(const struct ie_pri
-  
-  static const struct ie_print ieprinters[] = {
-  	[0] = { "SSID", print_ssid, 0, 32, BIT(PRINT_SCAN) | BIT(PRINT_LINK), },
-@@ -159,7 +159,7 @@
-  	[1] = { "Supported rates", print_supprates, 0, 255, BIT(PRINT_SCAN), },
-  	[3] = { "DS Parameter set", print_ds, 1, 1, BIT(PRINT_SCAN), },
-  	[5] = { "TIM", print_tim, 4, 255, BIT(PRINT_SCAN), },
--@@ -1716,26 +1727,20 @@ static const struct ie_print ieprinters[
-+@@ -1725,26 +1736,20 @@ static const struct ie_print ieprinters[
-  	[32] = { "Power constraint", print_powerconstraint, 1, 1, BIT(PRINT_SCAN), },
-  	[35] = { "TPC report", print_tpcreport, 2, 2, BIT(PRINT_SCAN), },
-  	[42] = { "ERP", print_erp, 1, 255, BIT(PRINT_SCAN), },
-@@ -187,15 +187,15 @@
-  };
-  
-  static void print_wifi_wpa(const uint8_t type, uint8_t len, const uint8_t *data,
--@@ -2279,6 +2284,7 @@ void print_ies(unsigned char *ie, int ie
-+@@ -2326,6 +2331,7 @@ void print_ies(unsigned char *ie, int ie
-  		    ieprinters[ie[0]].flags & BIT(ptype)) {
-  			print_ie(&ieprinters[ie[0]],
-  				 ie[0], ie[1], ie + 2, &ie_buffer);
- +#ifdef IW_FULL
-  		} else if (ie[0] == 221 /* vendor */) {
-  			print_vendor(ie[1], ie + 2, unknown, ptype);
-- 		} else if (unknown) {
--@@ -2288,6 +2294,7 @@ void print_ies(unsigned char *ie, int ie
-+ 		} else if (ie[0] == 255 /* extension */) {
-+@@ -2337,6 +2343,7 @@ void print_ies(unsigned char *ie, int ie
-  			for (i=0; i<ie[1]; i++)
-  				printf(" %.2x", ie[2+i]);
-  			printf("\n");
-@@ -203,7 +203,7 @@
-  		}
-  		ielen -= ie[1] + 2;
-  		ie += ie[1] + 2;
--@@ -2328,6 +2335,7 @@ static void print_capa_non_dmg(__u16 cap
-+@@ -2377,6 +2384,7 @@ static void print_capa_non_dmg(__u16 cap
-  		printf(" ESS");
-  	if (capa & WLAN_CAPABILITY_IBSS)
-  		printf(" IBSS");
-@@ -211,7 +211,7 @@
-  	if (capa & WLAN_CAPABILITY_CF_POLLABLE)
-  		printf(" CfPollable");
-  	if (capa & WLAN_CAPABILITY_CF_POLL_REQUEST)
--@@ -2356,6 +2364,7 @@ static void print_capa_non_dmg(__u16 cap
-+@@ -2405,6 +2413,7 @@ static void print_capa_non_dmg(__u16 cap
-  		printf(" DelayedBACK");
-  	if (capa & WLAN_CAPABILITY_IMM_BACK)
-  		printf(" ImmediateBACK");
-@@ -219,7 +219,7 @@
-  }
-  
-  static int print_bss_handler(struct nl_msg *msg, void *arg)
--@@ -2440,8 +2449,10 @@ static int print_bss_handler(struct nl_m
-+@@ -2489,8 +2498,10 @@ static int print_bss_handler(struct nl_m
-  	if (bss[NL80211_BSS_FREQUENCY]) {
-  		int freq = nla_get_u32(bss[NL80211_BSS_FREQUENCY]);
-  		printf("\tfreq: %d\n", freq);
-@@ -230,7 +230,7 @@
-  	}
-  	if (bss[NL80211_BSS_BEACON_INTERVAL])
-  		printf("\tbeacon interval: %d TUs\n",
--@@ -2635,6 +2646,7 @@ static int handle_stop_sched_scan(struct
-+@@ -2684,6 +2695,7 @@ static int handle_stop_sched_scan(struct
-  	return 0;
-  }
-  
-@@ -238,7 +238,7 @@
-  COMMAND(scan, sched_start,
-  	SCHED_SCAN_OPTIONS,
-  	NL80211_CMD_START_SCHED_SCAN, 0, CIB_NETDEV, handle_start_sched_scan,
--@@ -2645,3 +2657,4 @@ COMMAND(scan, sched_start,
-+@@ -2694,3 +2706,4 @@ COMMAND(scan, sched_start,
-  COMMAND(scan, sched_stop, "",
-  	NL80211_CMD_STOP_SCHED_SCAN, 0, CIB_NETDEV, handle_stop_sched_scan,
-  	"Stop an ongoing scheduled scan.");
--- 
-2.25.1
-

backports/0013-umdns-update-to-latest-HEAD.patch

@@ -1,7 +1,7 @@
-From e413c12b77acc0012a79e8981b553e35d4a2b20e Mon Sep 17 00:00:00 2001
+From 41db6b8282d09bd9d7ee453f54e592003904ab0e Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Wed, 30 Jun 2021 14:21:23 +0200
-Subject: [PATCH] umdns: update to latest HEAD
+Subject: [PATCH 13/27] umdns: update to latest HEAD
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---

backports/0014-kernel-add-bdpu-filter-support.patch

@@ -0,0 +1,242 @@
+From 9df1500bde8e609dcbbecbefa0eb5a29d9e6f7f5 Mon Sep 17 00:00:00 2001
+From: John Crispin <john@phrozen.org>
+Date: Fri, 27 Aug 2021 16:52:34 +0200
+Subject: [PATCH 14/27] kernel: add bdpu filter support
+
+Signed-off-by: John Crispin <john@phrozen.org>
+---
+ ...l-knob-for-filtering-rx-tx-BPDU-pack.patch | 107 ++++++++++++++++++
+ ...l-knob-for-filtering-rx-tx-BPDU-pack.patch | 107 ++++++++++++++++++
+ 2 files changed, 214 insertions(+)
+ create mode 100644 target/linux/generic/pending-5.10/710-bridge-add-sysctl-knob-for-filtering-rx-tx-BPDU-pack.patch
+ create mode 100644 target/linux/generic/pending-5.4/710-bridge-add-sysctl-knob-for-filtering-rx-tx-BPDU-pack.patch
+
+diff --git a/target/linux/generic/pending-5.10/710-bridge-add-sysctl-knob-for-filtering-rx-tx-BPDU-pack.patch b/target/linux/generic/pending-5.10/710-bridge-add-sysctl-knob-for-filtering-rx-tx-BPDU-pack.patch
+new file mode 100644
+index 0000000000..918ae05d12
+--- /dev/null
++++ b/target/linux/generic/pending-5.10/710-bridge-add-sysctl-knob-for-filtering-rx-tx-BPDU-pack.patch
+@@ -0,0 +1,107 @@
++From: Felix Fietkau <nbd@nbd.name>
++Date: Fri, 27 Aug 2021 12:22:32 +0200
++Subject: [PATCH] bridge: add sysctl knob for filtering rx/tx BPDU packets on a
++ port
++
++Some devices (e.g. wireless APs) can't have devices behind them be part of
++a bridge topology with redundant links, due to address limitations.
++Additionally, broadcast traffic on these devices is somewhat expensive, due to
++the low data rate and wakeups of clients in powersave mode.
++This sysctl knob can be used to ensure that BPDU packets are never sent
++or forwarded to/from these devices
++
++Signed-off-by: Felix Fietkau <nbd@nbd.name>
++---
++
++--- a/include/linux/if_bridge.h
+++++ b/include/linux/if_bridge.h
++@@ -56,6 +56,7 @@ struct br_ip_list {
++ #define BR_MRP_AWARE		BIT(17)
++ #define BR_MRP_LOST_CONT	BIT(18)
++ #define BR_MRP_LOST_IN_CONT	BIT(19)
+++#define BR_BPDU_FILTER		BIT(20)
++ 
++ #define BR_DEFAULT_AGEING_TIME	(300 * HZ)
++ 
++--- a/net/bridge/br_forward.c
+++++ b/net/bridge/br_forward.c
++@@ -191,6 +191,7 @@ out:
++ void br_flood(struct net_bridge *br, struct sk_buff *skb,
++ 	      enum br_pkt_type pkt_type, bool local_rcv, bool local_orig)
++ {
+++	const unsigned char *dest = eth_hdr(skb)->h_dest;
++ 	struct net_bridge_port *prev = NULL;
++ 	struct net_bridge_port *p;
++ 
++@@ -206,6 +207,10 @@ void br_flood(struct net_bridge *br, str
++ 		case BR_PKT_MULTICAST:
++ 			if (!(p->flags & BR_MCAST_FLOOD) && skb->dev != br->dev)
++ 				continue;
+++			if ((p->flags & BR_BPDU_FILTER) &&
+++			    unlikely(is_link_local_ether_addr(dest) &&
+++				     dest[5] == 0))
+++				continue;
++ 			break;
++ 		case BR_PKT_BROADCAST:
++ 			if (!(p->flags & BR_BCAST_FLOOD) && skb->dev != br->dev)
++--- a/net/bridge/br_input.c
+++++ b/net/bridge/br_input.c
++@@ -305,6 +305,8 @@ static rx_handler_result_t br_handle_fra
++ 		fwd_mask |= p->group_fwd_mask;
++ 		switch (dest[5]) {
++ 		case 0x00:	/* Bridge Group Address */
+++			if (p->flags & BR_BPDU_FILTER)
+++				goto drop;
++ 			/* If STP is turned off,
++ 			   then must forward to keep loop detection */
++ 			if (p->br->stp_enabled == BR_NO_STP ||
++--- a/net/bridge/br_sysfs_if.c
+++++ b/net/bridge/br_sysfs_if.c
++@@ -233,6 +233,7 @@ BRPORT_ATTR_FLAG(multicast_flood, BR_MCA
++ BRPORT_ATTR_FLAG(broadcast_flood, BR_BCAST_FLOOD);
++ BRPORT_ATTR_FLAG(neigh_suppress, BR_NEIGH_SUPPRESS);
++ BRPORT_ATTR_FLAG(isolated, BR_ISOLATED);
+++BRPORT_ATTR_FLAG(bpdu_filter, BR_BPDU_FILTER);
++ 
++ #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
++ static ssize_t show_multicast_router(struct net_bridge_port *p, char *buf)
++@@ -285,6 +286,7 @@ static const struct brport_attribute *br
++ 	&brport_attr_group_fwd_mask,
++ 	&brport_attr_neigh_suppress,
++ 	&brport_attr_isolated,
+++	&brport_attr_bpdu_filter,
++ 	&brport_attr_backup_port,
++ 	NULL
++ };
++--- a/net/bridge/br_stp_bpdu.c
+++++ b/net/bridge/br_stp_bpdu.c
++@@ -80,7 +80,8 @@ void br_send_config_bpdu(struct net_brid
++ {
++ 	unsigned char buf[35];
++ 
++-	if (p->br->stp_enabled != BR_KERNEL_STP)
+++	if (p->br->stp_enabled != BR_KERNEL_STP ||
+++	    (p->flags & BR_BPDU_FILTER))
++ 		return;
++ 
++ 	buf[0] = 0;
++@@ -127,7 +128,8 @@ void br_send_tcn_bpdu(struct net_bridge_
++ {
++ 	unsigned char buf[4];
++ 
++-	if (p->br->stp_enabled != BR_KERNEL_STP)
+++	if (p->br->stp_enabled != BR_KERNEL_STP ||
+++	    (p->flags & BR_BPDU_FILTER))
++ 		return;
++ 
++ 	buf[0] = 0;
++@@ -172,6 +174,9 @@ void br_stp_rcv(const struct stp_proto *
++ 	if (!(br->dev->flags & IFF_UP))
++ 		goto out;
++ 
+++	if (p->flags & BR_BPDU_FILTER)
+++		goto out;
+++
++ 	if (p->state == BR_STATE_DISABLED)
++ 		goto out;
++ 
+diff --git a/target/linux/generic/pending-5.4/710-bridge-add-sysctl-knob-for-filtering-rx-tx-BPDU-pack.patch b/target/linux/generic/pending-5.4/710-bridge-add-sysctl-knob-for-filtering-rx-tx-BPDU-pack.patch
+new file mode 100644
+index 0000000000..586d264cd5
+--- /dev/null
++++ b/target/linux/generic/pending-5.4/710-bridge-add-sysctl-knob-for-filtering-rx-tx-BPDU-pack.patch
+@@ -0,0 +1,107 @@
++From: Felix Fietkau <nbd@nbd.name>
++Date: Fri, 27 Aug 2021 12:22:32 +0200
++Subject: [PATCH] bridge: add sysctl knob for filtering rx/tx BPDU packets on a
++ port
++
++Some devices (e.g. wireless APs) can't have devices behind them be part of
++a bridge topology with redundant links, due to address limitations.
++Additionally, broadcast traffic on these devices is somewhat expensive, due to
++the low data rate and wakeups of clients in powersave mode.
++This sysctl knob can be used to ensure that BPDU packets are never sent
++or forwarded to/from these devices
++
++Signed-off-by: Felix Fietkau <nbd@nbd.name>
++---
++
++--- a/include/linux/if_bridge.h
+++++ b/include/linux/if_bridge.h
++@@ -47,6 +47,7 @@ struct br_ip_list {
++ #define BR_BCAST_FLOOD		BIT(14)
++ #define BR_NEIGH_SUPPRESS	BIT(15)
++ #define BR_ISOLATED		BIT(16)
+++#define BR_BPDU_FILTER		BIT(17)
++ 
++ #define BR_DEFAULT_AGEING_TIME	(300 * HZ)
++ 
++--- a/net/bridge/br_forward.c
+++++ b/net/bridge/br_forward.c
++@@ -191,6 +191,7 @@ out:
++ void br_flood(struct net_bridge *br, struct sk_buff *skb,
++ 	      enum br_pkt_type pkt_type, bool local_rcv, bool local_orig)
++ {
+++	const unsigned char *dest = eth_hdr(skb)->h_dest;
++ 	struct net_bridge_port *prev = NULL;
++ 	struct net_bridge_port *p;
++ 
++@@ -206,6 +207,10 @@ void br_flood(struct net_bridge *br, str
++ 		case BR_PKT_MULTICAST:
++ 			if (!(p->flags & BR_MCAST_FLOOD) && skb->dev != br->dev)
++ 				continue;
+++			if ((p->flags & BR_BPDU_FILTER) &&
+++			    unlikely(is_link_local_ether_addr(dest) &&
+++				     dest[5] == 0))
+++				continue;
++ 			break;
++ 		case BR_PKT_BROADCAST:
++ 			if (!(p->flags & BR_BCAST_FLOOD) && skb->dev != br->dev)
++--- a/net/bridge/br_input.c
+++++ b/net/bridge/br_input.c
++@@ -300,6 +300,8 @@ rx_handler_result_t br_handle_frame(stru
++ 		fwd_mask |= p->group_fwd_mask;
++ 		switch (dest[5]) {
++ 		case 0x00:	/* Bridge Group Address */
+++			if (p->flags & BR_BPDU_FILTER)
+++				goto drop;
++ 			/* If STP is turned off,
++ 			   then must forward to keep loop detection */
++ 			if (p->br->stp_enabled == BR_NO_STP ||
++--- a/net/bridge/br_sysfs_if.c
+++++ b/net/bridge/br_sysfs_if.c
++@@ -233,6 +233,7 @@ BRPORT_ATTR_FLAG(multicast_flood, BR_MCA
++ BRPORT_ATTR_FLAG(broadcast_flood, BR_BCAST_FLOOD);
++ BRPORT_ATTR_FLAG(neigh_suppress, BR_NEIGH_SUPPRESS);
++ BRPORT_ATTR_FLAG(isolated, BR_ISOLATED);
+++BRPORT_ATTR_FLAG(bpdu_filter, BR_BPDU_FILTER);
++ 
++ #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
++ static ssize_t show_multicast_router(struct net_bridge_port *p, char *buf)
++@@ -285,6 +286,7 @@ static const struct brport_attribute *br
++ 	&brport_attr_group_fwd_mask,
++ 	&brport_attr_neigh_suppress,
++ 	&brport_attr_isolated,
+++	&brport_attr_bpdu_filter,
++ 	&brport_attr_backup_port,
++ 	NULL
++ };
++--- a/net/bridge/br_stp_bpdu.c
+++++ b/net/bridge/br_stp_bpdu.c
++@@ -80,7 +80,8 @@ void br_send_config_bpdu(struct net_brid
++ {
++ 	unsigned char buf[35];
++ 
++-	if (p->br->stp_enabled != BR_KERNEL_STP)
+++	if (p->br->stp_enabled != BR_KERNEL_STP ||
+++	    (p->flags & BR_BPDU_FILTER))
++ 		return;
++ 
++ 	buf[0] = 0;
++@@ -125,7 +126,8 @@ void br_send_tcn_bpdu(struct net_bridge_
++ {
++ 	unsigned char buf[4];
++ 
++-	if (p->br->stp_enabled != BR_KERNEL_STP)
+++	if (p->br->stp_enabled != BR_KERNEL_STP ||
+++	    (p->flags & BR_BPDU_FILTER))
++ 		return;
++ 
++ 	buf[0] = 0;
++@@ -168,6 +170,9 @@ void br_stp_rcv(const struct stp_proto *
++ 	if (!(br->dev->flags & IFF_UP))
++ 		goto out;
++ 
+++	if (p->flags & BR_BPDU_FILTER)
+++		goto out;
+++
++ 	if (p->state == BR_STATE_DISABLED)
++ 		goto out;
++ 
+-- 
+2.25.1
+

backports/0015-uhttpd-add-config-option-for-json_script.patch

@@ -0,0 +1,33 @@
+From 8ba5feb6aaba50bda126db027490c7d37e428e3b Mon Sep 17 00:00:00 2001
+From: Stijn Tintel <stijn@linux-ipv6.be>
+Date: Fri, 20 Aug 2021 16:11:12 +0300
+Subject: [PATCH 15/27] uhttpd: add config option for json_script
+
+Add a config option for json_script instead of unconditionally including
+all json files in /etc/uhttpd in every uhttpd instance. This makes it
+possible to configure a single instance with an unconditional redirect,
+which is currently not possible as it would render all other uhttpd
+instances unusable.
+
+Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
+---
+ package/network/services/uhttpd/files/uhttpd.init | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/package/network/services/uhttpd/files/uhttpd.init b/package/network/services/uhttpd/files/uhttpd.init
+index 869f79bea2..7020912c6c 100755
+--- a/package/network/services/uhttpd/files/uhttpd.init
++++ b/package/network/services/uhttpd/files/uhttpd.init
+@@ -195,7 +195,8 @@ start_instance()
+ 		append_bool "$cfg" redirect_https "-q" 0
+ 	}
+ 
+-	for file in /etc/uhttpd/*.json; do
++	config_get json_script "$cfg" json_script
++	for file in $json_script; do
+ 		[ -s "$file" ] && procd_append_param command -H "$file"
+ 	done
+ 
+-- 
+2.25.1
+

backports/0016-iwinfo-update-to-latest-git-HEAD.patch

@@ -0,0 +1,41 @@
+From 63281b982b3692828ff453dcb9e68b8e43d628e5 Mon Sep 17 00:00:00 2001
+From: John Crispin <john@phrozen.org>
+Date: Mon, 21 Jun 2021 12:53:28 +0200
+Subject: [PATCH 16/27] iwinfo: update to latest git HEAD
+
+Signed-off-by: John Crispin <john@phrozen.org>
+---
+ package/network/utils/iwinfo/Makefile | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/package/network/utils/iwinfo/Makefile b/package/network/utils/iwinfo/Makefile
+index 815c477988..d235f07da9 100644
+--- a/package/network/utils/iwinfo/Makefile
++++ b/package/network/utils/iwinfo/Makefile
+@@ -11,12 +11,20 @@ PKG_RELEASE:=2.1
+ 
+ PKG_SOURCE_PROTO:=git
+ PKG_SOURCE_URL=$(PROJECT_GIT)/project/iwinfo.git
+-PKG_SOURCE_DATE:=2021-04-30
+-PKG_SOURCE_VERSION:=c45f0b584b4b86f8250f90ea19afca271c114fa2
+-PKG_MIRROR_HASH:=24ad04791254a0523cd15a4fec6116d9ff121e006c93e5e41459f91347b33ec2
++PKG_SOURCE_DATE:=2021-06-09
++PKG_SOURCE_VERSION:=c0414642fead263a4a6a686ad3cb7e965ec8a23a
++PKG_MIRROR_HASH:=c5686bbae86753c53db03a686b034bbb80d31107cc359ebd8522ea1c82db35ea
+ PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
+ PKG_LICENSE:=GPL-2.0
+ 
++PKG_FLAGS := nonshared
++
++PKG_CONFIG_DEPENDS := \
++	CONFIG_PACKAGE_kmod-brcm-wl \
++	CONFIG_PACKAGE_kmod-brcm-wl-mini \
++	CONFIG_PACKAGE_kmod-brcm-wl-mimo \
++	CONFIG_PACKAGE_kmod-cfg80211
++
+ IWINFO_ABI_VERSION:=20210430
+ 
+ include $(INCLUDE_DIR)/package.mk
+-- 
+2.25.1
+

backports/0016-kernel-modules-move-act_gact-into-kmod-sched-core.patch

@@ -1,45 +0,0 @@
-From 6c7e11cccbd28224a9a473a36df1102b4257d356 Mon Sep 17 00:00:00 2001
-From: DENG Qingfang <dqfext@gmail.com>
-Date: Fri, 9 Apr 2021 12:25:08 +0800
-Subject: [PATCH 5/6] kernel/modules: move act_gact into kmod-sched-core
-
-As the name suggests, act_gact has the generic actions such as dropping
-and accepting packets, so move it into kmod-sched-core.
-
-Signed-off-by: DENG Qingfang <dqfext@gmail.com>
----
- package/kernel/linux/modules/netsupport.mk | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
-index 9fd49c1392..4343e850e9 100644
---- a/package/kernel/linux/modules/netsupport.mk
-+++ b/package/kernel/linux/modules/netsupport.mk
-@@ -721,7 +721,7 @@ $(eval $(call KernelPackage,mppe))
- 
- 
- SCHED_MODULES = $(patsubst $(LINUX_DIR)/net/sched/%.ko,%,$(wildcard $(LINUX_DIR)/net/sched/*.ko))
--SCHED_MODULES_CORE = sch_ingress sch_fq_codel sch_hfsc sch_htb sch_tbf cls_basic cls_fw cls_route cls_flow cls_tcindex cls_u32 em_u32 act_mirred act_skbedit cls_matchall
-+SCHED_MODULES_CORE = sch_ingress sch_fq_codel sch_hfsc sch_htb sch_tbf cls_basic cls_fw cls_route cls_flow cls_tcindex cls_u32 em_u32 act_gact act_mirred act_skbedit cls_matchall
- SCHED_MODULES_FILTER = $(SCHED_MODULES_CORE) act_connmark act_ctinfo sch_cake sch_netem sch_mqprio em_ipset cls_bpf cls_flower act_bpf act_vlan
- SCHED_MODULES_EXTRA = $(filter-out $(SCHED_MODULES_FILTER),$(SCHED_MODULES))
- SCHED_FILES = $(patsubst %,$(LINUX_DIR)/net/sched/%.ko,$(filter $(SCHED_MODULES_CORE),$(SCHED_MODULES)))
-@@ -745,6 +745,7 @@ define KernelPackage/sched-core
- 	CONFIG_NET_CLS_ROUTE4 \
- 	CONFIG_NET_CLS_TCINDEX \
- 	CONFIG_NET_CLS_U32 \
-+	CONFIG_NET_ACT_GACT \
- 	CONFIG_NET_ACT_MIRRED \
- 	CONFIG_NET_ACT_SKBEDIT \
- 	CONFIG_NET_CLS_MATCHALL \
-@@ -899,7 +900,6 @@ define KernelPackage/sched
- 	CONFIG_NET_SCH_FQ \
- 	CONFIG_NET_SCH_PIE \
- 	CONFIG_NET_ACT_POLICE \
--	CONFIG_NET_ACT_GACT \
- 	CONFIG_NET_ACT_IPT \
- 	CONFIG_NET_ACT_PEDIT \
- 	CONFIG_NET_ACT_SIMP \
--- 
-2.25.1
-

backports/0017-netifd-update-to-latest-HEAD.patch

@@ -0,0 +1,62 @@
+From 3bc625814c04a24cdf16587c2adb2060a77a5e1a Mon Sep 17 00:00:00 2001
+From: John Crispin <john@phrozen.org>
+Date: Thu, 27 May 2021 13:24:47 +0200
+Subject: [PATCH 17/27] netifd: update to latest HEAD
+
+Signed-off-by: John Crispin <john@phrozen.org>
+---
+ package/network/config/netifd/Makefile          |  8 +++-----
+ .../netifd/patches/002-fix-dhcp-issue.patch     | 17 +++++++++++++++++
+ 2 files changed, 20 insertions(+), 5 deletions(-)
+ create mode 100644 package/network/config/netifd/patches/002-fix-dhcp-issue.patch
+
+diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile
+index 4b5f110da2..13c1d96ed7 100644
+--- a/package/network/config/netifd/Makefile
++++ b/package/network/config/netifd/Makefile
+@@ -5,16 +5,14 @@ PKG_RELEASE:=1
+ 
+ PKG_SOURCE_PROTO:=git
+ PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git
+-PKG_SOURCE_DATE:=2021-07-26
+-PKG_SOURCE_VERSION:=440eb0647708274cc8d7d9e7c2bb0cfdfba90023
+-PKG_MIRROR_HASH:=eed957036ab608fdc49bdf801fc5b4405fcd2a3a5e5d3343ec39898e156c10e9
++PKG_SOURCE_DATE:=2021-09-01
++PKG_SOURCE_VERSION:=300b1220fab38600f102bb8cfcc59a29ce41b095
++PKG_MIRROR_HASH:=310fa90059795b1c956f9822db712ecc58bc19725b0f05f98c9e0a6824c8ca36
+ PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
+ 
+ PKG_LICENSE:=GPL-2.0
+ PKG_LICENSE_FILES:=
+ 
+-PKG_BUILD_PARALLEL:=1
+-
+ include $(INCLUDE_DIR)/package.mk
+ include $(INCLUDE_DIR)/cmake.mk
+ 
+diff --git a/package/network/config/netifd/patches/002-fix-dhcp-issue.patch b/package/network/config/netifd/patches/002-fix-dhcp-issue.patch
+new file mode 100644
+index 0000000000..6f1d2e708e
+--- /dev/null
++++ b/package/network/config/netifd/patches/002-fix-dhcp-issue.patch
+@@ -0,0 +1,17 @@
++Index: netifd-2019-08-05-5e02f944/interface.c
++===================================================================
++--- netifd-2019-08-05-5e02f944.orig/interface.c
+++++ netifd-2019-08-05-5e02f944/interface.c
++@@ -424,7 +424,11 @@ interface_main_dev_cb(struct device_user
++ 		interface_set_link_state(iface, false);
++ 		break;
++ 	case DEV_EVENT_TOPO_CHANGE:
++-		interface_proto_event(iface->proto, PROTO_CMD_RENEW, false);
+++	/* This renews the dhcp lease when the bridge adds/deletes a
+++	 * new interface. It causes some dhcp servers to fail in
+++	 * case where there are many interfaces being added to the
+++	 * bridge frequently. Disabling this for now. */
+++	/*	interface_proto_event(iface->proto, PROTO_CMD_RENEW, false); */
++ 		return;
++ 	default:
++ 		break;
+-- 
+2.25.1
+

backports/0019-hostapd-update-to-latest-HEAD.patch

@@ -1,16 +1,16 @@
-From bb2c5ff83be37b0bb951059e457192a7bed9388f Mon Sep 17 00:00:00 2001
+From 3b094ed6b1602969f0dd71b48ed220d0caace7ab Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
-Date: Thu, 27 May 2021 13:25:19 +0200
-Subject: [PATCH 01/43] hostapd: upsate to latest HEAD
+Date: Sat, 4 Sep 2021 05:48:27 +0200
+Subject: [PATCH 19/27] hostapd: update to latest HEAD
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
  package/network/services/hostapd/Makefile     |  15 +-
  .../hostapd/files/hostapd-basic.config        |   2 +-
  .../hostapd/files/hostapd-full.config         |   4 +-
- .../network/services/hostapd/files/hostapd.sh | 158 ++++++++--
+ .../network/services/hostapd/files/hostapd.sh | 141 +++++++--
  ...-fix-frequency-setup-with-HE-enabled.patch | 196 -------------
- .../001-wolfssl-init-RNG-with-ECC-key.patch   |  43 +++
+ ...> 001-wolfssl-init-RNG-with-ECC-key.patch} |  11 +-
  ...-init-order-disable-pri-sec-channel-.patch | 126 --------
  ...andle-HT40-and-mode-downgrade-in-AP-.patch | 102 -------
  ...ix-frequency-config-for-non-p2p-vht-.patch |  63 ----
@@ -66,15 +66,15 @@ Signed-off-by: John Crispin <john@phrozen.org>
  .../720-ACS-fix-channel-100-frequency.patch   |  30 ++
  .../patches/720-iface_max_num_sta.patch       |  82 ++++++
  .../hostapd/patches/730-ft_iface.patch        |  38 +++
- .../hostapd/patches/740-snoop_iface.patch     |  37 +++
+ .../hostapd/patches/740-snoop_iface.patch     |  66 +++++
  ...ate-if-no-available-channel-is-found.patch |  37 ---
  ...of-secondary-device-types-for-P2P-gr.patch |  33 ---
  .../services/hostapd/src/src/ap/ubus.c        | 214 +++++++++++++-
  .../services/hostapd/src/src/ap/ubus.h        |  16 +
  .../hostapd/src/src/utils/build_features.h    |   2 -
- 67 files changed, 1300 insertions(+), 2331 deletions(-)
+ 67 files changed, 1277 insertions(+), 2334 deletions(-)
  delete mode 100644 package/network/services/hostapd/patches/001-HE-VHT-fix-frequency-setup-with-HE-enabled.patch
- create mode 100644 package/network/services/hostapd/patches/001-wolfssl-init-RNG-with-ECC-key.patch
+ rename package/network/services/hostapd/patches/{802-wolfssl-init-RNG-with-ECC-key.patch => 001-wolfssl-init-RNG-with-ECC-key.patch} (76%)
  delete mode 100644 package/network/services/hostapd/patches/002-mesh-fix-channel-init-order-disable-pri-sec-channel-.patch
  delete mode 100644 package/network/services/hostapd/patches/003-wpa_supplicant-handle-HT40-and-mode-downgrade-in-AP-.patch
  delete mode 100644 package/network/services/hostapd/patches/004-wpa_supplicant-fix-frequency-config-for-non-p2p-vht-.patch
@@ -111,7 +111,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
  delete mode 100644 package/network/services/hostapd/patches/801-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch
 
 diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile
-index bd2a7c96ad..fee6889b40 100644
+index 67ea89c339..fee6889b40 100644
 --- a/package/network/services/hostapd/Makefile
 +++ b/package/network/services/hostapd/Makefile
 @@ -1,19 +1,17 @@
@@ -126,7 +126,7 @@ index bd2a7c96ad..fee6889b40 100644
  include $(TOPDIR)/rules.mk
  
  PKG_NAME:=hostapd
--PKG_RELEASE:=32
+-PKG_RELEASE:=35
 +PKG_RELEASE:=$(AUTORELEASE)
  
  PKG_SOURCE_URL:=http://w1.fi/hostap.git
@@ -179,7 +179,7 @@ index df272e443a..61b6daf861 100644
  # EAP-SAKE for the integrated EAP server
  #CONFIG_EAP_SAKE=y
 diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
-index 45a49b8faa..e941fa4f77 100644
+index aa72e09eba..e941fa4f77 100644
 --- a/package/network/services/hostapd/files/hostapd.sh
 +++ b/package/network/services/hostapd/files/hostapd.sh
 @@ -49,6 +49,7 @@ hostapd_append_wpa_key_mgmt() {
@@ -190,17 +190,15 @@ index 45a49b8faa..e941fa4f77 100644
  		;;
  		eap-eap192)
  			append wpa_key_mgmt "WPA-EAP-SUITE-B-192"
-@@ -91,14 +92,19 @@ hostapd_add_log_config() {
+@@ -91,6 +92,7 @@ hostapd_add_log_config() {
  hostapd_common_add_device_config() {
  	config_add_array basic_rate
  	config_add_array supported_rates
 +	config_add_string beacon_rate
  
--	config_add_string country
-+	config_add_string country country3
+ 	config_add_string country country3
  	config_add_boolean country_ie doth
- 	config_add_boolean spectrum_mgmt_required
- 	config_add_int local_pwr_constraint
+@@ -99,6 +101,10 @@ hostapd_common_add_device_config() {
  	config_add_string require_mode
  	config_add_boolean legacy_rates
  	config_add_int cell_density
@@ -211,27 +209,17 @@ index 45a49b8faa..e941fa4f77 100644
  
  	config_add_string acs_chan_bias
  	config_add_array hostapd_options
-@@ -114,8 +120,9 @@ hostapd_prepare_device_config() {
- 
+@@ -115,7 +121,8 @@ hostapd_prepare_device_config() {
  	local base_cfg=
  
--	json_get_vars country country_ie beacon_int:100 dtim_period:2 doth require_mode legacy_rates \
+ 	json_get_vars country country3 country_ie beacon_int:100 dtim_period:2 doth require_mode legacy_rates \
 -		acs_chan_bias local_pwr_constraint spectrum_mgmt_required airtime_mode cell_density
-+	json_get_vars country country3 country_ie beacon_int:100 dtim_period:2 doth require_mode legacy_rates \
 +		acs_chan_bias local_pwr_constraint spectrum_mgmt_required airtime_mode cell_density \
 +		rts_threshold beacon_rate rssi_reject_assoc_rssi rssi_ignore_probe_request maxassoc
  
  	hostapd_set_log_options base_cfg
  
-@@ -128,6 +135,7 @@ hostapd_prepare_device_config() {
- 
- 	[ -n "$country" ] && {
- 		append base_cfg "country_code=$country" "$N"
-+		[ -n "$country3" ] && append base_cfg "country3=$country3" "$N"
- 
- 		[ "$country_ie" -gt 0 ] && {
- 			append base_cfg "ieee80211d=1" "$N"
-@@ -206,11 +214,16 @@ hostapd_prepare_device_config() {
+@@ -207,11 +214,16 @@ hostapd_prepare_device_config() {
  		hostapd_add_rate brlist "$br"
  	done
  
@@ -248,16 +236,7 @@ index 45a49b8faa..e941fa4f77 100644
  
  	json_get_values opts hostapd_options
  	for val in $opts; do
-@@ -251,6 +264,8 @@ hostapd_common_add_bss_config() {
- 	config_add_int acct_port
- 	config_add_int acct_interval
- 
-+	config_add_int bss_load_update_period chan_util_avg_period
-+
- 	config_add_string dae_client
- 	config_add_string dae_secret
- 	config_add_int dae_port
-@@ -266,7 +281,7 @@ hostapd_common_add_bss_config() {
+@@ -269,7 +281,7 @@ hostapd_common_add_bss_config() {
  	config_add_array domain_match domain_match2 domain_suffix_match domain_suffix_match2
  	config_add_string ieee80211w_mgmt_cipher
  
@@ -266,19 +245,15 @@ index 45a49b8faa..e941fa4f77 100644
  	config_add_string vlan_tagged_interface vlan_bridge
  	config_add_string vlan_file
  
-@@ -281,9 +296,10 @@ hostapd_common_add_bss_config() {
- 	config_add_string wps_device_type wps_device_name wps_manufacturer wps_pin
- 	config_add_string multi_ap_backhaul_ssid multi_ap_backhaul_key
- 
--	config_add_boolean wnm_sleep_mode bss_transition
-+	config_add_boolean wnm_sleep_mode wnm_sleep_mode_no_keys bss_transition
+@@ -287,6 +299,7 @@ hostapd_common_add_bss_config() {
+ 	config_add_boolean wnm_sleep_mode wnm_sleep_mode_no_keys bss_transition
  	config_add_int time_advertisement
  	config_add_string time_zone
 +	config_add_string vendor_elements
  
  	config_add_boolean ieee80211k rrm_neighbor_report rrm_beacon_report
  
-@@ -308,6 +324,7 @@ hostapd_common_add_bss_config() {
+@@ -311,6 +324,7 @@ hostapd_common_add_bss_config() {
  	config_add_array supported_rates
  
  	config_add_boolean sae_require_mfp
@@ -286,7 +261,7 @@ index 45a49b8faa..e941fa4f77 100644
  
  	config_add_string 'owe_transition_bssid:macaddr' 'owe_transition_ssid:string'
  
-@@ -316,7 +333,7 @@ hostapd_common_add_bss_config() {
+@@ -319,7 +333,7 @@ hostapd_common_add_bss_config() {
  	config_add_int iw_ipaddr_type_availability iw_gas_address3
  	config_add_string iw_hessid iw_network_auth_type iw_qos_map_set
  	config_add_array iw_roaming_consortium iw_domain_name iw_anqp_3gpp_cell_net iw_nai_realm
@@ -295,7 +270,7 @@ index 45a49b8faa..e941fa4f77 100644
  
  	config_add_boolean hs20 disable_dgaf osen
  	config_add_int anqp_domain_id
-@@ -327,12 +344,22 @@ hostapd_common_add_bss_config() {
+@@ -330,12 +344,22 @@ hostapd_common_add_bss_config() {
  	config_add_array hs20_conn_capab
  	config_add_string osu_ssid hs20_wan_metrics hs20_operating_class hs20_t_c_filename hs20_t_c_timestamp
  
@@ -319,7 +294,7 @@ index 45a49b8faa..e941fa4f77 100644
  }
  
  hostapd_set_vlan_file() {
-@@ -384,7 +411,7 @@ append_iw_anqp_3gpp_cell_net() {
+@@ -387,7 +411,7 @@ append_iw_anqp_3gpp_cell_net() {
  	if [ -z "$iw_anqp_3gpp_cell_net_conf" ]; then
  		iw_anqp_3gpp_cell_net_conf="$1"
  	else
@@ -328,7 +303,7 @@ index 45a49b8faa..e941fa4f77 100644
  	fi
  }
  
-@@ -396,10 +423,22 @@ append_iw_nai_realm() {
+@@ -399,10 +423,22 @@ append_iw_nai_realm() {
  	[ -n "$1" ] && append bss_conf "nai_realm=$1" "$N"
  }
  
@@ -351,7 +326,7 @@ index 45a49b8faa..e941fa4f77 100644
  append_osu_provider_service_desc() {
  	append bss_conf "osu_service_desc=$1" "$N"
  }
-@@ -447,6 +486,7 @@ append_osu_provider() {
+@@ -450,6 +486,7 @@ append_osu_provider() {
  	append bss_conf "osu_method_list=$osu_method_list" "$N"
  
  	config_list_foreach "$1" osu_service_desc append_osu_provider_service_desc
@@ -359,7 +334,7 @@ index 45a49b8faa..e941fa4f77 100644
  	config_list_foreach "$1" osu_icon append_osu_icon
  
  	append bss_conf "$N"
-@@ -456,6 +496,14 @@ append_hs20_conn_capab() {
+@@ -459,6 +496,14 @@ append_hs20_conn_capab() {
  	[ -n "$1" ] && append bss_conf "hs20_conn_capab=$1" "$N"
  }
  
@@ -374,7 +349,7 @@ index 45a49b8faa..e941fa4f77 100644
  append_airtime_sta_weight() {
  	[ -n "$1" ] && append bss_conf "airtime_sta_weight=$1" "$N"
  }
-@@ -479,10 +527,12 @@ hostapd_set_bss_options() {
+@@ -482,10 +527,12 @@ hostapd_set_bss_options() {
  		macfilter ssid utf8_ssid wmm uapsd hidden short_preamble rsn_preauth \
  		iapp_interface eapol_version dynamic_vlan ieee80211w nasid \
  		acct_server acct_secret acct_port acct_interval \
@@ -389,7 +364,7 @@ index 45a49b8faa..e941fa4f77 100644
  
  	set_default isolate 0
  	set_default maxassoc 0
-@@ -503,6 +553,7 @@ hostapd_set_bss_options() {
+@@ -506,6 +553,7 @@ hostapd_set_bss_options() {
  	set_default multi_ap 0
  	set_default airtime_bss_weight 0
  	set_default airtime_bss_limit 0
@@ -397,7 +372,7 @@ index 45a49b8faa..e941fa4f77 100644
  
  	append bss_conf "ctrl_interface=/var/run/hostapd"
  	if [ "$isolate" -gt 0 ]; then
-@@ -529,6 +580,7 @@ hostapd_set_bss_options() {
+@@ -532,6 +580,7 @@ hostapd_set_bss_options() {
  	append bss_conf "uapsd_advertisement_enabled=$uapsd" "$N"
  	append bss_conf "utf8_ssid=$utf8_ssid" "$N"
  	append bss_conf "multi_ap=$multi_ap" "$N"
@@ -405,7 +380,7 @@ index 45a49b8faa..e941fa4f77 100644
  
  	[ "$tdls_prohibit" -gt 0 ] && append bss_conf "tdls_prohibit=$tdls_prohibit" "$N"
  
-@@ -547,6 +599,7 @@ hostapd_set_bss_options() {
+@@ -550,6 +599,7 @@ hostapd_set_bss_options() {
  			append bss_conf "acct_server_shared_secret=$acct_secret" "$N"
  		[ -n "$acct_interval" ] && \
  			append bss_conf "radius_acct_interim_interval=$acct_interval" "$N"
@@ -413,7 +388,7 @@ index 45a49b8faa..e941fa4f77 100644
  	}
  
  	case "$auth_type" in
-@@ -560,6 +613,7 @@ hostapd_set_bss_options() {
+@@ -563,6 +613,7 @@ hostapd_set_bss_options() {
  		;;
  	esac
  	[ -n "$sae_require_mfp" ] && append bss_conf "sae_require_mfp=$sae_require_mfp" "$N"
@@ -421,7 +396,7 @@ index 45a49b8faa..e941fa4f77 100644
  
  	local vlan_possible=""
  
-@@ -601,7 +655,7 @@ hostapd_set_bss_options() {
+@@ -604,7 +655,7 @@ hostapd_set_bss_options() {
  				auth_server auth_secret auth_port \
  				dae_client dae_secret dae_port \
  				ownip radius_client_addr \
@@ -430,7 +405,7 @@ index 45a49b8faa..e941fa4f77 100644
  
  			# radius can provide VLAN ID for clients
  			vlan_possible=1
-@@ -613,18 +667,22 @@ hostapd_set_bss_options() {
+@@ -616,18 +667,22 @@ hostapd_set_bss_options() {
  
  			set_default auth_port 1812
  			set_default dae_port 3799
@@ -457,7 +432,7 @@ index 45a49b8faa..e941fa4f77 100644
  
  			[ -n "$ownip" ] && append bss_conf "own_ip_addr=$ownip" "$N"
  			[ -n "$radius_client_addr" ] && append bss_conf "radius_client_addr=$radius_client_addr" "$N"
-@@ -697,19 +755,24 @@ hostapd_set_bss_options() {
+@@ -700,6 +755,7 @@ hostapd_set_bss_options() {
  
  	append bss_conf "ssid=$ssid" "$N"
  	[ -n "$network_bridge" ] && append bss_conf "bridge=$network_bridge" "$N"
@@ -465,26 +440,7 @@ index 45a49b8faa..e941fa4f77 100644
  	[ -n "$iapp_interface" ] && {
  		local ifname
  		network_get_device ifname "$iapp_interface" || ifname="$iapp_interface"
- 		append bss_conf "iapp_interface=$ifname" "$N"
- 	}
- 
--	json_get_vars time_advertisement time_zone wnm_sleep_mode bss_transition
-+	json_get_vars time_advertisement time_zone wnm_sleep_mode wnm_sleep_mode_no_keys bss_transition
- 	set_default bss_transition 0
- 	set_default wnm_sleep_mode 0
-+	set_default wnm_sleep_mode_no_keys 0
- 
- 	[ -n "$time_advertisement" ] && append bss_conf "time_advertisement=$time_advertisement" "$N"
- 	[ -n "$time_zone" ] && append bss_conf "time_zone=$time_zone" "$N"
--	[ "$wnm_sleep_mode" -eq "1" ] && append bss_conf "wnm_sleep_mode=1" "$N"
-+	if [ "$wnm_sleep_mode" -eq "1" ]; then
-+		append bss_conf "wnm_sleep_mode=1" "$N"
-+		[ "$wnm_sleep_mode_no_keys" -eq "1" ] && append bss_conf "wnm_sleep_mode_no_keys=1" "$N"
-+	fi
- 	[ "$bss_transition" -eq "1" ] && append bss_conf "bss_transition=1" "$N"
- 
- 	json_get_vars ieee80211k rrm_neighbor_report rrm_beacon_report
-@@ -733,7 +796,7 @@ hostapd_set_bss_options() {
+@@ -740,7 +796,7 @@ hostapd_set_bss_options() {
  			append bss_conf "ftm_responder=1" "$N"
  			[ "$stationary_ap" -eq "1" ] && append bss_conf "stationary_ap=1" "$N"
  			[ -n "$lci" ] && append bss_conf "lci=$lci" "$N"
@@ -493,7 +449,7 @@ index 45a49b8faa..e941fa4f77 100644
  		}
  	fi
  
-@@ -757,6 +820,7 @@ hostapd_set_bss_options() {
+@@ -764,6 +820,7 @@ hostapd_set_bss_options() {
  				;;
  			esac
  
@@ -501,7 +457,7 @@ index 45a49b8faa..e941fa4f77 100644
  			append bss_conf "mobility_domain=$mobility_domain" "$N"
  			append bss_conf "ft_psk_generate_local=$ft_psk_generate_local" "$N"
  			append bss_conf "ft_over_ds=$ft_over_ds" "$N"
-@@ -771,6 +835,13 @@ hostapd_set_bss_options() {
+@@ -778,6 +835,13 @@ hostapd_set_bss_options() {
  				set_default r0_key_lifetime 10000
  				set_default pmk_r1_push 0
  
@@ -515,7 +471,7 @@ index 45a49b8faa..e941fa4f77 100644
  				[ -n "$r1_key_holder" ] && append bss_conf "r1_key_holder=$r1_key_holder" "$N"
  				append bss_conf "r0_key_lifetime=$r0_key_lifetime" "$N"
  				append bss_conf "pmk_r1_push=$pmk_r1_push" "$N"
-@@ -856,13 +927,17 @@ hostapd_set_bss_options() {
+@@ -863,13 +927,17 @@ hostapd_set_bss_options() {
  	}
  
  	[ -n "$vlan_possible" -a -n "$dynamic_vlan" ] && {
@@ -535,7 +491,7 @@ index 45a49b8faa..e941fa4f77 100644
  		[ -n "$vlan_tagged_interface" ] && \
  			append bss_conf "vlan_tagged_interface=$vlan_tagged_interface" "$N"
  		[ -n "$vlan_file" ] && {
-@@ -875,6 +950,7 @@ hostapd_set_bss_options() {
+@@ -882,6 +950,7 @@ hostapd_set_bss_options() {
  	json_get_vars iw_hessid iw_venue_group iw_venue_type iw_network_auth_type
  	json_get_vars iw_roaming_consortium iw_domain_name iw_anqp_3gpp_cell_net iw_nai_realm
  	json_get_vars iw_anqp_elem iw_qos_map_set iw_ipaddr_type_availability iw_gas_address3
@@ -543,7 +499,7 @@ index 45a49b8faa..e941fa4f77 100644
  
  	set_default iw_enabled 0
  	if [ "$iw_enabled" = "1" ]; then
-@@ -903,6 +979,8 @@ hostapd_set_bss_options() {
+@@ -910,6 +979,8 @@ hostapd_set_bss_options() {
  		json_for_each_item append_iw_roaming_consortium iw_roaming_consortium
  		json_for_each_item append_iw_anqp_elem iw_anqp_elem
  		json_for_each_item append_iw_nai_realm iw_nai_realm
@@ -552,7 +508,7 @@ index 45a49b8faa..e941fa4f77 100644
  
  		iw_domain_name_conf=
  		json_for_each_item append_iw_domain_name iw_domain_name
-@@ -917,9 +995,11 @@ hostapd_set_bss_options() {
+@@ -924,9 +995,11 @@ hostapd_set_bss_options() {
  
  
  	local hs20 disable_dgaf osen anqp_domain_id hs20_deauth_req_timeout \
@@ -566,7 +522,7 @@ index 45a49b8faa..e941fa4f77 100644
  
  	set_default hs20 0
  	set_default disable_dgaf $hs20
-@@ -938,16 +1018,31 @@ hostapd_set_bss_options() {
+@@ -945,16 +1018,31 @@ hostapd_set_bss_options() {
  		[ -n "$hs20_operating_class" ] && append bss_conf "hs20_operating_class=$hs20_operating_class" "$N"
  		[ -n "$hs20_t_c_filename" ] && append bss_conf "hs20_t_c_filename=$hs20_t_c_filename" "$N"
  		[ -n "$hs20_t_c_timestamp" ] && append bss_conf "hs20_t_c_timestamp=$hs20_t_c_timestamp" "$N"
@@ -599,7 +555,7 @@ index 45a49b8faa..e941fa4f77 100644
  
  	set_default per_sta_vif 0
  	if [ "$per_sta_vif" -gt 0 ]; then
-@@ -1072,16 +1167,16 @@ wpa_supplicant_set_fixed_freq() {
+@@ -1079,16 +1167,16 @@ wpa_supplicant_set_fixed_freq() {
  	append network_data "frequency=$freq" "$N$T"
  	case "$htmode" in
  		NOHT) append network_data "disable_ht=1" "$N$T";;
@@ -620,7 +576,7 @@ index 45a49b8faa..e941fa4f77 100644
  		*) append network_data "disable_vht=1" "$N$T";;
  	esac
  }
-@@ -1099,7 +1194,8 @@ wpa_supplicant_add_network() {
+@@ -1106,7 +1194,8 @@ wpa_supplicant_add_network() {
  		ssid bssid key \
  		basic_rate mcast_rate \
  		ieee80211w ieee80211r \
@@ -630,7 +586,7 @@ index 45a49b8faa..e941fa4f77 100644
  
  	case "$auth_type" in
  		sae|owe|eap192|eap-eap192)
-@@ -1112,6 +1208,7 @@ wpa_supplicant_add_network() {
+@@ -1119,6 +1208,7 @@ wpa_supplicant_add_network() {
  
  	set_default ieee80211r 0
  	set_default multi_ap 0
@@ -638,7 +594,7 @@ index 45a49b8faa..e941fa4f77 100644
  
  	local key_mgmt='NONE'
  	local network_data=
-@@ -1143,7 +1240,10 @@ wpa_supplicant_add_network() {
+@@ -1150,7 +1240,10 @@ wpa_supplicant_add_network() {
  		scan_ssid=""
  	}
  
@@ -852,55 +808,51 @@ index 37c17c50af..0000000000
 - 
 - 	if (ssid->mesh_basic_rates == NULL) {
 - 		/*
-diff --git a/package/network/services/hostapd/patches/001-wolfssl-init-RNG-with-ECC-key.patch b/package/network/services/hostapd/patches/001-wolfssl-init-RNG-with-ECC-key.patch
-new file mode 100644
-index 0000000000..84fc1c9351
---- /dev/null
+diff --git a/package/network/services/hostapd/patches/802-wolfssl-init-RNG-with-ECC-key.patch b/package/network/services/hostapd/patches/001-wolfssl-init-RNG-with-ECC-key.patch
+similarity index 76%
+rename from package/network/services/hostapd/patches/802-wolfssl-init-RNG-with-ECC-key.patch
+rename to package/network/services/hostapd/patches/001-wolfssl-init-RNG-with-ECC-key.patch
+index 89d111e991..84fc1c9351 100644
+--- a/package/network/services/hostapd/patches/802-wolfssl-init-RNG-with-ECC-key.patch
 +++ b/package/network/services/hostapd/patches/001-wolfssl-init-RNG-with-ECC-key.patch
-@@ -0,0 +1,43 @@
-+From 21ce83b4ae2b9563175fdb4fc4312096cc399cf8 Mon Sep 17 00:00:00 2001
-+From: David Bauer <mail@david-bauer.net>
-+Date: Wed, 5 May 2021 00:44:34 +0200
-+Subject: [PATCH] wolfssl: add RNG to EC key
-+
-+Since upstream commit 6467de5a8840 ("Randomize z ordinates in
-+scalar mult when timing resistant") WolfSSL requires a RNG for
-+the EC key when built hardened which is the default.
-+
-+Set the RNG for the EC key to fix connections for OWE clients.
-+
-+Signed-off-by: David Bauer <mail@david-bauer.net>
-+---
-+ src/crypto/crypto_wolfssl.c | 4 ++++
-+ 1 file changed, 4 insertions(+)
-+
-+--- a/src/crypto/crypto_wolfssl.c
-++++ b/src/crypto/crypto_wolfssl.c
+@@ -14,11 +14,9 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
+  src/crypto/crypto_wolfssl.c | 4 ++++
+  1 file changed, 4 insertions(+)
+ 
+-diff --git a/src/crypto/crypto_wolfssl.c b/src/crypto/crypto_wolfssl.c
+-index 2e4bf8962..ed2528159 100644
+ --- a/src/crypto/crypto_wolfssl.c
+ +++ b/src/crypto/crypto_wolfssl.c
+-@@ -1303,6 +1303,7 @@ int ecc_projective_add_point(ecc_point *P, ecc_point *Q, ecc_point *R,
 +@@ -1303,6 +1303,7 @@ int ecc_projective_add_point(ecc_point *
-+ 
-+ struct crypto_ec {
-+ 	ecc_key key;
-++	WC_RNG rng;
-+ 	mp_int a;
-+ 	mp_int prime;
-+ 	mp_int order;
+  
+  struct crypto_ec {
+  	ecc_key key;
+@@ -26,7 +24,7 @@ index 2e4bf8962..ed2528159 100644
+  	mp_int a;
+  	mp_int prime;
+  	mp_int order;
+-@@ -1357,6 +1358,8 @@ struct crypto_ec * crypto_ec_init(int group)
 +@@ -1357,6 +1358,8 @@ struct crypto_ec * crypto_ec_init(int gr
-+ 		return NULL;
-+ 
-+ 	if (wc_ecc_init(&e->key) != 0 ||
-++	    wc_InitRng(&e->rng) != 0 ||
-++	    wc_ecc_set_rng(&e->key, &e->rng) != 0 ||
-+ 	    wc_ecc_set_curve(&e->key, 0, curve_id) != 0 ||
-+ 	    mp_init(&e->a) != MP_OKAY ||
-+ 	    mp_init(&e->prime) != MP_OKAY ||
+  		return NULL;
+  
+  	if (wc_ecc_init(&e->key) != 0 ||
+@@ -35,7 +33,7 @@ index 2e4bf8962..ed2528159 100644
+  	    wc_ecc_set_curve(&e->key, 0, curve_id) != 0 ||
+  	    mp_init(&e->a) != MP_OKAY ||
+  	    mp_init(&e->prime) != MP_OKAY ||
+-@@ -1388,6 +1391,7 @@ void crypto_ec_deinit(struct crypto_ec* e)
 +@@ -1388,6 +1391,7 @@ void crypto_ec_deinit(struct crypto_ec*
-+ 	mp_clear(&e->order);
-+ 	mp_clear(&e->prime);
-+ 	mp_clear(&e->a);
-++	wc_FreeRng(&e->rng);
-+ 	wc_ecc_free(&e->key);
-+ 	os_free(e);
-+ }
+  	mp_clear(&e->order);
+  	mp_clear(&e->prime);
+  	mp_clear(&e->a);
+@@ -43,6 +41,3 @@ index 2e4bf8962..ed2528159 100644
+  	wc_ecc_free(&e->key);
+  	os_free(e);
+  }
+--- 
+-2.31.1
+-
 diff --git a/package/network/services/hostapd/patches/002-mesh-fix-channel-init-order-disable-pri-sec-channel-.patch b/package/network/services/hostapd/patches/002-mesh-fix-channel-init-order-disable-pri-sec-channel-.patch
 deleted file mode 100644
 index c7101b1dbc..0000000000
@@ -5325,10 +5277,10 @@ index 0000000000..793e8e0194
 + 		if (!hapd->l2) {
 diff --git a/package/network/services/hostapd/patches/740-snoop_iface.patch b/package/network/services/hostapd/patches/740-snoop_iface.patch
 new file mode 100644
-index 0000000000..722d1e713a
+index 0000000000..8d928f8505
 --- /dev/null
 +++ b/package/network/services/hostapd/patches/740-snoop_iface.patch
-@@ -0,0 +1,37 @@
+@@ -0,0 +1,66 @@
 +--- a/src/ap/ap_config.h
 ++++ b/src/ap/ap_config.h
 +@@ -278,6 +278,7 @@ struct hostapd_bss_config {
@@ -5341,7 +5293,36 @@ index 0000000000..722d1e713a
 + 
 +--- a/src/ap/x_snoop.c
 ++++ b/src/ap/x_snoop.c
-+@@ -71,8 +71,12 @@ x_snoop_get_l2_packet(struct hostapd_dat
++@@ -31,14 +31,16 @@ int x_snoop_init(struct hostapd_data *ha
++ 		return -1;
++ 	}
++ 
++-	if (hostapd_drv_br_port_set_attr(hapd, DRV_BR_PORT_ATTR_HAIRPIN_MODE,
+++	if (!conf->snoop_iface[0] &&
+++	    hostapd_drv_br_port_set_attr(hapd, DRV_BR_PORT_ATTR_HAIRPIN_MODE,
++ 					 1)) {
++ 		wpa_printf(MSG_DEBUG,
++ 			   "x_snoop: Failed to enable hairpin_mode on the bridge port");
++ 		return -1;
++ 	}
++ 
++-	if (hostapd_drv_br_port_set_attr(hapd, DRV_BR_PORT_ATTR_PROXYARP, 1)) {
+++	if (!conf->snoop_iface[0] &&
+++	    hostapd_drv_br_port_set_attr(hapd, DRV_BR_PORT_ATTR_PROXYARP, 1)) {
++ 		wpa_printf(MSG_DEBUG,
++ 			   "x_snoop: Failed to enable proxyarp on the bridge port");
++ 		return -1;
++@@ -52,7 +54,8 @@ int x_snoop_init(struct hostapd_data *ha
++ 	}
++ 
++ #ifdef CONFIG_IPV6
++-	if (hostapd_drv_br_set_net_param(hapd, DRV_BR_MULTICAST_SNOOPING, 1)) {
+++	if (!conf->snoop_iface[0] &&
+++	    hostapd_drv_br_set_net_param(hapd, DRV_BR_MULTICAST_SNOOPING, 1)) {
++ 		wpa_printf(MSG_DEBUG,
++ 			   "x_snoop: Failed to enable multicast snooping on the bridge");
++ 		return -1;
++@@ -71,8 +74,12 @@ x_snoop_get_l2_packet(struct hostapd_dat
 + {
 + 	struct hostapd_bss_config *conf = hapd->conf;
 + 	struct l2_packet_data *l2;

backports/0020-procd-add-uxc-support.patch

@@ -0,0 +1,170 @@
+From aab305d662fa77ef4495574c096cb1e065c1908a Mon Sep 17 00:00:00 2001
+From: John Crispin <john@phrozen.org>
+Date: Sun, 25 Jul 2021 13:32:37 +0200
+Subject: [PATCH 20/27] procd: add uxc support
+
+Signed-off-by: John Crispin <john@phrozen.org>
+---
+ package/system/procd/Makefile       | 12 ++---
+ package/system/procd/files/procd.sh | 79 +++++++++++++++++++++++++++++
+ package/system/procd/files/uxc.init |  4 ++
+ 3 files changed, 89 insertions(+), 6 deletions(-)
+
+diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile
+index 30d5adf427..98f1ed1775 100644
+--- a/package/system/procd/Makefile
++++ b/package/system/procd/Makefile
+@@ -12,9 +12,9 @@ PKG_RELEASE:=$(AUTORELEASE)
+ 
+ PKG_SOURCE_PROTO:=git
+ PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.git
+-PKG_SOURCE_DATE:=2021-02-23
+-PKG_SOURCE_VERSION:=37eed131e9967a35f47bacb3437a9d3c8a57b3f4
+-PKG_MIRROR_HASH:=2b0131ff9055ccf987cbeb5f36c2c2585dc780999df6be312fbbbcd61ce676d4
++PKG_SOURCE_DATE:=2021-08-15
++PKG_SOURCE_VERSION:=104b49d6ab25a8cf067e6d8d1f2da7defb9876d4
++PKG_MIRROR_HASH:=d13b566a14e84f6babe8b7d3dfb88e34c3dff0e97d7770d6fe71174685bca628
+ CMAKE_INSTALL:=1
+ 
+ PKG_LICENSE:=GPL-2.0
+@@ -32,7 +32,7 @@ include $(INCLUDE_DIR)/package.mk
+ include $(INCLUDE_DIR)/cmake.mk
+ 
+ ifeq ($(DUMP),)
+-  STAMP_CONFIGURED:=$(strip $(STAMP_CONFIGURED))_$(shell echo $(CONFIG_TARGET_INIT_PATH) | mkhash md5)
++  STAMP_CONFIGURED:=$(strip $(STAMP_CONFIGURED))_$(shell echo $(CONFIG_TARGET_INIT_PATH) | $(MKHASH) md5)
+ endif
+ 
+ CMAKE_OPTIONS += -DEARLY_PATH="$(TARGET_INIT_PATH)"
+@@ -82,7 +82,7 @@ endef
+ define Package/procd-seccomp
+   SECTION:=base
+   CATEGORY:=Base system
+-  DEPENDS:=@(arm||armeb||mips||mipsel||i386||powerpc||x86_64) @!TARGET_uml \
++  DEPENDS:=@(aarch64||arm||armeb||mips||mipsel||i386||powerpc||x86_64) @!TARGET_uml \
+ 	  @KERNEL_SECCOMP +libubox +libblobmsg-json
+   TITLE:=OpenWrt process seccomp helper + utrace
+ endef
+@@ -90,7 +90,7 @@ endef
+ define Package/uxc
+   SECTION:=base
+   CATEGORY:=Base system
+-  DEPENDS:=+procd-ujail +libubus +libubox +libblobmsg-json
++  DEPENDS:=+procd-ujail +libubus +libubox +libblobmsg-json +blockd +rpcd
+   TITLE:=OpenWrt container management
+   MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
+ endef
+diff --git a/package/system/procd/files/procd.sh b/package/system/procd/files/procd.sh
+index d86b7219da..3549a5a914 100644
+--- a/package/system/procd/files/procd.sh
++++ b/package/system/procd/files/procd.sh
+@@ -329,6 +329,82 @@ _procd_add_config_trigger() {
+ 	json_close_array
+ }
+ 
++_procd_add_mount_trigger() {
++	json_add_array
++	_procd_add_array_data "$1"
++	local action="$2"
++	local multi=0
++	shift ; shift
++
++	json_add_array
++	_procd_add_array_data "if"
++
++	if [ "$2" ]; then
++		json_add_array
++		_procd_add_array_data "or"
++		multi=1
++	fi
++
++	while [ "$1" ]; do
++		json_add_array
++		_procd_add_array_data "eq" "target" "$1"
++		shift
++		json_close_array
++	done
++
++	[ $multi = 1 ] && json_close_array
++
++	json_add_array
++	_procd_add_array_data "run_script" /etc/init.d/$name $action
++	json_close_array
++
++	json_close_array
++	_procd_add_timeout
++	json_close_array
++}
++
++_procd_add_action_mount_trigger() {
++	local script=$(readlink "$initscript")
++	local name=$(basename ${script:-$initscript})
++	local action="$1"
++	local mpath
++	shift
++
++	_procd_open_trigger
++	_procd_add_mount_trigger mount.add $action "$@"
++	_procd_close_trigger
++}
++
++procd_get_mountpoints() {
++	(
++		__procd_check_mount() {
++			local cfg="$1"
++			local path="${2%%/}/"
++			local target
++			config_get target "$cfg" target
++			target="${target%%/}/"
++			[ "$path" != "${path##$target}" ] && echo "${target%%/}"
++		}
++
++		config_load fstab
++		for mpath in "$@"; do
++			config_foreach __procd_check_mount mount "$mpath"
++		done
++	) | sort -u
++}
++
++_procd_add_restart_mount_trigger() {
++	local mountpoints="$(procd_get_mountpoints "$@")"
++	[ "${mountpoints//[[:space:]]}" ] &&
++		_procd_add_action_mount_trigger restart $mountpoints
++}
++
++_procd_add_reload_mount_trigger() {
++	local mountpoints="$(procd_get_mountpoints "$@")"
++	[ "${mountpoints//[[:space:]]}" ] &&
++		_procd_add_action_mount_trigger reload $mountpoints
++}
++
+ _procd_add_raw_trigger() {
+ 	json_add_array
+ 	_procd_add_array_data "$1"
+@@ -560,8 +636,11 @@ _procd_wrapper \
+ 	procd_add_raw_trigger \
+ 	procd_add_config_trigger \
+ 	procd_add_interface_trigger \
++	procd_add_mount_trigger \
+ 	procd_add_reload_trigger \
+ 	procd_add_reload_interface_trigger \
++	procd_add_reload_mount_trigger \
++	procd_add_restart_mount_trigger \
+ 	procd_open_trigger \
+ 	procd_close_trigger \
+ 	procd_open_instance \
+diff --git a/package/system/procd/files/uxc.init b/package/system/procd/files/uxc.init
+index 035c8b0b9e..1e75b796f8 100644
+--- a/package/system/procd/files/uxc.init
++++ b/package/system/procd/files/uxc.init
+@@ -16,3 +16,7 @@ boot() {
+ 	__BOOT_UXC=1
+ 	start
+ }
++
++service_triggers() {
++	procd_add_raw_trigger "mount.add" 3000 /etc/init.d/uxc boot
++}
+-- 
+2.25.1
+

backports/0021-build-create-APK-files-parrallel-to-IPK.patch

@@ -0,0 +1,174 @@
+From 23c15e2536d0fa5ed81c5bdfe7623d3370dca997 Mon Sep 17 00:00:00 2001
+From: Paul Spooren <mail@aparcar.org>
+Date: Fri, 2 Oct 2020 23:30:30 -1000
+Subject: [PATCH 21/27] build: create APK files parrallel to IPK
+
+Create APK files based on the folder and control files of IPK packages.
+
+Signed-off-by: Paul Spooren <mail@aparcar.org>
+---
+ include/package-ipkg.mk     | 48 +++++++++++++++++++++++++------------
+ package/Makefile            |  2 ++
+ package/base-files/Makefile |  4 ++++
+ rules.mk                    |  2 ++
+ scripts/apk-make-index.sh   | 20 ++++++++++++++++
+ 5 files changed, 61 insertions(+), 15 deletions(-)
+ create mode 100755 scripts/apk-make-index.sh
+
+diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
+index e972b7de0b..5c31b1774f 100644
+--- a/include/package-ipkg.mk
++++ b/include/package-ipkg.mk
+@@ -102,6 +102,7 @@ ifeq ($(DUMP),)
+     ABIV_$(1):=$(call FormatABISuffix,$(1),$(ABI_VERSION))
+     PDIR_$(1):=$(call FeedPackageDir,$(1))
+     IPKG_$(1):=$$(PDIR_$(1))/$(1)$$(ABIV_$(1))_$(VERSION)_$(PKGARCH).ipk
++    APK_$(1):=$$(PDIR_$(1))/$(1)$$(ABIV_$(1))_$(VERSION)_$(PKGARCH).apk
+     IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg-$(PKGARCH)/$(1)
+     KEEP_$(1):=$(strip $(call Package/$(1)/conffiles))
+ 
+@@ -200,7 +201,7 @@ $(_endef)
+     $(PKG_INFO_DIR)/$(1).provides $$(IPKG_$(1)): $(STAMP_BUILT) $(INCLUDE_DIR)/package-ipkg.mk
+ 	@rm -rf $$(IDIR_$(1)); \
+ 		$$(call remove_ipkg_files,$(1),$$(call opkg_package_files,$(call gen_ipkg_wildcard,$(1))))
+-	mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1))/CONTROL $(PKG_INFO_DIR)
++	mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1)) $(PKG_INFO_DIR)
+ 	$(call Package/$(1)/install,$$(IDIR_$(1)))
+ 	$(if $(Package/$(1)/install-overlay),mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1))/rootfs-overlay)
+ 	$(call Package/$(1)/install-overlay,$$(IDIR_$(1))/rootfs-overlay)
+@@ -226,6 +227,37 @@ $(_endef)
+ 		) || true \
+ 	)
+     endif
++
++    ifneq ($$(KEEP_$(1)),)
++		@( \
++			keepfiles=""; \
++			for x in $$(KEEP_$(1)); do \
++				[ -f "$$(IDIR_$(1))/$$$$x" ] || keepfiles="$$$${keepfiles:+$$$$keepfiles }$$$$x"; \
++			done; \
++			[ -z "$$$$keepfiles" ] || { \
++				mkdir -p $$(IDIR_$(1))/lib/upgrade/keep.d; \
++				for x in $$$$keepfiles; do echo $$$$x >> $$(IDIR_$(1))/lib/upgrade/keep.d/$(1); done; \
++			}; \
++		)
++    endif
++
++	$(INSTALL_DIR) $$(PDIR_$(1))
++
++	$(FAKEROOT) apk mkpkg \
++	  --info "name:$(1)" \
++	  --info "version:$(VERSION)" \
++	  --info "description:$()" \
++	  --info "arch:$(PKGARCH)" \
++	  --info "license:$(LICENSE)" \
++	  --info "origin:$(SOURCE)" \
++	  --info "maintainer:$(MAINTAINER)" \
++	  $$(foreach dep,$$(Package/$(1)/DEPENDS),--info "depends:$$(subst $$(comma),,$$(dep))") \
++	  --files "$$(IDIR_$(1))" \
++	  --output "$$(APK_$(1))" \
++	  --sign "$(BUILD_KEY_APK_SEC)"
++
++	mkdir -p $$(IDIR_$(1))/CONTROL
++
+ 	(cd $$(IDIR_$(1))/CONTROL; \
+ 		( \
+ 			echo "$$$$CONTROL"; \
+@@ -249,20 +281,6 @@ $(_endef)
+ 		$($(1)_COMMANDS) \
+ 	)
+ 
+-    ifneq ($$(KEEP_$(1)),)
+-		@( \
+-			keepfiles=""; \
+-			for x in $$(KEEP_$(1)); do \
+-				[ -f "$$(IDIR_$(1))/$$$$x" ] || keepfiles="$$$${keepfiles:+$$$$keepfiles }$$$$x"; \
+-			done; \
+-			[ -z "$$$$keepfiles" ] || { \
+-				mkdir -p $$(IDIR_$(1))/lib/upgrade/keep.d; \
+-				for x in $$$$keepfiles; do echo $$$$x >> $$(IDIR_$(1))/lib/upgrade/keep.d/$(1); done; \
+-			}; \
+-		)
+-    endif
+-
+-	$(INSTALL_DIR) $$(PDIR_$(1))
+ 	$(FAKEROOT) $(SCRIPT_DIR)/ipkg-build -m "$(FILE_MODES)" $$(IDIR_$(1)) $$(PDIR_$(1))
+ 	@[ -f $$(IPKG_$(1)) ]
+ 
+diff --git a/package/Makefile b/package/Makefile
+index ec503dc527..18a19fff13 100644
+--- a/package/Makefile
++++ b/package/Makefile
+@@ -60,6 +60,7 @@ $(curdir)/merge-index: $(curdir)/merge
+ 
+ ifndef SDK
+   $(curdir)/compile: $(curdir)/system/opkg/host/compile
++  $(patsubst %,$(curdir)/%/compile,$(filter-out %/apk/host,$($(curdir)/builddirs))): $(curdir)/system/apk/host/compile
+ endif
+ 
+ $(curdir)/install: $(TMP_DIR)/.build $(curdir)/merge $(if $(CONFIG_TARGET_PER_DEVICE_ROOTFS),$(curdir)/merge-index)
+@@ -84,6 +85,7 @@ $(curdir)/index: FORCE
+ 	@for d in $(PACKAGE_SUBDIRS); do ( \
+ 		mkdir -p $$d; \
+ 		cd $$d || continue; \
++		$(SCRIPT_DIR)/apk-make-index.sh . 2>&1; \
+ 		$(SCRIPT_DIR)/ipkg-make-index.sh . 2>&1 > Packages.manifest; \
+ 		grep -vE '^(Maintainer|LicenseFiles|Source|SourceName|Require|SourceDateEpoch)' Packages.manifest > Packages; \
+ 		case "$$(((64 + $$(stat -L -c%s Packages)) % 128))" in 110|111) \
+diff --git a/package/base-files/Makefile b/package/base-files/Makefile
+index 8a1ddf96f5..9db4812981 100644
+--- a/package/base-files/Makefile
++++ b/package/base-files/Makefile
+@@ -107,6 +107,10 @@ ifdef CONFIG_SIGNED_PACKAGES
+ 	[ -s $(BUILD_KEY).ucert ] || \
+ 		$(STAGING_DIR_HOST)/bin/ucert -I -c $(BUILD_KEY).ucert -p $(BUILD_KEY).pub -s $(BUILD_KEY)
+ 
++	[ -s $(BUILD_KEY_APK_SEC) -a -s $(BUILD_KEY_APK_PUB) ] || \
++		openssl ecparam -name prime256v1 -genkey -noout -out $(BUILD_KEY_APK_SEC); \
++		openssl ec -in $(BUILD_KEY_APK_SEC) -pubout > $(BUILD_KEY_APK_PUB)
++
+   endef
+ 
+ ifndef CONFIG_BUILDBOT
+diff --git a/rules.mk b/rules.mk
+index f31d9bb113..de81b65d46 100644
+--- a/rules.mk
++++ b/rules.mk
+@@ -258,6 +258,8 @@ else
+ endif
+ 
+ BUILD_KEY=$(TOPDIR)/key-build
++BUILD_KEY_APK_SEC=$(TOPDIR)/private-key.pem
++BUILD_KEY_APK_PUB=$(TOPDIR)/public-key.pem
+ 
+ FAKEROOT:=$(STAGING_DIR_HOST)/bin/fakeroot
+ 
+diff --git a/scripts/apk-make-index.sh b/scripts/apk-make-index.sh
+new file mode 100755
+index 0000000000..df1f1a2e2b
+--- /dev/null
++++ b/scripts/apk-make-index.sh
+@@ -0,0 +1,20 @@
++#!/usr/bin/env bash
++set -e
++
++pkg_dir=$1
++
++if [ -z "$pkg_dir" ] || [ ! -d "$pkg_dir" ]; then
++	echo "Usage: apk-make-index <package_directory>" >&2
++	exit 1
++fi
++
++(
++	cd "$pkg_dir" || exit 1
++	GLOBIGNORE="kernel*:libc*"
++	set -- *.apk
++	if [ "$1" = '*.apk' ]; then
++		echo "No APK packages found"
++	fi
++	apk index --output APKINDEX.tar.gz "$@"
++	unset GLOBIGNORE
++)
+-- 
+2.25.1
+

backports/0022-fstools-update-to-git-HEAD.patch

@@ -0,0 +1,69 @@
+From 8e8b3e443a7f1d0644f43888c8683698f26d4d13 Mon Sep 17 00:00:00 2001
+From: Daniel Golle <daniel@makrotopia.org>
+Date: Sun, 25 Jul 2021 01:20:31 +0100
+Subject: [PATCH 22/27] fstools: update to git HEAD
+
+ bad1835 fstools: add partname volume driver
+ 19d7d93 libfstools: partname: several fixes
+ 3c38f0c libfstools: fix build with glibc
+ d05ad93 libfstools: remove superflus include
+ 964d1e3 partname: allow skipping existing 'rootfs_data' partition
+ c44b40b overlay: fix syncronizing typo
+ b5397a1 fstools: block: fix segfault on mount with no target
+ bd7cc8d block: use dynamically allocated target string
+ 6d8450e blockd: use allocated strings instead of fixed buffers
+ d47909e libblkid-tiny: fix buffer overflow
+ 67d2297 block: match device path instead of assuming /dev/%s
+ 2aeba88 block: allow autofs and umount commands also on MTD/UBI
+ 3d40a1b blockd: add missing #define _GNU_SOURCE
+ 4d4dcfb blockd: detect mountpoint of /dev/mapper/*
+ 2f42515 block: resolve /dev/mapper/* name for /dev/dm-0 when hotplugging
+ 39558a1 blockd: also send ubus notification on mount hotplug
+ 3386b6b blockd: fix trigger name
+ cdc9939 blockd: move to its own POSIX process group
+ 59f7c11 blockd: create mountpoint parent folder if needed
+ 9cc96af Revert "block: resolve /dev/mapper/* name for /dev/dm-0 when hotplugging"
+ 06334ac Revert "blockd: detect mountpoint of /dev/mapper/*"
+ 9ab3551 block: use /dev/dm-* instead of /dev/mapper/*
+ 5114595 block: allow remove hotplug event to arrive at blockd
+ a846c6b blockd: fix length of timeout int passed to ioctl
+ 1d681ca block: support umount device basename
+
+Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+---
+ package/system/fstools/Makefile          | 6 +++---
+ package/system/fstools/files/blockd.init | 1 +
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/package/system/fstools/Makefile b/package/system/fstools/Makefile
+index 2da508d541..b582a17bae 100644
+--- a/package/system/fstools/Makefile
++++ b/package/system/fstools/Makefile
+@@ -12,9 +12,9 @@ PKG_RELEASE:=1
+ 
+ PKG_SOURCE_PROTO:=git
+ PKG_SOURCE_URL=$(PROJECT_GIT)/project/fstools.git
+-PKG_MIRROR_HASH:=a485792d90c71cd4fb396ce97f42a57ee4d2a3d78e5f3fd0748270ffb14209e6
+-PKG_SOURCE_DATE:=2021-01-04
+-PKG_SOURCE_VERSION:=c53b18820756f6f32ad0782d3bf489422b7c4ad3
++PKG_MIRROR_HASH:=6a457b812166e04e2244ee1be92a4957666b5d1554315c0e18db1b30376cc617
++PKG_SOURCE_DATE:=2021-07-28
++PKG_SOURCE_VERSION:=cc63933faedd8d4fcdabb872cf4661ac04fe4ba2
+ CMAKE_INSTALL:=1
+ 
+ PKG_LICENSE:=GPL-2.0
+diff --git a/package/system/fstools/files/blockd.init b/package/system/fstools/files/blockd.init
+index a4ce57d40d..bdd8bbf622 100755
+--- a/package/system/fstools/files/blockd.init
++++ b/package/system/fstools/files/blockd.init
+@@ -16,6 +16,7 @@ reload_service() {
+ start_service() {
+ 	procd_open_instance
+ 	procd_set_param command "$PROG"
++	procd_set_param watch block
+ 	procd_set_param respawn
+ 	procd_close_instance
+ }
+-- 
+2.25.1
+

backports/0023-tools-libressl-update-to-3.3.3.patch

@@ -0,0 +1,40 @@
+From 873052b99d6597209957ec32898fa56324cf34a4 Mon Sep 17 00:00:00 2001
+From: Rosen Penev <rosenp@gmail.com>
+Date: Sat, 19 Jun 2021 14:45:11 -0700
+Subject: [PATCH 23/27] tools/libressl: update to 3.3.3
+
+Fix wrong FPIC variable usage. Fixes compilation under sparc64 host.
+
+Signed-off-by: Rosen Penev <rosenp@gmail.com>
+(cherry picked from commit bf4dbbb55e2b8e23f186e1334f1e9ce6a3a8ddfe)
+---
+ tools/libressl/Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tools/libressl/Makefile b/tools/libressl/Makefile
+index 2b5a33450c..e25b5661ee 100644
+--- a/tools/libressl/Makefile
++++ b/tools/libressl/Makefile
+@@ -8,8 +8,8 @@
+ include $(TOPDIR)/rules.mk
+ 
+ PKG_NAME:=libressl
+-PKG_VERSION:=3.3.1
+-PKG_HASH:=a6d331865e0164a13ac85a228e52517f7cf8f8488f2f95f34e7857302f97cfdb
++PKG_VERSION:=3.3.3
++PKG_HASH:=a471565b36ccd1a70d0bd7d37c6e95c43a26a62829b487d9d2cdebfe58be3066
+ PKG_RELEASE:=1
+ 
+ PKG_CPE_ID:=cpe:/a:openbsd:libressl
+@@ -25,7 +25,7 @@ include $(INCLUDE_DIR)/host-build.mk
+ 
+ HOSTCC := $(HOSTCC_NOCACHE)
+ HOST_CONFIGURE_ARGS += --enable-static --disable-shared --disable-tests
+-HOST_CFLAGS += $(FPIC)
++HOST_CFLAGS += $(HOST_FPIC)
+ 
+ ifeq ($(GNU_HOST_NAME),x86_64-linux-gnux32)
+ HOST_CONFIGURE_ARGS += --disable-asm
+-- 
+2.25.1
+

backports/0025-apk-backport-package.patch

@@ -0,0 +1,312 @@
+From bf98d3c1de524ca50cbc09f825a4b0648e353624 Mon Sep 17 00:00:00 2001
+From: John Crispin <john@phrozen.org>
+Date: Fri, 13 Aug 2021 08:47:11 +0200
+Subject: [PATCH 25/27] apk: backport package
+
+Signed-off-by: John Crispin <john@phrozen.org>
+---
+ package/system/apk/Makefile                   | 93 +++++++++++++++++++
+ ...vel@lists.alpinelinux.org-4a6a0840.rsa.pub |  9 ++
+ ...vel@lists.alpinelinux.org-5243ef4b.rsa.pub |  9 ++
+ ...vel@lists.alpinelinux.org-5261cecb.rsa.pub |  9 ++
+ package/system/apk/files/alpine-repositories  |  3 +
+ .../apk/patches/000-Makefile-version.patch    | 11 +++
+ .../patches/0001-remove-doc-generation.patch  | 21 +++++
+ package/system/apk/patches/100-link.patch     | 16 ++++
+ package/system/apk/patches/100-phtread.patch  | 12 +++
+ ...ude-limits.h-to-fix-build-with-glibc.patch | 20 ++++
+ package/system/apk/test.sh                    |  9 ++
+ 11 files changed, 212 insertions(+)
+ create mode 100644 package/system/apk/Makefile
+ create mode 100644 package/system/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-4a6a0840.rsa.pub
+ create mode 100644 package/system/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-5243ef4b.rsa.pub
+ create mode 100644 package/system/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-5261cecb.rsa.pub
+ create mode 100644 package/system/apk/files/alpine-repositories
+ create mode 100644 package/system/apk/patches/000-Makefile-version.patch
+ create mode 100644 package/system/apk/patches/0001-remove-doc-generation.patch
+ create mode 100644 package/system/apk/patches/100-link.patch
+ create mode 100644 package/system/apk/patches/100-phtread.patch
+ create mode 100644 package/system/apk/patches/100-tar-include-limits.h-to-fix-build-with-glibc.patch
+ create mode 100644 package/system/apk/test.sh
+
+diff --git a/package/system/apk/Makefile b/package/system/apk/Makefile
+new file mode 100644
+index 0000000000..335f50c155
+--- /dev/null
++++ b/package/system/apk/Makefile
+@@ -0,0 +1,93 @@
++include $(TOPDIR)/rules.mk
++
++PKG_NAME:=apk
++PKG_VERSION:=3.0.0_pre0
++
++PKG_SOURCE_PROTO:=git
++PKG_SOURCE_URL:=https://git.alpinelinux.org/apk-tools.git
++PKG_SOURCE_DATE:=2021-08-17
++PKG_SOURCE_VERSION:=a46043bcc4cc15b456ef1eac5c5f9d93bd905d53
++PKG_MIRROR_HASH:=e16fd04b18043e78a177acd8c6958fa03fd1484b62c879c2dd0bed8ce9c50625
++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_DATE)-$(call version_abbrev,$(PKG_SOURCE_VERSION))
++PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
++HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_SOURCE_SUBDIR)
++PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.xz
++PKG_RELEASE:=r$(PKG_SOURCE_DATE)-$(call version_abbrev,$(PKG_SOURCE_VERSION))-$(AUTORELEASE)
++
++PKG_MAINTAINER:=Paul Spooren <mail@aparcar.org>
++PKG_LICENSE:=GPL-2.0-only
++PKG_LICENSE_FILES:=LICENSE
++
++PKG_INSTALL:=1
++PKG_BUILD_PARALLEL:=1
++
++HOST_BUILD_DEPENDS:=lua/host lua-lzlib/host
++PKG_BUILD_DEPENDS:=$(HOST_BUILD_DEPENDS)
++
++include $(INCLUDE_DIR)/package.mk
++include $(INCLUDE_DIR)/host-build.mk
++
++define Package/apk
++  SECTION:=utils
++  CATEGORY:=Utilities
++  TITLE:=apk package manager
++  DEPENDS:=+liblua +libopenssl +zlib @!arc
++  URL:=$(PKG_SOURCE_URL)
++endef
++
++define Package/alpine-keys
++  SECTION:=utils
++  CATEGORY:=Utilities
++  TITLE:=Alpine apk public signing keys
++  DEPENDS:=apk
++endef
++
++define Package/alpine-repositories
++  SECTION:=utils
++  CATEGORY:=Utilities
++  TITLE:=Official Alpine repositories
++  DEPENDS:=apk
++endef
++
++MAKE_FLAGS += \
++	LUA=$(STAGING_DIR_HOSTPKG)/bin/lua \
++	LUA_VERSION=5.1 \
++	LUA_PC=lua
++
++HOST_MAKE_FLAGS += \
++	LUA=$(STAGING_DIR_HOSTPKG)/bin/lua \
++	LUA_VERSION=5.1 \
++	DESTDIR=$(STAGING_DIR_HOSTPKG) \
++	SBINDIR=/bin \
++	PREFIX=
++
++HOST_LDFLAGS+=-Wl,-rpath=$(STAGING_DIR_HOSTPKG)/lib -lpthread
++
++define Package/apk/install
++	$(INSTALL_DIR) $(1)/lib/apk/db
++
++	$(INSTALL_DIR) $(1)/bin
++	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/apk $(1)/bin/apk
++
++	$(INSTALL_DIR) $(1)/usr/lib
++	$(CP) $(PKG_INSTALL_DIR)/lib/*.so.* $(1)/usr/lib/
++
++	$(INSTALL_DIR) $(1)/etc/apk/
++	echo $(ARCH) > $(1)/etc/apk/arch
++	touch $(1)/etc/apk/world
++endef
++
++define Package/alpine-keys/install
++	$(INSTALL_DIR) $(1)/etc/apk/keys
++	$(INSTALL_DATA) ./files/alpine-keys/* $(1)/etc/apk/keys
++endef
++
++define Package/alpine-repositories/install
++	$(INSTALL_DIR) $(1)/etc/apk/keys
++	$(INSTALL_DATA) ./files/alpine-repositories $(1)/etc/apk/repositories
++endef
++
++$(eval $(call BuildPackage,apk))
++$(eval $(call BuildPackage,alpine-keys))
++$(eval $(call BuildPackage,alpine-repositories))
++$(eval $(call HostBuild))
+diff --git a/package/system/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-4a6a0840.rsa.pub b/package/system/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-4a6a0840.rsa.pub
+new file mode 100644
+index 0000000000..bb4bdc80fd
+--- /dev/null
++++ b/package/system/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-4a6a0840.rsa.pub
+@@ -0,0 +1,9 @@
++-----BEGIN PUBLIC KEY-----
++MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1yHJxQgsHQREclQu4Ohe
++qxTxd1tHcNnvnQTu/UrTky8wWvgXT+jpveroeWWnzmsYlDI93eLI2ORakxb3gA2O
++Q0Ry4ws8vhaxLQGC74uQR5+/yYrLuTKydFzuPaS1dK19qJPXB8GMdmFOijnXX4SA
++jixuHLe1WW7kZVtjL7nufvpXkWBGjsfrvskdNA/5MfxAeBbqPgaq0QMEfxMAn6/R
++L5kNepi/Vr4S39Xvf2DzWkTLEK8pcnjNkt9/aafhWqFVW7m3HCAII6h/qlQNQKSo
++GuH34Q8GsFG30izUENV9avY7hSLq7nggsvknlNBZtFUcmGoQrtx3FmyYsIC8/R+B
++ywIDAQAB
++-----END PUBLIC KEY-----
+diff --git a/package/system/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-5243ef4b.rsa.pub b/package/system/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-5243ef4b.rsa.pub
+new file mode 100644
+index 0000000000..6cbfad7441
+--- /dev/null
++++ b/package/system/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-5243ef4b.rsa.pub
+@@ -0,0 +1,9 @@
++-----BEGIN PUBLIC KEY-----
++MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvNijDxJ8kloskKQpJdx+
++mTMVFFUGDoDCbulnhZMJoKNkSuZOzBoFC94omYPtxnIcBdWBGnrm6ncbKRlR+6oy
++DO0W7c44uHKCFGFqBhDasdI4RCYP+fcIX/lyMh6MLbOxqS22TwSLhCVjTyJeeH7K
++aA7vqk+QSsF4TGbYzQDDpg7+6aAcNzg6InNePaywA6hbT0JXbxnDWsB+2/LLSF2G
++mnhJlJrWB1WGjkz23ONIWk85W4S0XB/ewDefd4Ly/zyIciastA7Zqnh7p3Ody6Q0
++sS2MJzo7p3os1smGjUF158s6m/JbVh4DN6YIsxwl2OjDOz9R0OycfJSDaBVIGZzg
++cQIDAQAB
++-----END PUBLIC KEY-----
+diff --git a/package/system/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-5261cecb.rsa.pub b/package/system/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-5261cecb.rsa.pub
+new file mode 100644
+index 0000000000..83f0658e9c
+--- /dev/null
++++ b/package/system/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-5261cecb.rsa.pub
+@@ -0,0 +1,9 @@
++-----BEGIN PUBLIC KEY-----
++MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwlzMkl7b5PBdfMzGdCT0
++cGloRr5xGgVmsdq5EtJvFkFAiN8Ac9MCFy/vAFmS8/7ZaGOXoCDWbYVLTLOO2qtX
++yHRl+7fJVh2N6qrDDFPmdgCi8NaE+3rITWXGrrQ1spJ0B6HIzTDNEjRKnD4xyg4j
++g01FMcJTU6E+V2JBY45CKN9dWr1JDM/nei/Pf0byBJlMp/mSSfjodykmz4Oe13xB
++Ca1WTwgFykKYthoLGYrmo+LKIGpMoeEbY1kuUe04UiDe47l6Oggwnl+8XD1MeRWY
++sWgj8sF4dTcSfCMavK4zHRFFQbGp/YFJ/Ww6U9lA3Vq0wyEI6MCMQnoSMFwrbgZw
++wwIDAQAB
++-----END PUBLIC KEY-----
+diff --git a/package/system/apk/files/alpine-repositories b/package/system/apk/files/alpine-repositories
+new file mode 100644
+index 0000000000..5babbb23b4
+--- /dev/null
++++ b/package/system/apk/files/alpine-repositories
+@@ -0,0 +1,3 @@
++https://dl-cdn.alpinelinux.org/alpine/edge/main
++https://dl-cdn.alpinelinux.org/alpine/edge/community
++
+diff --git a/package/system/apk/patches/000-Makefile-version.patch b/package/system/apk/patches/000-Makefile-version.patch
+new file mode 100644
+index 0000000000..2e7f5b0f15
+--- /dev/null
++++ b/package/system/apk/patches/000-Makefile-version.patch
+@@ -0,0 +1,11 @@
++--- a/Makefile
+++++ b/Makefile
++@@ -4,7 +4,7 @@
++ -include config.mk
++ 
++ PACKAGE := apk-tools
++-VERSION := 2.12.0
+++VERSION := 3.0.0_pre0
++ 
++ export VERSION
++ 
+diff --git a/package/system/apk/patches/0001-remove-doc-generation.patch b/package/system/apk/patches/0001-remove-doc-generation.patch
+new file mode 100644
+index 0000000000..dee05c56f2
+--- /dev/null
++++ b/package/system/apk/patches/0001-remove-doc-generation.patch
+@@ -0,0 +1,21 @@
++From b05a93c48fdbb50f0c464310dc2ce45777d32ea2 Mon Sep 17 00:00:00 2001
++From: Paul Spooren <mail@aparcar.org>
++Date: Fri, 2 Oct 2020 14:08:52 -1000
++Subject: [PATCH] remove doc generation
++
++Signed-off-by: Paul Spooren <mail@aparcar.org>
++---
++ Makefile | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++--- a/Makefile
+++++ b/Makefile
++@@ -25,7 +25,7 @@ export DESTDIR SBINDIR LIBDIR CONFDIR MA
++ ##
++ # Top-level subdirs
++ 
++-subdirs		:= libfetch/ src/ doc/
+++subdirs		:= libfetch/ src/
++ 
++ ##
++ # Include all rules and stuff
+diff --git a/package/system/apk/patches/100-link.patch b/package/system/apk/patches/100-link.patch
+new file mode 100644
+index 0000000000..9cae2787d9
+--- /dev/null
++++ b/package/system/apk/patches/100-link.patch
+@@ -0,0 +1,16 @@
++diff -urN apk-2021-08-17-a46043bc.orig/src/Makefile apk-2021-08-17-a46043bc/src/Makefile
++--- apk-2021-08-17-a46043bc.orig/src/Makefile	2021-08-17 14:21:04.117760513 +0200
+++++ apk-2021-08-17-a46043bc/src/Makefile	2021-08-17 14:21:16.653830180 +0200
++@@ -65,7 +65,11 @@
++ 	app_convdb.o app_convndx.o app_del.o app_dot.o app_extract.o app_fetch.o \
++ 	app_fix.o app_index.o app_info.o app_list.o app_manifest.o app_mkndx.o \
++ 	app_mkpkg.o app_policy.o app_update.o app_upgrade.o app_search.o \
++-	app_stats.o app_verify.o app_version.o app_vertest.o applet.o
+++	app_stats.o app_verify.o app_version.o app_vertest.o applet.o \
+++	adb.o adb_comp.o adb_walk_adb.o adb_walk_genadb.o adb_walk_gentext.o adb_walk_text.o apk_adb.o \
+++	atom.o blob.o commit.o common.o context.o crypto_openssl.o database.o hash.o \
+++	extract.o extract_v2.o extract_v3.o io.o io_gunzip.o io_url.o tar.o \
+++	package.o pathbuilder.o print.o solver.o trust.o version.o
++ 
++ ifeq ($(ADB),y)
++ libapk.so.$(libapk_soname)-objs += apk_adb.o
+diff --git a/package/system/apk/patches/100-phtread.patch b/package/system/apk/patches/100-phtread.patch
+new file mode 100644
+index 0000000000..c252e14dc1
+--- /dev/null
++++ b/package/system/apk/patches/100-phtread.patch
+@@ -0,0 +1,12 @@
++diff -urN apk-2021-07-23-3d203e8f.orig/src/Makefile apk-2021-07-23-3d203e8f/src/Makefile
++--- apk-2021-07-23-3d203e8f.orig/src/Makefile	2021-07-25 12:55:05.576564663 +0200
+++++ apk-2021-07-23-3d203e8f/src/Makefile	2021-07-25 12:55:48.660862181 +0200
++@@ -87,7 +87,7 @@
++ apk.static-libs		:= $(apk-static-libs)
++ LDFLAGS_apk.static	:= -static
++ LIBS_apk.static		:= -Wl,--as-needed -ldl -Wl,--no-as-needed
++-LDFLAGS_apk		+= -L$(obj)
+++LDFLAGS_apk		+= -L$(obj) -pthread
++ LDFLAGS_apk-test	+= -L$(obj)
++ 
++ CFLAGS_ALL		+= $(OPENSSL_CFLAGS) $(ZLIB_CFLAGS)
+diff --git a/package/system/apk/patches/100-tar-include-limits.h-to-fix-build-with-glibc.patch b/package/system/apk/patches/100-tar-include-limits.h-to-fix-build-with-glibc.patch
+new file mode 100644
+index 0000000000..43ec7d5f1a
+--- /dev/null
++++ b/package/system/apk/patches/100-tar-include-limits.h-to-fix-build-with-glibc.patch
+@@ -0,0 +1,20 @@
++From c72ea983e287ec1d8b1f2b3aab1bf40aa7a30b03 Mon Sep 17 00:00:00 2001
++From: Daniel Golle <daniel@makrotopia.org>
++Date: Wed, 4 Aug 2021 21:37:40 +0100
++Subject: [PATCH] tar: include <limits.h> to fix build with glibc
++
++Signed-off-by: Daniel Golle <daniel@makrotopia.org>
++---
++ src/tar.c | 1 +
++ 1 file changed, 1 insertion(+)
++
++--- a/src/tar.c
+++++ b/src/tar.c
++@@ -9,6 +9,7 @@
++ 
++ #include <sys/stat.h>
++ #include <sys/sysmacros.h>
+++#include <limits.h> /* for SSIZE_MAX with glibc */
++ 
++ #include "apk_defines.h"
++ #include "apk_tar.h"
+diff --git a/package/system/apk/test.sh b/package/system/apk/test.sh
+new file mode 100644
+index 0000000000..814777fd70
+--- /dev/null
++++ b/package/system/apk/test.sh
+@@ -0,0 +1,9 @@
++#!/bin/sh
++
++case "$1" in
++    "apk")
++        apk --version | grep "${2/-r*/}"
++        ;;
++    *)
++        return 0;
++esac
+-- 
+2.25.1
+

backports/0026-lua-lzlib-backport-package.patch

@@ -0,0 +1,104 @@
+From ec862d472fca676cc04ce71b640e880ecefdd477 Mon Sep 17 00:00:00 2001
+From: John Crispin <john@phrozen.org>
+Date: Fri, 13 Aug 2021 08:48:02 +0200
+Subject: [PATCH 26/27] lua-lzlib: backport package
+
+Signed-off-by: John Crispin <john@phrozen.org>
+---
+ package/libs/lua-lzlib/Makefile               | 64 +++++++++++++++++++
+ .../patches/001-allow_optim_flags.patch       | 12 ++++
+ 2 files changed, 76 insertions(+)
+ create mode 100644 package/libs/lua-lzlib/Makefile
+ create mode 100644 package/libs/lua-lzlib/patches/001-allow_optim_flags.patch
+
+diff --git a/package/libs/lua-lzlib/Makefile b/package/libs/lua-lzlib/Makefile
+new file mode 100644
+index 0000000000..5e0a16b135
+--- /dev/null
++++ b/package/libs/lua-lzlib/Makefile
+@@ -0,0 +1,64 @@
++#
++# Copyright (C) 2015 OpenWrt.org
++#
++# This is free software, licensed under the GNU General Public License v2.
++# See /LICENSE for more information.
++#
++
++include $(TOPDIR)/rules.mk
++
++PKG_NAME:=lua-lzlib
++PKG_VERSION:=0.4.3
++PKG_RELEASE:=1
++PKG_MAINTAINER:=Dirk Chang <dirk@kooiot.com>
++PKG_LICENSE:=MIT
++
++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
++PKG_MIRROR_HASH:=b6ef5e3f04b7f2137b39931a175ee802489a2486e70537770919bcccca10e723
++PKG_SOURCE_URL:=https://github.com/LuaDist/lzlib.git
++PKG_SOURCE_PROTO:=git
++PKG_SOURCE_VERSION:=79329a07d8f79c19eadd7ea2752b4c4e1574b015
++PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
++
++HOST_BUILD_DEPENDS:=lua/host
++
++include $(INCLUDE_DIR)/package.mk
++include $(INCLUDE_DIR)/host-build.mk
++
++define Package/lua-lzlib
++  SUBMENU:=Lua
++  SECTION:=lang
++  CATEGORY:=Languages
++  TITLE:=Lua zlib binding
++  URL:=http://github.com/LuaDist/lzlib
++  DEPENDS:= +lua +zlib
++endef
++
++define Package/lua-lzlib/description
++	A library to access zlib library functions and also to read/write gzip files using an interface similar to the base io package. 
++endef
++
++MAKE_FLAGS += \
++	LUA="$(STAGING_DIR)/usr" \
++	OFLAGS="$(TARGET_CFLAGS)" \
++
++HOST_MAKE_FLAGS += \
++	LUA="$(STAGING_DIR_HOSTPKG)" \
++	OFLAGS="$(HOST_CFLAGS)" \
++
++define Package/lua-lzlib/install
++	$(INSTALL_DIR) $(1)/usr/lib/lua
++	$(INSTALL_BIN) $(PKG_BUILD_DIR)/zlib.so $(1)/usr/lib/lua/
++
++	$(INSTALL_DATA) $(PKG_BUILD_DIR)/gzip.lua $(1)/usr/lib/lua/
++endef
++
++define Host/Install
++	$(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/lib/lua/5.1
++	$(INSTALL_BIN) $(HOST_BUILD_DIR)/zlib.so $(STAGING_DIR_HOSTPKG)/lib/lua/5.1
++
++	$(INSTALL_DATA) $(HOST_BUILD_DIR)/gzip.lua $(STAGING_DIR_HOSTPKG)/lib/lua/5.1
++endef
++
++$(eval $(call BuildPackage,lua-lzlib))
++$(eval $(call HostBuild))
+diff --git a/package/libs/lua-lzlib/patches/001-allow_optim_flags.patch b/package/libs/lua-lzlib/patches/001-allow_optim_flags.patch
+new file mode 100644
+index 0000000000..78f981d237
+--- /dev/null
++++ b/package/libs/lua-lzlib/patches/001-allow_optim_flags.patch
+@@ -0,0 +1,12 @@
++--- a/Makefile
+++++ b/Makefile
++@@ -14,7 +14,8 @@ LUABIN= $(LUA)/bin
++ ZLIB=../zlib-1.2.3
++ 
++ # no need to change anything below here
++-CFLAGS= $(INCS) $(DEFS) $(WARN) -O0 -fPIC
+++CFLAGS= $(INCS) $(DEFS) $(WARN) $(OFLAGS) -fPIC
+++OFLAGS= -O0
++ WARN= -g -Werror -Wall -pedantic #-ansi
++ INCS= -I$(LUAINC) -I$(ZLIB)
++ LIBS= -L$(ZLIB) -lz -L$(LUALIB) -L$(LUABIN) #-llua51
+-- 
+2.25.1
+

backports/0027-lua-make-it-easier-to-detect-host-built-Lua.patch

@@ -0,0 +1,35 @@
+From 5fc717aa60b36934892d6d77c0637fc53aa7f761 Mon Sep 17 00:00:00 2001
+From: Daniel Golle <daniel@makrotopia.org>
+Date: Sat, 10 Jul 2021 20:21:26 +0100
+Subject: [PATCH 27/27] lua: make it easier to detect host-built Lua
+
+Install pkg-config file also for host-build, clean up Lua symlinks.
+
+Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+(cherry picked from commit 315f52e0f3bfa3d65ad14ca21a696c6d31c4edcd)
+---
+ package/utils/lua/Makefile | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/package/utils/lua/Makefile b/package/utils/lua/Makefile
+index d262d1e1fc..e15142d8d2 100644
+--- a/package/utils/lua/Makefile
++++ b/package/utils/lua/Makefile
+@@ -134,8 +134,12 @@ define Host/Install
+ 		INSTALL_TOP="$(STAGING_DIR_HOSTPKG)" \
+ 		install
+ 
+-	$(LN) $(STAGING_DIR_HOSTPKG)/bin/lua5.1 $(STAGING_DIR_HOSTPKG)/bin/lua
+-	$(LN) $(STAGING_DIR_HOSTPKG)/bin/luac5.1 $(STAGING_DIR_HOSTPKG)/bin/luac
++	$(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/lib/pkgconfig
++	$(CP) $(HOST_BUILD_DIR)/etc/lua.pc $(STAGING_DIR_HOSTPKG)/lib/pkgconfig/lua5.1.pc
++
++	$(LN) lua5.1 $(STAGING_DIR_HOSTPKG)/bin/lua
++	$(LN) luac5.1 $(STAGING_DIR_HOSTPKG)/bin/luac
++	$(LN) lua5.1.pc $(STAGING_DIR_HOSTPKG)/lib/pkgconfig/lua.pc
+ endef
+ 
+ define Build/InstallDev
+-- 
+2.25.1
+

backports/0035-uhttp-update-to-latest-HEAD.patch

@@ -1,157 +0,0 @@
-From patchwork Fri Aug 20 13:11:12 2021
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: Stijn Tintel <stijn@linux-ipv6.be>
-X-Patchwork-Id: 1519040
-X-Patchwork-Delegate: stijn@linux-ipv6.be
-Return-Path: 
- <openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org>
-X-Original-To: incoming@patchwork.ozlabs.org
-Delivered-To: patchwork-incoming@bilbo.ozlabs.org
-Authentication-Results: ozlabs.org;
- spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org
- (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org;
- envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org;
- receiver=<UNKNOWN>)
-Authentication-Results: ozlabs.org;
-	dkim=pass (2048-bit key;
- secure) header.d=lists.infradead.org header.i=@lists.infradead.org
- header.a=rsa-sha256 header.s=bombadil.20210309 header.b=r2Ly8Vhy;
-	dkim=fail reason="signature verification failed" (1024-bit key;
- unprotected) header.d=linux-ipv6.be header.i=@linux-ipv6.be
- header.a=rsa-sha256 header.s=502B7754-045F-11E5-BBC5-64595FD46BE8
- header.b=BipII9T0;
-	dkim-atps=neutral
-Received: from bombadil.infradead.org (bombadil.infradead.org
- [IPv6:2607:7c80:54:e::133])
-	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
-	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest
- SHA256)
-	(No client certificate requested)
-	by ozlabs.org (Postfix) with ESMTPS id 4Grhsz3FQvz9s1l
-	for <incoming@patchwork.ozlabs.org>; Fri, 20 Aug 2021 23:13:59 +1000 (AEST)
-DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
-	d=lists.infradead.org; s=bombadil.20210309; h=Sender:
-	Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post:
-	List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc
-	:To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:
-	Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:
-	List-Owner; bh=Dxw7atu76L/aBQntt7pW1jTYPCULL0mkcY2U1BYT2sI=; b=r2Ly8VhysFZseN
-	kLaheAFj130coCdyeHSxT/951GnDDBkmyursFZAP2hBLaKv9Z+9HpHIGM3sOiNhM/zDKfabNJ/1D2
-	CV4iyPpVkhRxG9t6HPpPx94E6J5Oknl7l6eyL04DWUB28EzXcoBSMiP0zYsoOWjI8sQO8wITNp6hf
-	neAM1VlZlNb22n5/Wu5oD1RoEiMUS5GeyhU7kEFEWpC45rcpyuQdvHpPLMn5GkcqCOO6i90E7BKAK
-	ipYG2tptIjqjrmR+nC6CPRavA+hSG/o6HzDSYNJvWmgVjCc6RpN/xliN03Rum4+mbDtMEB4Wpidmj
-	FepfgPqKxWRJ0UiXBJew==;
-Received: from localhost ([::1] helo=bombadil.infradead.org)
-	by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux))
-	id 1mH4J2-00BF23-C2; Fri, 20 Aug 2021 13:11:32 +0000
-Received: from mail.tintel.eu ([51.83.127.189])
- by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux))
- id 1mH4Iw-00BF1P-CR
- for openwrt-devel@lists.openwrt.org; Fri, 20 Aug 2021 13:11:30 +0000
-Received: from localhost (localhost [IPv6:::1])
- by mail.tintel.eu (Postfix) with ESMTP id 1BE4C4486AC4;
- Fri, 20 Aug 2021 15:11:14 +0200 (CEST)
-Received: from mail.tintel.eu ([IPv6:::1])
- by localhost (mail.tintel.eu [IPv6:::1]) (amavisd-new, port 10032)
- with ESMTP id npDXmiQngdDU; Fri, 20 Aug 2021 15:11:13 +0200 (CEST)
-Received: from localhost (localhost [IPv6:::1])
- by mail.tintel.eu (Postfix) with ESMTP id 5B1EC4486ACC;
- Fri, 20 Aug 2021 15:11:13 +0200 (CEST)
-DKIM-Filter: OpenDKIM Filter v2.10.3 mail.tintel.eu 5B1EC4486ACC
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-ipv6.be;
- s=502B7754-045F-11E5-BBC5-64595FD46BE8; t=1629465073;
- bh=3YKw9bephsRsf4MDuHSX4MioHjRWefi/5PEc54pFn4g=;
- h=From:To:Date:Message-Id:MIME-Version;
- b=BipII9T0eY8ENYqcdZ7rxKFn6rwkKKOhJ2IoeLZ1fx4lgpPuGWsZrexzqU6mYTDRa
- Aihei2/ovPeWgUDbzfjNC9hIqv0fXRaEW0sCAPZGOP6gNHWNCkJxuPqYI+4pjijRRt
- 6YYC2qCi8DqzQJv7St1FqeVFoIaF8SfbniBW+1N4=
-X-Virus-Scanned: amavisd-new at mail.tintel.eu
-Received: from mail.tintel.eu ([IPv6:::1])
- by localhost (mail.tintel.eu [IPv6:::1]) (amavisd-new, port 10026)
- with ESMTP id J5m0pY66LdR7; Fri, 20 Aug 2021 15:11:13 +0200 (CEST)
-Received: from taz.sof.bg.adlevio.net (unknown [IPv6:2001:67c:21bc:20::10])
- by mail.tintel.eu (Postfix) with SMTP id 17DF94486AC4;
- Fri, 20 Aug 2021 15:11:13 +0200 (CEST)
-Received: (nullmailer pid 141125 invoked by uid 1000);
- Fri, 20 Aug 2021 13:11:12 -0000
-From: Stijn Tintel <stijn@linux-ipv6.be>
-To: openwrt-devel@lists.openwrt.org
-Cc: nbd@nbd.name
-Subject: [PATCH] uhttpd: add config option for json_script
-Date: Fri, 20 Aug 2021 16:11:12 +0300
-Message-Id: <20210820131112.141077-1-stijn@linux-ipv6.be>
-X-Mailer: git-send-email 2.31.1
-MIME-Version: 1.0
-X-Rspamd-Queue-Id: 17DF94486AC4
-X-Spamd-Result: default: False [0.00 / 15.00];
- IP_WHITELIST(0.00)[2001:67c:21bc:20::10];
- ASN(0.00)[asn:200533, ipnet:2001:67c:21bc::/48, country:BG]
-X-Rspamd-Server: skulls
-X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 
-X-CRM114-CacheID: sfid-20210820_061126_592239_17869382 
-X-CRM114-Status: UNSURE (   9.50  )
-X-CRM114-Notice: Please train this message.
-X-Spam-Score: 0.2 (/)
-X-Spam-Report: Spam detection software,
- running on the system "bombadil.infradead.org",
- has NOT identified this incoming email as spam.  The original
- message has been attached to this so you can view it or label
- similar future email.  If you have any questions, see
- the administrator of that system for details.
- Content preview: Add a config option for json_script instead of
- unconditionally
- including all json files in /etc/uhttpd in every uhttpd instance. This makes
- it possible to configure a single instance with an unconditi [...]
- Content analysis details:   (0.2 points, 5.0 required)
- pts rule name              description
- ---- ----------------------
- --------------------------------------------------
- -0.0 SPF_PASS               SPF: sender matches SPF record
- -0.0 SPF_HELO_PASS          SPF: HELO matches SPF record
- 0.1 DKIM_SIGNED            Message has a DKIM or DK signature,
- not necessarily
- valid
- 0.1 DKIM_INVALID           DKIM or DK signature exists, but is not valid
-X-BeenThere: openwrt-devel@lists.openwrt.org
-X-Mailman-Version: 2.1.34
-Precedence: list
-List-Id: OpenWrt Development List <openwrt-devel.lists.openwrt.org>
-List-Unsubscribe: <https://lists.openwrt.org/mailman/options/openwrt-devel>,
- <mailto:openwrt-devel-request@lists.openwrt.org?subject=unsubscribe>
-List-Archive: <http://lists.openwrt.org/pipermail/openwrt-devel/>
-List-Post: <mailto:openwrt-devel@lists.openwrt.org>
-List-Help: <mailto:openwrt-devel-request@lists.openwrt.org?subject=help>
-List-Subscribe: <https://lists.openwrt.org/mailman/listinfo/openwrt-devel>,
- <mailto:openwrt-devel-request@lists.openwrt.org?subject=subscribe>
-Sender: "openwrt-devel" <openwrt-devel-bounces@lists.openwrt.org>
-Errors-To: 
- openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org
-
-Add a config option for json_script instead of unconditionally including
-all json files in /etc/uhttpd in every uhttpd instance. This makes it
-possible to configure a single instance with an unconditional redirect,
-which is currently not possible as it would render all other uhttpd
-instances unusable.
-
-Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
----
- package/network/services/uhttpd/Makefile          | 2 +-
- package/network/services/uhttpd/files/uhttpd.init | 3 ++-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/package/network/services/uhttpd/files/uhttpd.init b/package/network/services/uhttpd/files/uhttpd.init
-index e7709941c2..30fd7b4259 100755
---- a/package/network/services/uhttpd/files/uhttpd.init
-+++ b/package/network/services/uhttpd/files/uhttpd.init
-@@ -196,7 +196,8 @@ start_instance()
- 		append_bool "$cfg" redirect_https "-q" 0
- 	}
- 
--	for file in /etc/uhttpd/*.json; do
-+	config_get json_script "$cfg" json_script
-+	for file in $json_script; do
- 		[ -s "$file" ] && procd_append_param command -H "$file"
- 	done
- 

backports/0036-iwinfo-update-to-latest-git-HEAD.patch

@@ -1,39 +0,0 @@
-From c90fec205137d8d8c1197722a39d5c700ae3f6b1 Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Mon, 21 Jun 2021 12:53:28 +0200
-Subject: [PATCH 02/36] iwinfo: update to latest git HEAD
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- package/network/utils/iwinfo/Makefile | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/package/network/utils/iwinfo/Makefile b/package/network/utils/iwinfo/Makefile
-index 3454d615a9..b7c8370bba 100644
---- a/package/network/utils/iwinfo/Makefile
-+++ b/package/network/utils/iwinfo/Makefile
-@@ -11,9 +11,9 @@ PKG_RELEASE:=1
- 
- PKG_SOURCE_PROTO:=git
- PKG_SOURCE_URL=$(PROJECT_GIT)/project/iwinfo.git
--PKG_SOURCE_DATE:=2021-01-31
--PKG_SOURCE_VERSION:=4a32b33e9606f1bc1125f4bc24b0581349e55f2e
--PKG_MIRROR_HASH:=414e5d150efaadba21103e66f862be66a94dcf83c16a2850f7c05051a9b0739d
-+PKG_SOURCE_DATE:=2021-06-09
-+PKG_SOURCE_VERSION:=c0414642fead263a4a6a686ad3cb7e965ec8a23a
-+PKG_MIRROR_HASH:=c5686bbae86753c53db03a686b034bbb80d31107cc359ebd8522ea1c82db35ea
- PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
- PKG_LICENSE:=GPL-2.0
- 
-@@ -25,7 +25,7 @@ PKG_CONFIG_DEPENDS := \
- 	CONFIG_PACKAGE_kmod-brcm-wl-mimo \
- 	CONFIG_PACKAGE_kmod-cfg80211
- 
--IWINFO_ABI_VERSION:=20210106
-+IWINFO_ABI_VERSION:=20210430
- 
- include $(INCLUDE_DIR)/package.mk
- 
--- 
-2.25.1
-

backports/0037-netifd-update-to-latest-HEAD.patch

@@ -1,105 +0,0 @@
-From 79a45074651c08e0036d4b05b9714bd0f714a115 Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Thu, 27 May 2021 13:24:47 +0200
-Subject: [PATCH 06/52] netifd: update to latest HEAD
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- package/network/config/netifd/Makefile          | 14 +++++++++-----
- .../network/config/netifd/files/etc/udhcpc.user |  1 +
- .../config/netifd/files/lib/netifd/dhcp.script  |  3 +++
- .../netifd/patches/002-fix-dhcp-issue.patch     | 17 +++++++++++++++++
- 4 files changed, 30 insertions(+), 5 deletions(-)
- create mode 100644 package/network/config/netifd/files/etc/udhcpc.user
- create mode 100644 package/network/config/netifd/patches/002-fix-dhcp-issue.patch
-
-diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile
-index 7061456b08..c33e0c2134 100644
---- a/package/network/config/netifd/Makefile
-+++ b/package/network/config/netifd/Makefile
-@@ -5,16 +5,14 @@ PKG_RELEASE:=1
- 
- PKG_SOURCE_PROTO:=git
- PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git
--PKG_SOURCE_DATE:=2021-01-09
--PKG_SOURCE_VERSION:=c00c8335d6188daa326ecfe5a62da15a9b9987e1
--PKG_MIRROR_HASH:=c740e51e0cec13eec336ba1c7a643db3b64a9a2235f8c1b73a566cb89e841190
-+PKG_SOURCE_DATE:=2021-08-24
-+PKG_SOURCE_VERSION:=454e9c33c90691d5bea12263f1801a7dc38c20b1
-+PKG_MIRROR_HASH:=b8c6d8a1d0cb60c353c0272b8a526d8e28e6ee7d385e96b18018d1bc13b54cc2
- PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
- 
- PKG_LICENSE:=GPL-2.0
- PKG_LICENSE_FILES:=
- 
--PKG_BUILD_PARALLEL:=1
--
- include $(INCLUDE_DIR)/package.mk
- include $(INCLUDE_DIR)/cmake.mk
- 
-@@ -25,6 +23,11 @@ define Package/netifd
-   TITLE:=OpenWrt Network Interface Configuration Daemon
- endef
- 
-+define Package/netifd/conffiles
-+/etc/udhcpc.user
-+/etc/udhcpc.user.d/
-+endef
-+
- TARGET_CFLAGS += \
- 	-I$(STAGING_DIR)/usr/include/libnl-tiny \
- 	-I$(STAGING_DIR)/usr/include \
-@@ -40,6 +43,7 @@ define Package/netifd/install
- 	$(INSTALL_DIR) $(1)/sbin
- 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/netifd $(1)/sbin/
- 	$(CP) ./files/* $(1)/
-+	$(INSTALL_DIR) $(1)/etc/udhcpc.user.d/
- 	$(CP) $(PKG_BUILD_DIR)/scripts/* $(1)/lib/netifd/
- endef
- 
-diff --git a/package/network/config/netifd/files/etc/udhcpc.user b/package/network/config/netifd/files/etc/udhcpc.user
-new file mode 100644
-index 0000000000..78e2ba5f18
---- /dev/null
-+++ b/package/network/config/netifd/files/etc/udhcpc.user
-@@ -0,0 +1 @@
-+# This script is sourced by udhcpc's dhcp.script at every DHCP event.
-diff --git a/package/network/config/netifd/files/lib/netifd/dhcp.script b/package/network/config/netifd/files/lib/netifd/dhcp.script
-index 6585b641d6..e46005d84c 100755
---- a/package/network/config/netifd/files/lib/netifd/dhcp.script
-+++ b/package/network/config/netifd/files/lib/netifd/dhcp.script
-@@ -112,5 +112,8 @@ esac
- 
- # user rules
- [ -f /etc/udhcpc.user ] && . /etc/udhcpc.user "$@"
-+for f in /etc/udhcpc.user.d/*; do
-+	[ -f "$f" ] && (. "$f" "$@")
-+done
- 
- exit 0
-diff --git a/package/network/config/netifd/patches/002-fix-dhcp-issue.patch b/package/network/config/netifd/patches/002-fix-dhcp-issue.patch
-new file mode 100644
-index 0000000000..6f1d2e708e
---- /dev/null
-+++ b/package/network/config/netifd/patches/002-fix-dhcp-issue.patch
-@@ -0,0 +1,17 @@
-+Index: netifd-2019-08-05-5e02f944/interface.c
-+===================================================================
-+--- netifd-2019-08-05-5e02f944.orig/interface.c
-++++ netifd-2019-08-05-5e02f944/interface.c
-+@@ -424,7 +424,11 @@ interface_main_dev_cb(struct device_user
-+ 		interface_set_link_state(iface, false);
-+ 		break;
-+ 	case DEV_EVENT_TOPO_CHANGE:
-+-		interface_proto_event(iface->proto, PROTO_CMD_RENEW, false);
-++	/* This renews the dhcp lease when the bridge adds/deletes a
-++	 * new interface. It causes some dhcp servers to fail in
-++	 * case where there are many interfaces being added to the
-++	 * bridge frequently. Disabling this for now. */
-++	/*	interface_proto_event(iface->proto, PROTO_CMD_RENEW, false); */
-+ 		return;
-+ 	default:
-+ 		break;
--- 
-2.25.1
-

backports/0040-mt76-update-to-latest-HEAD.patch

@@ -1,51 +0,0 @@
-From e01de214b2492e1b8001d6057211017b5f0f6f49 Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Thu, 27 May 2021 13:25:41 +0200
-Subject: [PATCH 04/44] mt76: update to latest HEAD
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- package/kernel/mt76/Makefile | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile
-index e9e95fa9b3..431c57a240 100644
---- a/package/kernel/mt76/Makefile
-+++ b/package/kernel/mt76/Makefile
-@@ -8,11 +8,12 @@ PKG_LICENSE_FILES:=
- 
- PKG_SOURCE_URL:=https://github.com/openwrt/mt76
- PKG_SOURCE_PROTO:=git
--PKG_SOURCE_DATE:=2021-04-11
--PKG_SOURCE_VERSION:=bf45b30d891961dd7c4139dddb58b909ea2c2b5a
--PKG_MIRROR_HASH:=431cecf80dafa986e805f809522721c2bb26289867d6770695d49baf8b471bea
-+PKG_SOURCE_DATE:=2021-07-15
-+PKG_SOURCE_VERSION:=bbebea7d6dc64313132226adc3f7369d36e9359d
-+PKG_MIRROR_HASH:=17cd74e72c1f6c8742b698bf6772afacc6fba71b233af8c4d59530600cf44d5b
- 
- PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
-+PKG_USE_NINJA:=0
- PKG_BUILD_PARALLEL:=1
- 
- PKG_CONFIG_DEPENDS += \
-@@ -155,7 +156,7 @@ define KernelPackage/mt7615-common
-   $(KernelPackage/mt76-default)
-   TITLE:=MediaTek MT7615 wireless driver common code
-   HIDDEN:=1
--  DEPENDS+=@PCI_SUPPORT +kmod-mt76-core +kmod-mt76-connac
-+  DEPENDS+=@PCI_SUPPORT +kmod-mt76-core +kmod-mt76-connac +kmod-hwmon-core
-   FILES:= $(PKG_BUILD_DIR)/mt7615/mt7615-common.ko
- endef
- 
-@@ -213,7 +214,7 @@ endef
- define KernelPackage/mt7915e
-   $(KernelPackage/mt76-default)
-   TITLE:=MediaTek MT7915e wireless driver
--  DEPENDS+=@PCI_SUPPORT +kmod-mt7615-common +@DRIVER_11AX_SUPPORT
-+  DEPENDS+=@PCI_SUPPORT +kmod-mt7615-common +kmod-hwmon-core +kmod-thermal +@DRIVER_11AX_SUPPORT
-   FILES:= $(PKG_BUILD_DIR)/mt7915/mt7915e.ko
-   AUTOLOAD:=$(call AutoProbe,mt7915e)
- endef
--- 
-2.25.1
-

backports/0041-ar71xx-hacks.patch

@@ -1,53 +0,0 @@
-From d01d8c9e5cf7de98222860011d1d5b362bfde005 Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Mon, 12 Jul 2021 13:09:25 +0200
-Subject: [PATCH 01/39] ar71xx: hacks
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- package/kernel/linux/modules/crypto.mk                 | 2 +-
- package/kernel/mac80211/ath.mk                         | 1 +
- target/linux/ar71xx/files/arch/mips/ath79/mach-rb91x.c | 2 ++
- 3 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk
-index 19b0d4696b..1b1c1e1a51 100644
---- a/package/kernel/linux/modules/crypto.mk
-+++ b/package/kernel/linux/modules/crypto.mk
-@@ -882,7 +882,7 @@ define KernelPackage/crypto-sha256
- 	CONFIG_CRYPTO_SHA256_SSSE3
-   FILES:= \
- 	$(LINUX_DIR)/crypto/sha256_generic.ko \
--	$(LINUX_DIR)/lib/crypto/libsha256.ko
-+	$(LINUX_DIR)/lib/crypto/libsha256.ko@ge4.15
-   AUTOLOAD:=$(call AutoLoad,09,sha256_generic)
-   $(call AddDepends/crypto)
- endef
-diff --git a/package/kernel/mac80211/ath.mk b/package/kernel/mac80211/ath.mk
-index ba03ae11a6..ad2860a98e 100644
---- a/package/kernel/mac80211/ath.mk
-+++ b/package/kernel/mac80211/ath.mk
-@@ -43,6 +43,7 @@ config-$(call config_package,ath9k) += ATH9K
- config-$(call config_package,ath9k-common) += ATH9K_COMMON
- config-$(call config_package,owl-loader) += ATH9K_PCI_NO_EEPROM
- config-$(CONFIG_TARGET_ath79) += ATH9K_AHB
-+config-$(CONFIG_TARGET_ar71xx) += ATH9K_AHB
- config-$(CONFIG_TARGET_ipq40xx) += ATH10K_AHB
- config-$(CONFIG_PCI) += ATH9K_PCI
- config-$(CONFIG_ATH_USER_REGD) += ATH_USER_REGD ATH_REG_DYNAMIC_USER_REG_HINTS
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb91x.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb91x.c
-index 9620718962..2cdf97efd6 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb91x.c
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb91x.c
-@@ -271,6 +271,8 @@ static const struct rb_board_info rb711gr100_boards[] __initconst = {
- 	RB_BOARD_INFO("911G-5HPnD", 0),
- 	RB_BOARD_INFO("912UAG-2HPnD", RB91X_FLAG_USB | RB91X_FLAG_PCIE),
- 	RB_BOARD_INFO("912UAG-5HPnD", RB91X_FLAG_USB | RB91X_FLAG_PCIE),
-+	RB_BOARD_INFO("RB912UAG-2HPnD", RB91X_FLAG_USB | RB91X_FLAG_PCIE),
-+	RB_BOARD_INFO("RB912UAG-5HPnD", RB91X_FLAG_USB | RB91X_FLAG_PCIE),
- };
- 
- static u32 rb711gr100_get_flags(const struct rb_info *info)
--- 
-2.25.1
-

config.yml

@@ -1,6 +1,6 @@
 repo:  https://github.com/openwrt/openwrt.git
 branch: openwrt-21.02
-revision: 6fd65c657351908302b37447675ee352ec927d93
+revision: 378769b5551714ccaa821b481bfeecbf362f351e
 output_dir: ./output
 
 patch_folders:

feeds/third-party/chilli-redirect/files/usr/share/ucentral/templates/third-party/chilli-redirect.uc

@@ -9,18 +9,28 @@ let keys = {
 	uamport: 3990,
 	radiusauthport: 1812,
 	radiusacctport: 1813,
-	radiusserver1: true,
-	radiusserver2: true,
-	radiusnasid: true,
-	uamallowed: true,
-	uamdomain: true,
+	radiusserver1: false,
+	radiusserver2: false,
+	radiusnasid: false,
+	uamallowed: false,
+	uamdomain: false,
 	defidletimeout: 0,
 	definteriminterval: 300,
 	acctupdate: 9,
-	uamserver: true,
-	radiussecret: true,
-	nasmac: true,
+	uamserver: false,
+	radiussecret: false,
+	nasmac: false,
+	macauth: false,
+	macpassword: false,
 };
+
+function get_value(key, value) {
+	if (key in chilli_redirect)
+		return chilli_redirect[key];
+
+	return value ? value : '';
+}
+
 %}
 
 set chilli.@chilli[0].dhcpif='{{ name }}'
@@ -41,5 +51,5 @@ set chilli.@chilli[0].nasip='10.0.0.1'
 {% endif %}
 
 {% for (let k, v in keys): %}
-set chilli.@chilli[0].{{ k }}='{{ chilli_redirect[k] ? chilli_redirect[k] : v}}'
+set chilli.@chilli[0].{{ k }}='{{ get_value(k, v) }}'
 {% endfor %}

feeds/ucentral/poco/Makefile

@@ -1,110 +0,0 @@
-#
-# Copyright (C) 2007-2016 OpenWrt.org
-# Copyright (C) 2017 Daniel Engberg <daniel.engberg.lists@pyret.net>
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=poco
-PKG_RELEASE:=2
-PKG_VERSION:=1.10.1
-
-ifeq ($(BUILD_VARIANT),all)
-_PKG_VERSION:=${PKG_VERSION}-all
-PKG_HASH:=2cde4b50778013ab3b7a522aa59bccaa7e85a8ccfc654a354c4d9611b6ce1758
-else
-_PKG_VERSION:=${PKG_VERSION}
-PKG_HASH:=a0a5a03d87c585f1a43def33bfc52c0c34a528e43a7b13bc83841a7c00adde39
-endif
-
-PKG_SOURCE:=$(PKG_NAME)-$(_PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=https://pocoproject.org/releases/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_LICENSE:=BSL-1.0
-PKG_LICENSE_FILES:=LICENSE
-PKG_CPE_ID:=cpe:/a:pocoproject:poco
-
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(_PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
-
-define Package/poco
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Poco C++ libraries
-  URL:=https://www.pocoproject.org/
-  DEPENDS:=+libstdcpp +libpthread +librt @!arc
-  MAINTAINER:=Jean-Michel Julien <jean-michel.julien@trilliantinc.com>
-  VARIANT:=minimal
-endef
-
-define Package/poco/description
-  POrtable COmponents, a modern and powerful open source C++ class libraries
-  and frameworks for building network and internet-based applications that
-  run on desktop, server and embedded systems.
-endef
-
-define Package/poco-all
-  $(call Package/poco)
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE+=(Complete Edition)
-  DEPENDS+=+libopenssl
-  VARIANT:=all
-endef
-
-define Package/poco-all/description
-  POrtable COmponents, a modern and powerful open source C++ class libraries
-  and frameworks for building network and internet-based applications that
-  run on desktop, server and embedded systems. The Complete Edition contains
-  all libraries.
-endef
-
-CONFIGURE_ARGS += \
-	--config=Linux \
-	--no-tests \
-	--no-samples \
-	--no-fpenvironment \
-	--no-sharedmemory \
-	--no-wstring \
-	--shared
-
-ifeq ($(BUILD_VARIANT),all)
-	CONFIGURE_ARGS += \
-		--typical
-	POCO_LIBS={Foundation,XML,JSON,Net,Util,Crypto,NetSSL,Encodings,Util,Data,DataSQLite,JWT}
-else
-	CONFIGURE_ARGS += \
-		--poquito \
-		--minimal
-	POCO_LIBS={Foundation,XML,JSON,Net,Util}
-endif
-
-define Package/poco/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libPoco$(POCO_LIBS).so* $(1)/usr/lib/
-endef
-
-define Package/poco-all/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libPoco$(POCO_LIBS).so* $(1)/usr/lib/
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/Poco $(1)/usr/include/
-
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libPoco$(POCO_LIBS).so* $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/cmake $(1)/usr/lib/
-endef
-
-
-$(eval $(call BuildPackage,poco))
-$(eval $(call BuildPackage,poco-all))

feeds/ucentral/poco/patches/100-configure.patch

@@ -1,15 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -237,9 +237,9 @@ while [ $# -ge 1 ]; do
- 		;;
- 
- 	*)
--		showhelp
--		exit 1
--		;;
-+#		showhelp
-+#		exit 1
-+#		;;
- 	esac
- 
-  	shift

feeds/ucentral/poco/patches/200-strerror.patch

@@ -1,11 +0,0 @@
---- a/Foundation/src/Error.cpp
-+++ b/Foundation/src/Error.cpp
-@@ -70,7 +70,7 @@ namespace Poco {
- 
- #if (_XOPEN_SOURCE >= 600) || POCO_OS == POCO_OS_ANDROID || __APPLE__
- 			setMessage(strerror_r(err, _buffer, sizeof(_buffer)));
--#elif _GNU_SOURCE
-+#elif (_GNU_SOURCE && (defined __GLIBC__ || defined __UCLIBC__))
- 			setMessage(strerror_r(err, _buffer, sizeof(_buffer)));
- #else
- 			setMessage(strerror(err));

feeds/ucentral/poco/patches/300-fp-support-environments-without-hardware-floating-po.patch

@@ -1,122 +0,0 @@
-From: =?utf-8?q?Andr=C3=A9_Draszik?= <git@andred.net>
-Date: Wed, 22 Mar 2017 11:07:16 +0000
-Subject: fp: support environments without hardware floating point
-
-| cd <build>/Foundation && \
-|    mipsel-poky-linux-musl-g++   -DFoundation_EXPORTS -DHAVE_PTHREAD_SETAFFINITY_NP -DHAVE_THREE_PARAM_SCHED_SETAFFINITY \
-|         -DPCRE_STATIC -DPOCO_HAVE_FD_EPOLL -DPOCO_NO_AUTOMATIC_LIBS -DPOCO_OS_FAMILY_UNIX -DPOCO_UNBUNDLED \
-|         -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_REENTRANT -D_THREAD_SAFE -D_XOPEN_SOURCE=500 \
-|         -I<sysroot>/usr/include -I<poco>/Foundation/include -I<poco>/Foundation/src  \
-|         -mel -mabi=32 -msoft-float -march=mips32r2 -mno-mips16  -minterlink-compressed -mtune=24kec -mdsp  \
-|         --sysroot=<sysroot> -O2 -pipe -g -feliminate-unused-debug-types \
-|         -fstack-protector-strong -pie -fpie -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security \
-|         -fvisibility-inlines-hidden  -mel -mabi=32 -msoft-float -march=mips32r2 -mno-mips16  -minterlink-compressed \
-|         -mtune=24kec -mdsp  --sysroot=<sysroot> -O2 -g -DNDEBUG -fPIC   \
-|         -o CMakeFiles/Foundation.dir/src/ArchiveStrategy.cpp.o \
-|         -c <poco>/Foundation/src/ArchiveStrategy.cpp
-| In file included from <poco>/Foundation/include/Poco/FPEnvironment.h:33:0,
-|                  from <poco>/Foundation/include/Poco/NumericString.h:25,
-|                  from <poco>/Foundation/include/Poco/NumberFormatter.h:24,
-|                  from <poco>/Foundation/include/Poco/ArchiveStrategy.h:27,
-|                  from <poco>/Foundation/src/ArchiveStrategy.cpp:17:
-| <poco>/Foundation/include/Poco/FPEnvironment_C99.h:36:30: error: 'FE_DOWNWARD' was not declared in this scope
-|    FP_ROUND_DOWNWARD_IMPL   = FE_DOWNWARD,
-|                               ^~~~~~~~~~~
-| <poco>/Foundation/include/Poco/FPEnvironment_C99.h:37:30: error: 'FE_UPWARD' was not declared in this scope
-|    FP_ROUND_UPWARD_IMPL     = FE_UPWARD,
-|                               ^~~~~~~~~
-| <poco>/Foundation/include/Poco/FPEnvironment_C99.h:39:30: error: 'FE_TOWARDZERO' was not declared in this scope
-|    FP_ROUND_TOWARDZERO_IMPL = FE_TOWARDZERO
-|                               ^~~~~~~~~~~~~
-| <poco>/Foundation/include/Poco/FPEnvironment_C99.h:43:28: error: 'FE_DIVBYZERO' was not declared in this scope
-|    FP_DIVIDE_BY_ZERO_IMPL = FE_DIVBYZERO,
-|                             ^~~~~~~~~~~~
-| <poco>/Foundation/include/Poco/FPEnvironment_C99.h:44:28: error: 'FE_INEXACT' was not declared in this scope
-|    FP_INEXACT_IMPL        = FE_INEXACT,
-|                             ^~~~~~~~~~
-| <poco>/Foundation/include/Poco/FPEnvironment_C99.h:45:28: error: 'FE_OVERFLOW' was not declared in this scope
-|    FP_OVERFLOW_IMPL       = FE_OVERFLOW,
-|                             ^~~~~~~~~~~
-| <poco>/Foundation/include/Poco/FPEnvironment_C99.h:46:28: error: 'FE_UNDERFLOW' was not declared in this scope
-|    FP_UNDERFLOW_IMPL      = FE_UNDERFLOW,
-|                             ^~~~~~~~~~~~
-| <poco>/Foundation/include/Poco/FPEnvironment_C99.h:47:28: error: 'FE_INVALID' was not declared in this scope
-|    FP_INVALID_IMPL        = FE_INVALID
-|                             ^~~~~~~~~~
-
-The reason is that some (notably FPU-less) architectures,
-including mips*-nf, don't define/implement some of the
-floating point constants, even though fenv.h is
-available.
-
-The key point is:
-  A fully standards conforming fenv.h does not have to
-  define any FE_* macros, and if it does define them,
-  then it defines macros only for the FP exceptions it
-  actually supports.
-
-See similar issue in boost:
-  https://svn.boost.org/trac/boost/ticket/11756
----
- Foundation/include/Poco/FPEnvironment_C99.h | 36 +++++++++++++++++++++++++++++
- 1 file changed, 36 insertions(+)
-
-diff --git a/Foundation/include/Poco/FPEnvironment_C99.h b/Foundation/include/Poco/FPEnvironment_C99.h
-index 0b192f5..402e6af 100644
---- a/Foundation/include/Poco/FPEnvironment_C99.h
-+++ b/Foundation/include/Poco/FPEnvironment_C99.h
-@@ -31,18 +31,54 @@ class FPEnvironmentImpl
- protected:
- 	enum RoundingModeImpl
- 	{
-+#if defined(FE_DOWNWARD)
- 		FP_ROUND_DOWNWARD_IMPL   = FE_DOWNWARD,
-+#else
-+		FP_ROUND_DOWNWARD_IMPL   = 0,
-+#endif
-+#if defined(FE_UPWARD)
- 		FP_ROUND_UPWARD_IMPL     = FE_UPWARD,
-+#else
-+		FP_ROUND_UPWARD_IMPL     = 0,
-+#endif
-+#if defined(FE_TONEAREST)
- 		FP_ROUND_TONEAREST_IMPL  = FE_TONEAREST,
-+#else
-+		FP_ROUND_TONEAREST_IMPL  = 0,
-+#endif
-+#if defined(FE_TOWARDZERO)
- 		FP_ROUND_TOWARDZERO_IMPL = FE_TOWARDZERO
-+#else
-+		FP_ROUND_TOWARDZERO_IMPL = 0
-+#endif
- 	};
- 	enum FlagImpl
- 	{
-+#if defined(FE_DIVBYZERO)
- 		FP_DIVIDE_BY_ZERO_IMPL = FE_DIVBYZERO,
-+#else
-+		FP_DIVIDE_BY_ZERO_IMPL = 0,
-+#endif
-+#if defined(FE_INEXACT)
- 		FP_INEXACT_IMPL        = FE_INEXACT,
-+#else
-+		FP_INEXACT_IMPL        = 0,
-+#endif
-+#if defined(FE_OVERFLOW)
- 		FP_OVERFLOW_IMPL       = FE_OVERFLOW,
-+#else
-+		FP_OVERFLOW_IMPL       = 0,
-+#endif
-+#if defined(FE_UNDERFLOW)
- 		FP_UNDERFLOW_IMPL      = FE_UNDERFLOW,
-+#else
-+		FP_UNDERFLOW_IMPL      = 0,
-+#endif
-+#if defined(FE_INVALID)
- 		FP_INVALID_IMPL        = FE_INVALID
-+#else
-+		FP_INVALID_IMPL        = 0
-+#endif
- 	};
- 	FPEnvironmentImpl();
- 	FPEnvironmentImpl(const FPEnvironmentImpl& env);

feeds/ucentral/ucentral-schema/Makefile

@@ -6,7 +6,7 @@ PKG_RELEASE:=1
 PKG_SOURCE_URL=https://github.com/blogic/ucentral-schema.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_DATE:=2021-02-15
-PKG_SOURCE_VERSION:=2415d8838d44bd8a110c90f1d5d35f8499ac72b2
+PKG_SOURCE_VERSION:=8dd7c83a1c7a290edf0575cbcba450d3bc91bbbe
 
 PKG_MAINTAINER:=John Crispin <john@phrozen.org>
 PKG_LICENSE:=BSD-3-Clause

feeds/ucentral/ucentral-schema/files/etc/ucentral/examples/loop-detect.json

@@ -0,0 +1,104 @@
+{
+	"uuid": 2,
+	"radios": [
+		{
+			"band": "2G",
+			"country": "CA",
+			"channel-mode": "HE",
+			"channel-width": 80,
+			"channel": 32
+		}
+	],
+
+	"switch": {
+		"loop-detection": {
+			"roles": [ "downstream" ]
+		}
+	},
+
+	"interfaces": [
+		{
+			"name": "WAN",
+			"role": "upstream",
+			"services": [ "lldp" ],
+			"ethernet": [
+				{
+					"select-ports": [
+						"WAN*"
+					]
+				}
+			],
+			"ipv4": {
+				"addressing": "dynamic"
+			},
+			"ssids": [
+				{
+					"name": "OpenWifi",
+					"wifi-bands": [
+						"2G"
+					],
+					"bss-mode": "ap",
+					"encryption": {
+						"proto": "psk2",
+						"key": "OpenWifi",
+						"ieee80211w": "optional"
+					}
+				}
+			]
+		},
+		{
+			"name": "LAN",
+			"role": "downstream",
+			"services": [ "ssh", "lldp" ],
+			"ethernet": [
+				{
+					"select-ports": [
+						"LAN*"
+					]
+				}
+			],
+			"ipv4": {
+				"addressing": "static",
+				"subnet": "192.168.1.1/24",
+				"dhcp": {
+					"lease-first": 10,
+					"lease-count": 100,
+					"lease-time": "6h"
+				}
+			},
+			"ssids": [
+				{
+					"name": "OpenWifi",
+					"wifi-bands": [
+						"2G"
+					],
+					"bss-mode": "ap",
+					"encryption": {
+						"proto": "psk2",
+						"key": "OpenWifi",
+						"ieee80211w": "optional"
+					}
+				}
+			]
+
+		}
+	],
+	"metrics": {
+		"statistics": {
+			"interval": 120,
+			"types": [ "ssids", "lldp", "clients" ]
+		},
+		"health": {
+			"interval": 120
+		}
+	},
+	"services": {
+		"lldp": {
+			"describe": "uCentral",
+			"location": "universe"
+		},
+		"ssh": {
+			"port": 22
+		}
+	}
+}

feeds/ucentral/ucentralgw/Makefile

@@ -1,52 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ucentralgw
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL=git@github.com:Telecominfraproject/wlan-cloud-ucentralgw.git
-PKG_SOURCE_DATE:=2021-03-28
-PKG_SOURCE_VERSION:=555b5fefc6337f6bc7eab9988b2d05fdc76b2381
-CMAKE_INSTALL:=1
-
-PKG_LICENSE:=BSD-3-Clause
-PKG_MAINTAINER:=John Crispin <john@phrozen.org>
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
-
-CMAKE_SHARED_LDFLAGS=""
-
-define Package/ucentralgw
-  SECTION:=ucentral
-  CATEGORY:=uCentral
-  DEPENDS:=+libstdcpp +poco-all +boost +boost-system +libyaml-cpp +zlib
-  TITLE:= uCentral Gateway
-endef
-
-define Package/mdadm/conffiles
-/etc/ucentral/
-endef
-
-TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
-CMAKE_OPTIONS += \
-	-DSMALL_BUILD=1
-
-ifeq ($(ARCH),aarch64)
-  CMAKE_OPTIONS+=-DCMAKE_SYSTEM_PROCESSOR=aarch64
-endif
-
-define Package/lldpd/conffiles
-/etc/ucentral/
-endef
-
-define Package/ucentralgw/install
-	$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/libexec/ucentral/
-
-	$(CP) ./files/* $(1)
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ucentralgw $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/cert_scripts/* $(1)/usr/libexec/ucentral/
-endef
-
-$(eval $(call BuildPackage,ucentralgw))

feeds/ucentral/ucentralgw/files/etc/init.d/ucentralgw

@@ -1,15 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=80
-
-USE_PROCD=1
-PROG=/usr/bin/ucentralgw
-
-start_service() {
-	procd_open_instance
-	procd_set_param command "$PROG"
-	procd_append_param command --file /etc/ucentral/ucentral.properties
-	procd_set_param respawn 3600 5 0
-	procd_add_mdns "ucentral" "tcp" "15002" "daemon=ucentralgw"
-	procd_close_instance
-}

feeds/ucentral/ucentralgw/files/etc/ucentral/ucentral.properties

@@ -1,153 +0,0 @@
-#
-# uCentral protocol server for devices. This is where you point
-# all your devices. You can replace the * for address by the specific
-# address of one of your interfaces
-#
-ucentral.websocket.host.0.backlog = 500
-ucentral.websocket.host.0.rootca = /etc/ucentral/certs/root.pem
-ucentral.websocket.host.0.issuer = /etc/ucentral/certs/issuer.pem
-ucentral.websocket.host.0.cert = /etc/ucentral/certs/websocket-cert.pem
-ucentral.websocket.host.0.key = /etc/ucentral/certs/websocket-key.pem
-ucentral.websocket.host.0.clientcas = /etc/ucentral/certs/clientcas.pem
-ucentral.websocket.host.0.cas = /etc/ucentral/certs/cas
-ucentral.websocket.host.0.address = *
-ucentral.websocket.host.0.port = 15002
-ucentral.websocket.host.0.security = relaxed
-ucentral.websocket.host.0.key.password = mypassword
-ucentral.websocket.maxreactors = 20
-
-#
-# REST API access
-#
-ucentral.restapi.host.0.backlog = 100
-ucentral.restapi.host.0.security = relaxed
-ucentral.restapi.host.0.rootca = /etc/ucentral/certs/restapi-ca.pem
-ucentral.restapi.host.0.address = *
-ucentral.restapi.host.0.port = 16001
-ucentral.restapi.host.0.cert = /etc/ucentral/certs/restapi-cert.pem
-ucentral.restapi.host.0.key = /etc/ucentral/certs/restapi-key.pem
-ucentral.restapi.host.0.key.password = mypassword
-
-#
-# Used to upload files to the service.
-# You should replace the 'name' vaalue with the IP address of your gateway or an FQDN
-# that your devices can reach
-#
-ucentral.fileuploader.host.0.backlog = 100
-ucentral.fileuploader.host.0.rootca = /etc/ucentral/certs/restapi-ca.pem
-ucentral.fileuploader.host.0.security = relaxed
-ucentral.fileuploader.host.0.address = *
-ucentral.fileuploader.host.0.name = 192.168.1.176
-ucentral.fileuploader.host.0.port = 16003
-ucentral.fileuploader.host.0.cert = /etc/ucentral/certs/restapi-cert.pem
-ucentral.fileuploader.host.0.key = /etc/ucentral/certs/restapi-key.pem
-ucentral.fileuploader.host.0.key.password = mypassword
-ucentral.fileuploader.path = /etc/ucentral/uploads
-ucentral.fileuploader.maxsize = 10000
-
-#
-# This section descrive how to do autoprovisioning
-# When enabled, it will allow devices that are not in the system
-# to be managed and serviced
-#
-ucentral.autoprovisioning = true
-ucentral.autoprovisioning.type.0 = AP:ea8300,edge
-ucentral.autoprovisioning.type.1 = IOT:ea8301,edge2
-ucentral.autoprovisioning.type.2 = AP:ea8302,edge6
-ucentral.service.key = /etc/ucentral/certs/websocket-key.pem
-
-#
-# Kafka
-#
-ucentral.kafka.enable = false
-ucentral.kafka.brokerlist = 127.0.0.1:9092
-
-#
-# This section select which form of persistence you need
-# Only one selected at a time. If you select multiple, this service will die if a horrible
-# death and might make your beer flat.
-#
-storage.type = sqlite
-#storage.type = postgresql
-#storage.type = mysql
-#storage.type = odbc
-
-storage.type.sqlite.db = /etc/ucentral/devices.db
-storage.type.sqlite.idletime = 120
-storage.type.sqlite.maxsessions = 128
-
-storage.type.postgresql.maxsessions = 64
-storage.type.postgresql.idletime = 60
-storage.type.postgresql.host = localhost
-storage.type.postgresql.username = stephb
-storage.type.postgresql.password = snoopy99
-storage.type.postgresql.database = ucentral
-storage.type.postgresql.port = 5432
-storage.type.postgresql.connectiontimeout = 60
-
-storage.type.mysql.maxsessions = 64
-storage.type.mysql.idletime = 60
-storage.type.mysql.host = localhost
-storage.type.mysql.username = stephb
-storage.type.mysql.password = snoopy99
-storage.type.mysql.database = ucentral
-storage.type.mysql.port = 3306
-storage.type.mysql.connectiontimeout = 60
-
-#
-# Authentication
-#
-authentication.enabled = true
-authentication.default.username = support@example.com
-authentication.default.password = support
-authentication.default.access = master
-authentication.service.type = internal
-
-ucentral.system.debug = true
-ucentral.system.id = 1
-ucentral.system.commandchannel = /tmp/app.ucentralgw
-ucentral.system.host.0.path = https://host2.com:9010
-ucentral.system.host.0.id = 2
-ucentral.system.host.1.path = https://host3.com:9010
-ucentral.system.host.1.id = 3
-ucentral.system.host.2.path = https://host4.com:9010
-ucentral.system.host.2.id = 4
-
-########################################################################
-########################################################################
-#
-# Thw following sections apply to the uCentral service
-#
-# Logging: please leave as is for now.
-#
-########################################################################
-########################################################################
-
-logging.formatters.f1.class = PatternFormatter
-logging.formatters.f1.pattern = %s: [%p] %t
-logging.formatters.f1.times = UTC
-logging.channels.c1.class = ConsoleChannel
-logging.channels.c1.formatter = f1
-logging.channels.c2.class = FileChannel
-# This is where the logs will be written. This path MUST exist
-logging.channels.c2.path = /tmp/ucentral.log
-logging.channels.c2.formatter.class = PatternFormatter
-logging.channels.c2.formatter.pattern = %Y-%m-%d %H:%M:%S %s: [%p] %t
-logging.channels.c3.class = ConsoleChannel
-logging.channels.c3.pattern = %s: [%p] %t
-# External Channel
-logging.loggers.root.channel = c2
-logging.loggers.root.level = information
-# Inline Channel with PatternFormatter
-# logging.loggers.l1.name = logger1
-# logging.loggers.l1.channel.class = ConsoleChannel
-# logging.loggers.l1.channel.pattern = %s: [%p] %t
-# logging.loggers.l1.level = information
-# SplitterChannel
-# logging.channels.splitter.class = SplitterChannel
-# logging.channels.splitter.channels = l1,l2
-# logging.loggers.l2.name = logger2
-# logging.loggers.l2.channel = splitter
-
-
-

feeds/ucentral/ucentralgw/files/etc/uci-defaults/99-ucentral-certs

@@ -1,6 +0,0 @@
-#!/bin/sh
-
-[ -f /etc/ucentral/certs/server-key.pem ] && exit 0
-/usr/libexec/ucentral/create_certificates.sh
-
-exit 0

feeds/ucentral/ucentralgw/files/etc/uci-defaults/99-ucentral-firewall

@@ -1,6 +0,0 @@
-#!/bin/sh
-
-uci set firewall.wan.input=ACCEPT
-uci commit firewall
-
-exit 0

feeds/ucentral/ucentralgw/files/etc/uci-defaults/99-ucentral-hostname

@@ -1,4 +0,0 @@
-#!/bin/sh
-
-hname=$(cat /sys/class/net/eth0/address | tr -d : | awk '{print tolower($0)}')
-uci set system.@system[-1].hostname="ucentral-$hname"

feeds/ucentral/ucentralgw/files/etc/uci-defaults/99-ucentral-mdns

@@ -1,6 +0,0 @@
-#!/bin/sh
-
-uci add_list umdns.@umdns[-1].network=foo
-uci commit umdns
-
-exit 0

feeds/ucentral/ucentralgw/patches/100-bash.patch

@@ -1,67 +0,0 @@
-Index: ucentralgw-2021-03-28-555b5fef/cert_scripts/clean.sh
-===================================================================
---- ucentralgw-2021-03-28-555b5fef.orig/cert_scripts/clean.sh
-+++ ucentralgw-2021-03-28-555b5fef/cert_scripts/clean.sh
-@@ -1,3 +1,3 @@
--#!/bin/bash
-+#!/bin/sh
- 
- rm *.pem *.csr
-Index: ucentralgw-2021-03-28-555b5fef/cert_scripts/create_certificates.sh
-===================================================================
---- ucentralgw-2021-03-28-555b5fef.orig/cert_scripts/create_certificates.sh
-+++ ucentralgw-2021-03-28-555b5fef/cert_scripts/create_certificates.sh
-@@ -1,15 +1,27 @@
--#!/bin/bash
-+#!/bin/sh
- 
--hn=$(hostname)
-+mkdir -p /etc/ucentral/certs/cas
-+
-+hn=$(cat /proc/sys/kernel/hostname)
- howmany=10
--cert_life=365
--subject="/C=CA/ST=British Columbia/L=Vancouver/O=Arilia Wireless/OU=Engineering/CN=$hn/emailAddress=support@example.com"
-+cert_life=1825
-+subject="/C=uC/ST=uCentral/L=uCentral/O=uCentral/OU=uCentral/CN=$hn/emailAddress=support@example.com"
-+
-+openssl genrsa -out /etc/ucentral/certs/server-key.pem 2048
-+openssl req -new -key /etc/ucentral/certs/server-key.pem -subj "$subject" -out /etc/ucentral/certs/server.csr
-+openssl x509 -req -days $cert_life -in /etc/ucentral/certs/server.csr -signkey /etc/ucentral/certs/server-key.pem -out /etc/ucentral/certs/server-cert.pem
-+
-+for a in clientcas.pem issuer.pem restapi-ca.pem restapi-cert.pem root.pem websocket-cert.pem; do
-+	cp /etc/ucentral/certs/server-cert.pem /etc/ucentral/certs/$a
-+done
-+
-+for a in restapi-key.pem websocket-key.pem; do
-+	cp /etc/ucentral/certs/server-key.pem /etc/ucentral/certs/$a
-+done
- 
--openssl genrsa -out server-key.pem 2048
--openssl req -new -key server-key.pem -subj "$subject" -out server.csr
--openssl x509 -req -days $cert_life -in server.csr -signkey server-key.pem -out server-cert.pem
-+cp  /etc/ucentral/certs/server-cert.pem /etc/ucentral/certs/cas/
- 
--for i in `eval echo {1..$howmany}`
-+for i in `seq 1 $howmany`
- do
--  openssl x509 -signkey server-key.pem -in server.csr -req -days $cert_life -out dev-$i-cert.pem
-+  openssl x509 -signkey /etc/ucentral/certs/server-key.pem -in /etc/ucentral/certs/server.csr -req -days $cert_life -out /etc/ucentral/certs/dev-$i-cert.pem
- done
-Index: ucentralgw-2021-03-28-555b5fef/cert_scripts/more_devices.sh
-===================================================================
---- ucentralgw-2021-03-28-555b5fef.orig/cert_scripts/more_devices.sh
-+++ ucentralgw-2021-03-28-555b5fef/cert_scripts/more_devices.sh
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/bin/sh
- 
- start=11
- finish=50
-@@ -7,4 +7,4 @@ cert_life=365
- for i in `eval echo {$start..$finish}`
- do
-   openssl x509 -signkey server-key.pem -in server.csr -req -days $cert_life -out dev-$i-cert.pem
--done
-\ No newline at end of file
-+done

feeds/ucentral/ucentralgw/patches/200-jwt.patch

@@ -1,20 +0,0 @@
-Index: ucentralgw-2021-03-28-555b5fef/CMakeLists.txt
-===================================================================
---- ucentralgw-2021-03-28-555b5fef.orig/CMakeLists.txt
-+++ ucentralgw-2021-03-28-555b5fef/CMakeLists.txt
-@@ -40,7 +40,7 @@ find_package(ZLIB REQUIRED)
- find_package(Lua REQUIRED)
- 
- if(SMALL_BUILD)
--    find_package(Poco REQUIRED COMPONENTS Crypto Net Util NetSSL Data DataSQLite)
-+    find_package(Poco REQUIRED COMPONENTS Crypto JWT Net Util NetSSL Data DataSQLite)
- else()
-     find_package(CppKafka REQUIRED)
-     find_package(PostgreSQL REQUIRED)
-@@ -81,4 +81,4 @@ if(NOT SMALL_BUILD)
-             ${MySQL_LIBRARIES} ${ODBC_LIBRARIES} ${ZLIB_LIBRARIES} ${LUA_LIBRARIES}
-             CppKafka::cppkafka
-              )
--endif()
-\ No newline at end of file
-+endif()

feeds/ucentral/ustp/Makefile

@@ -10,11 +10,11 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=ustp
 PKG_RELEASE:=1
 
-PKG_SOURCE_URL:=https://github.com/nbd168/ustp
+PKG_SOURCE_URL=$(PROJECT_GIT)/project/ustp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2021-08-24
-PKG_SOURCE_VERSION:=fd93aaef9ba99188e30731651c589a2ab9bfc421
-PKG_MIRROR_HASH:=ef99770c4992e236feb46efef7ded68b77de8dbd0a8aa99ab71788e7b35f9b58
+PKG_SOURCE_DATE:=2021-08-27
+PKG_SOURCE_VERSION:=25555611be916da7fe8cb53f85c741a51ddffa1c
+PKG_MIRROR_HASH:=d84d05b1a05279f2efe4aa6a27ac9590381636091cb1ec2aba72a604f58cddae
 
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name
 PKG_LICENSE:=GPL-2.0

feeds/wifi-ax/hostapd/patches/740-snoop_iface.patch

@@ -10,7 +10,36 @@
  
 --- a/src/ap/x_snoop.c
 +++ b/src/ap/x_snoop.c
-@@ -71,8 +71,12 @@ x_snoop_get_l2_packet(struct hostapd_dat
+@@ -31,14 +31,16 @@ int x_snoop_init(struct hostapd_data *ha
+ 		return -1;
+ 	}
+ 
+-	if (hostapd_drv_br_port_set_attr(hapd, DRV_BR_PORT_ATTR_HAIRPIN_MODE,
++	if (!conf->snoop_iface[0] &&
++	    hostapd_drv_br_port_set_attr(hapd, DRV_BR_PORT_ATTR_HAIRPIN_MODE,
+ 					 1)) {
+ 		wpa_printf(MSG_DEBUG,
+ 			   "x_snoop: Failed to enable hairpin_mode on the bridge port");
+ 		return -1;
+ 	}
+ 
+-	if (hostapd_drv_br_port_set_attr(hapd, DRV_BR_PORT_ATTR_PROXYARP, 1)) {
++	if (!conf->snoop_iface[0] &&
++	    hostapd_drv_br_port_set_attr(hapd, DRV_BR_PORT_ATTR_PROXYARP, 1)) {
+ 		wpa_printf(MSG_DEBUG,
+ 			   "x_snoop: Failed to enable proxyarp on the bridge port");
+ 		return -1;
+@@ -52,7 +54,8 @@ int x_snoop_init(struct hostapd_data *ha
+ 	}
+ 
+ #ifdef CONFIG_IPV6
+-	if (hostapd_drv_br_set_net_param(hapd, DRV_BR_MULTICAST_SNOOPING, 1)) {
++	if (!conf->snoop_iface[0] &&
++	    hostapd_drv_br_set_net_param(hapd, DRV_BR_MULTICAST_SNOOPING, 1)) {
+ 		wpa_printf(MSG_DEBUG,
+ 			   "x_snoop: Failed to enable multicast snooping on the bridge");
+ 		return -1;
+@@ -71,8 +74,12 @@ x_snoop_get_l2_packet(struct hostapd_dat
  {
  	struct hostapd_bss_config *conf = hapd->conf;
  	struct l2_packet_data *l2;

patches/0001-.gitignore-add-the-profiles-folder.patch

@@ -1,7 +1,7 @@
-From 77f9263187df8db1da9b6e859a46c8f9ec854035 Mon Sep 17 00:00:00 2001
+From 534b0e8d0ff1407c2c0e8e8c650f47ce6060a7a4 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Tue, 22 Sep 2020 18:02:55 +0200
-Subject: [PATCH 01/21] .gitignore: add the /profiles folder
+Subject: [PATCH 01/43] .gitignore: add the /profiles folder
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -9,7 +9,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
  1 file changed, 1 insertion(+)
 
 diff --git a/.gitignore b/.gitignore
-index b6bfe1a525..a2a910ef13 100644
+index 9647daa5a4..70a592e12f 100644
 --- a/.gitignore
 +++ b/.gitignore
 @@ -16,6 +16,7 @@

patches/0002-Revert-toolchain-gcc-Remove-support-for-GCC-5.patch

@@ -1,7 +1,7 @@
-From 0778b48ab16067d538021c0bedf1e5312347dcc6 Mon Sep 17 00:00:00 2001
+From 2947f1c2ac5e300d209b952979da30e92330a01f Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Mon, 25 Jan 2021 06:40:20 +0100
-Subject: [PATCH 02/21] Revert "toolchain: gcc: Remove support for GCC 5"
+Subject: [PATCH 02/43] Revert "toolchain: gcc: Remove support for GCC 5"
 
 This reverts commit 080dc619d4780a1f7b14082b77b28686e694f72d.
 ---

patches/0003-pending-scripts-add-gen_config.py.patch

@@ -1,7 +1,7 @@
-From f9d39a389ef2a3bbf326580a0769519c1f3bad5f Mon Sep 17 00:00:00 2001
+From 4b5a9307be956685ed6bd14a3e2cb8727eae0b08 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Fri, 19 Jun 2020 10:45:22 +0200
-Subject: [PATCH 01/37] pending: scripts: add gen_config.py
+Subject: [PATCH 03/43] pending: scripts: add gen_config.py
 
 This script is used to setup the tree based on the profiles/.
 

patches/0004-scripts-update-feed-script.patch

@@ -1,7 +1,7 @@
-From 501a2989de4295029f419406c20f72e10a914db4 Mon Sep 17 00:00:00 2001
+From 2abc67a0fbfbf50f4af2baaee07eb10d214973e4 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Fri, 19 Jun 2020 13:25:27 +0200
-Subject: [PATCH 04/21] scripts: update feed script
+Subject: [PATCH 04/43] scripts: update feed script
 
 gen_config.py requires the latest version of the feeds script.
 

patches/0005-scripts-ubinize-image.sh-allow-setting-the-rootfs-na.patch

@@ -1,7 +1,7 @@
-From f7b13fd5ac28e13e7ef2c95f3fda2c3ec3b78b39 Mon Sep 17 00:00:00 2001
+From 41347924799ff4f16a12d8f740f5c66b10eb8c43 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Sun, 9 Aug 2020 20:58:52 +0200
-Subject: [PATCH 05/21] scripts/ubinize-image.sh: allow setting the rootfs name
+Subject: [PATCH 05/43] scripts/ubinize-image.sh: allow setting the rootfs name
 
 This patch allows us to use a different rootfs name. Some QCA boards will
 require the in ubi rfs to be called ubi_rootfs.
@@ -13,7 +13,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
  2 files changed, 9 insertions(+), 1 deletion(-)
 
 diff --git a/include/image-commands.mk b/include/image-commands.mk
-index bddbed6052..bde6e030bc 100644
+index c6e8eb0293..d4bce80e68 100644
 --- a/include/image-commands.mk
 +++ b/include/image-commands.mk
 @@ -86,6 +86,7 @@ define Build/append-ubi

patches/0006-base-files-set-default-password-to-openwifi.patch

@@ -1,7 +1,7 @@
-From a067af45a93ebc68f89a8adc88a25f11b4cd9620 Mon Sep 17 00:00:00 2001
+From 73116492498c07a2f9c45a7a66a4b03ac103d37d Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Thu, 30 Jul 2020 16:51:04 +0200
-Subject: [PATCH 06/21] base-files: set default password to "openwifi"
+Subject: [PATCH 06/43] base-files: set default password to "openwifi"
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -11,10 +11,10 @@ Signed-off-by: John Crispin <john@phrozen.org>
  3 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate
-index ee3958e733..66b11c8a2e 100755
+index 596fcf41fa..30e7c119f7 100755
 --- a/package/base-files/files/bin/config_generate
 +++ b/package/base-files/files/bin/config_generate
-@@ -282,7 +282,7 @@ generate_static_system() {
+@@ -303,7 +303,7 @@ generate_static_system() {
  		add system system
  		set system.@system[-1].hostname='OpenWrt'
  		set system.@system[-1].timezone='UTC'

patches/0007-base-files-update-banner.patch

@@ -1,7 +1,7 @@
-From 86494392a8ae5374e000298b6e06c2bcd4f82cb9 Mon Sep 17 00:00:00 2001
+From a819600041c0fade872c023637ba0c6c5890de78 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Fri, 31 Jul 2020 17:15:13 +0200
-Subject: [PATCH 07/21] base-files: update banner
+Subject: [PATCH 07/43] base-files: update banner
 
 Use OpenWiFi for the banner.
 

patches/0008-base-files-add-the-wlan-ap-repo-hash.patch

@@ -1,7 +1,7 @@
-From 5ed64f1cde06fa3f0fb27c618c86aeeb9309d845 Mon Sep 17 00:00:00 2001
+From f887c60cee77011e009d87639560079b828a452a Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Sat, 29 Aug 2020 08:25:41 +0200
-Subject: [PATCH 12/38] base-files: add the wlan-ap repo hash
+Subject: [PATCH 08/43] base-files: add the wlan-ap repo hash
 
 currently the banner will show the revision of the build tree.
 This patch adds the hash of the wlan-ap tree.
@@ -44,10 +44,10 @@ index a4b47c8a57..214f32974b 100644
  	-e 's,%h,$(call sed_escape,$(VERSION_HWREV)),g'
  
 diff --git a/package/base-files/Makefile b/package/base-files/Makefile
-index 8a1ddf96f5..0ff6fa84c1 100644
+index 9db4812981..99cb5476f7 100644
 --- a/package/base-files/Makefile
 +++ b/package/base-files/Makefile
-@@ -205,6 +205,7 @@ define Package/base-files/install
+@@ -209,6 +209,7 @@ define Package/base-files/install
  
  	$(if $(CONFIG_TARGET_PREINIT_DISABLE_FAILSAFE), \
  		rm -f $(1)/etc/banner.failsafe,)
@@ -118,7 +118,7 @@ index 0000000000..4e8f05a700
 +2.25.1
 +
 diff --git a/scripts/gen_config.py b/scripts/gen_config.py
-index 124dfd596a..e9418d776c 100755
+index a36f244e56..a348386124 100755
 --- a/scripts/gen_config.py
 +++ b/scripts/gen_config.py
 @@ -62,7 +62,7 @@ def load_yaml(fname: str, profile: dict, include = True):

patches/0009-base-files-make-sysupgrade-work-on-qcom-AX.patch

@@ -1,7 +1,7 @@
-From c6beeb8b4854b12b72a3ff2ed141129023f08eaf Mon Sep 17 00:00:00 2001
+From dfc5ca4495315d293ccdb1c52d7d29a133ba596b Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Mon, 22 Jun 2020 14:32:45 +0200
-Subject: [PATCH 09/21] base-files: make sysupgrade work on qcom AX
+Subject: [PATCH 09/43] base-files: make sysupgrade work on qcom AX
 
 The qsdk v4.4 ubi layer does not detach the rootfs properly during
 sysupgrade. Pull in the ubu force detach patch from owrt-15.05.

patches/0010-base-files-add-support-for-v4.4-style-netdev-led-tri.patch

@@ -1,7 +1,7 @@
-From 0d04a28c9646e245021282bc38740ae2ced17a08 Mon Sep 17 00:00:00 2001
+From db79fb81502c935be1295c258fb4738dfb2351bd Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Wed, 23 Sep 2020 17:34:44 +0200
-Subject: [PATCH 10/21] base-files: add support for v4.4 style netdev led
+Subject: [PATCH 10/43] base-files: add support for v4.4 style netdev led
  triggers
 
 Current owrt scripting cant handle the old v4.4 style sysfs API of led

patches/0011-busybox-enable-the-watchdog-tool.patch

@@ -1,7 +1,7 @@
-From c3e8689eba6ceafc23973883131349ef89c714ed Mon Sep 17 00:00:00 2001
+From 5c54120d8b707a1022052edd562cea1a358a9bce Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Tue, 28 Jul 2020 09:21:04 +0200
-Subject: [PATCH 11/21] busybox: enable the watchdog tool
+Subject: [PATCH 11/43] busybox: enable the watchdog tool
 
 procd can currently only handle the main wdt. Enable the busybox
 applet until procd can handle multiple devices.
@@ -12,7 +12,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/package/utils/busybox/Config-defaults.in b/package/utils/busybox/Config-defaults.in
-index 04148df267..2389bbb8e0 100644
+index 168c73b24c..d35ce0b7b8 100644
 --- a/package/utils/busybox/Config-defaults.in
 +++ b/package/utils/busybox/Config-defaults.in
 @@ -2182,7 +2182,7 @@ config BUSYBOX_DEFAULT_VOLNAME

patches/0012-dnsmasq-add-relay-option82-support.patch

@@ -1,7 +1,7 @@
-From 8ca8d0669ea2b36a5542d9bcda32cddf9cd7cd0f Mon Sep 17 00:00:00 2001
+From 42e7cc0388b258ae0f391e7b0dbab9b53b067124 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Tue, 8 Jun 2021 09:12:38 +0200
-Subject: [PATCH] dnsmasq: add relay / option82 support
+Subject: [PATCH 12/43] dnsmasq: add relay / option82 support
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -11,10 +11,10 @@ Signed-off-by: John Crispin <john@phrozen.org>
  create mode 100644 package/network/services/dnsmasq/patches/200-option82.patch
 
 diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init
-index 680e72f9e7..51f405b73c 100644
+index 205bfb4cf6..dacd476cd4 100644
 --- a/package/network/services/dnsmasq/files/dnsmasq.init
 +++ b/package/network/services/dnsmasq/files/dnsmasq.init
-@@ -761,12 +761,14 @@ dhcp_relay_add() {
+@@ -777,12 +777,14 @@ dhcp_relay_add() {
  	[ -n "$server_addr" ] || return 0
  
  	config_get interface "$cfg" interface

patches/0013-base-files-ignore-sysupgrade-that-was-not-ours.patch

@@ -1,7 +1,7 @@
-From 4fb2a69f3bbdab006a6b751ce39203cfdade9ae6 Mon Sep 17 00:00:00 2001
+From 9fb93fbd42f8f1f3036580b6666b40ab343509f8 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Thu, 17 Jun 2021 08:47:51 +0200
-Subject: [PATCH] base-files: ignore sysupgrade that was not ours
+Subject: [PATCH 13/43] base-files: ignore sysupgrade that was not ours
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---

patches/0014-ipq806x-simplify-ecw5410-dts.patch

@@ -1,7 +1,7 @@
-From b820ffd87781ef60bd6b5ef64162adf9cbb7d72b Mon Sep 17 00:00:00 2001
+From 8b82aea440583198be21bbbe4e3f6d7bd814aad8 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Thu, 17 Jun 2021 16:13:40 +0200
-Subject: [PATCH 2/4] ipq806x: simplify ecw5410 dts
+Subject: [PATCH 14/43] ipq806x: simplify ecw5410 dts
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -37,7 +37,7 @@ index 3befc40630..e5715a79aa 100644
  	linksys,ea8500)
  		caldata_extract "art" 0x5000 0x2f20
 diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-ecw5410.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-ecw5410.dts
-index 712910c261..e6fc3453b0 100644
+index 712910c261..e87ef16b9a 100644
 --- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-ecw5410.dts
 +++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-ecw5410.dts
 @@ -95,6 +95,16 @@

patches/0015-ipq807x-buildsystem-patches-required-by-the-target.patch

@@ -1,7 +1,7 @@
-From c0442b28c993b63a5af510448e01083f3d681475 Mon Sep 17 00:00:00 2001
+From 2a1e093c78738b3c3e47bbf357efe571ff04d8aa Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Mon, 15 Feb 2021 15:20:44 +0100
-Subject: [PATCH 15/21] ipq807x: buildsystem patches required by the target
+Subject: [PATCH 15/43] ipq807x: buildsystem patches required by the target
 
 The target uses the v4.4 kernel and requires these patches to build
 properly.

patches/0016-linux-modules-fix-some-v4.4-dependencies.patch

@@ -1,7 +1,7 @@
-From 6942520b7623e3fc793a229e04af2b74fd19f556 Mon Sep 17 00:00:00 2001
+From 5cb922f8d91e2bdd48807adf26336e61b03747a6 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Wed, 24 Mar 2021 15:03:30 +0100
-Subject: [PATCH 16/21] linux/modules: fix some v4.4 dependencies
+Subject: [PATCH 16/43] linux/modules: fix some v4.4 dependencies
 
 NFT has different deps on v4.4.
 
@@ -27,13 +27,13 @@ Signed-off-by: John Crispin <john@phrozen.org>
  toolchain/gcc/Config.in                    |  5 +++
  toolchain/gcc/Config.version               |  1 +
  toolchain/kernel-headers/Makefile          |  2 +-
- 21 files changed, 145 insertions(+), 40 deletions(-)
+ 20 files changed, 143 insertions(+), 40 deletions(-)
 
 diff --git a/config/Config-images.in b/config/Config-images.in
-index 2921cd5bca..969b57efee 100644
+index b869ccae70..de11c52676 100644
 --- a/config/Config-images.in
 +++ b/config/Config-images.in
-@@ -17,6 +17,7 @@ menu "Target Images"
+@@ -18,6 +18,7 @@ menu "Target Images"
  			default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_lantiq
  			default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_mpc85xx
  			default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ramips
@@ -42,7 +42,7 @@ index 2921cd5bca..969b57efee 100644
  			depends on TARGET_ROOTFS_INITRAMFS
  			help
 diff --git a/include/image.mk b/include/image.mk
-index 2530108211..10e7063f41 100644
+index 7c2dcf0e8b..6fc02a3f6b 100644
 --- a/include/image.mk
 +++ b/include/image.mk
 @@ -153,6 +153,7 @@ endif
@@ -62,7 +62,7 @@ index 2530108211..10e7063f41 100644
  define Image/pad-to
  	dd if=$(1) of=$(1).new bs=$(2) conv=sync
 diff --git a/include/kernel.mk b/include/kernel.mk
-index d2a5b42138..4e9561c93c 100644
+index e4074a48f4..56fa06b2eb 100644
 --- a/include/kernel.mk
 +++ b/include/kernel.mk
 @@ -44,7 +44,7 @@ else
@@ -261,7 +261,7 @@ index 7526224972..691f8fb186 100644
  __config_list = $(firstword $(wildcard $(call __config_name_list,$(1))))
  find_kernel_config=$(if $(__config_list),$(__config_list),$(lastword $(__config_name_list)))
 diff --git a/package/kernel/linux/modules/can.mk b/package/kernel/linux/modules/can.mk
-index 58c257db5b..3bf0359c11 100644
+index 3060fc0966..5542c4fe0a 100644
 --- a/package/kernel/linux/modules/can.mk
 +++ b/package/kernel/linux/modules/can.mk
 @@ -248,7 +248,8 @@ define KernelPackage/can-usb-kvaser
@@ -275,10 +275,10 @@ index 58c257db5b..3bf0359c11 100644
    $(call AddDepends/can,+kmod-usb-core)
  endef
 diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk
-index e9e78e7967..e7776c096c 100644
+index b50ed06824..a68459d989 100644
 --- a/package/kernel/linux/modules/crypto.mk
 +++ b/package/kernel/linux/modules/crypto.mk
-@@ -377,7 +377,7 @@ $(eval $(call KernelPackage,crypto-hw-padlock))
+@@ -387,7 +387,7 @@ $(eval $(call KernelPackage,crypto-hw-padlock))
  
  define KernelPackage/crypto-hw-safexcel
    TITLE:= MVEBU SafeXcel Crypto Engine module
@@ -287,7 +287,7 @@ index e9e78e7967..e7776c096c 100644
  	+kmod-crypto-authenc +kmod-crypto-md5 +kmod-crypto-hmac +kmod-crypto-sha256 +kmod-crypto-sha512
    KCONFIG:= \
  	CONFIG_CRYPTO_HW=y \
-@@ -549,8 +549,10 @@ ifndef CONFIG_TARGET_x86_64
+@@ -710,8 +710,10 @@ ifndef CONFIG_TARGET_x86_64
  	$(LINUX_DIR)/arch/x86/crypto/twofish-i586.ko \
  	$(LINUX_DIR)/arch/x86/crypto/serpent-sse2-i586.ko \
  	$(LINUX_DIR)/arch/x86/crypto/glue_helper.ko \
@@ -299,7 +299,7 @@ index e9e78e7967..e7776c096c 100644
      AUTOLOAD+= $(call AutoLoad,10,cryptd glue_helper \
  	serpent-sse2-i586 twofish-i586 blowfish_generic)
    endef
-@@ -569,7 +571,8 @@ define KernelPackage/crypto-misc/x86/64
+@@ -730,7 +732,8 @@ define KernelPackage/crypto-misc/x86/64
  	$(LINUX_DIR)/arch/x86/crypto/twofish-avx-x86_64.ko \
  	$(LINUX_DIR)/arch/x86/crypto/serpent-avx-x86_64.ko \
  	$(LINUX_DIR)/arch/x86/crypto/camellia-aesni-avx2.ko \
@@ -413,7 +413,7 @@ index e2bb1d0681..1be05e182a 100644
  endef
  
 diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
-index 2c2fe82fa0..36e1732c11 100644
+index 1eec9f9b63..4343e850e9 100644
 --- a/package/kernel/linux/modules/netsupport.mk
 +++ b/package/kernel/linux/modules/netsupport.mk
 @@ -375,7 +375,7 @@ $(eval $(call KernelPackage,ip6-vti))
@@ -425,7 +425,7 @@ index 2c2fe82fa0..36e1732c11 100644
    KCONFIG:=CONFIG_XFRM_INTERFACE
    FILES:=$(LINUX_DIR)/net/xfrm/xfrm_interface.ko
    AUTOLOAD:=$(call AutoProbe,xfrm_interface)
-@@ -764,7 +764,7 @@ $(eval $(call KernelPackage,sched-core))
+@@ -765,7 +765,7 @@ $(eval $(call KernelPackage,sched-core))
  define KernelPackage/sched-cake
    SUBMENU:=$(NETWORK_SUPPORT_MENU)
    TITLE:=Cake fq_codel/blue derived shaper
@@ -434,7 +434,7 @@ index 2c2fe82fa0..36e1732c11 100644
    KCONFIG:=CONFIG_NET_SCH_CAKE
    FILES:=$(LINUX_DIR)/net/sched/sch_cake.ko
    AUTOLOAD:=$(call AutoProbe,sch_cake)
-@@ -1147,7 +1147,7 @@ $(eval $(call KernelPackage,rxrpc))
+@@ -1154,7 +1154,7 @@ $(eval $(call KernelPackage,rxrpc))
  define KernelPackage/mpls
    SUBMENU:=$(NETWORK_SUPPORT_MENU)
    TITLE:=MPLS support
@@ -508,7 +508,7 @@ index 83d998c83a..784adcb744 100644
    FILES:= $(LINUX_DIR)/drivers/char/tpm/tpm.ko
    AUTOLOAD:=$(call AutoLoad,10,tpm,1)
 diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
-index 3dd20a0696..e3acb4bf79 100644
+index 592affe494..41d12cb08a 100644
 --- a/package/kernel/linux/modules/usb.mk
 +++ b/package/kernel/linux/modules/usb.mk
 @@ -458,9 +458,28 @@ endef

patches/0017-ipq807x-add-the-Qualcomm-AX-target-support.patch

@@ -1,7 +1,7 @@
-From 67774c73ab28997107e29487a95d9c96e11398f7 Mon Sep 17 00:00:00 2001
+From 6ec4c8f7d24c34c5855278fe13bde4e5e43ba293 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Sat, 18 Jul 2020 08:53:44 +0200
-Subject: [PATCH 01/22] ipq807x: add the Qualcomm AX target support
+Subject: [PATCH 17/43] ipq807x: add the Qualcomm AX target support
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -119,7 +119,7 @@ index f71114b5da..4a85d83118 100644
  	string "Custom Kernel Build User Name"
  	default "builder" if BUILDBOT
 diff --git a/include/image.mk b/include/image.mk
-index 5ee6d309e4..7a48b789af 100644
+index 6fc02a3f6b..92b23321b1 100644
 --- a/include/image.mk
 +++ b/include/image.mk
 @@ -179,6 +179,10 @@ define Image/pad-root-squashfs
@@ -186,10 +186,10 @@ index 0000000000..6c429f1852
 +
 +exit 0
 diff --git a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-index c4d9dd78e3..6670d310db 100644
+index b12c9af9a7..b7ee73b12e 100644
 --- a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
 +++ b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-@@ -254,6 +254,11 @@ case "$FIRMWARE" in
+@@ -265,6 +265,11 @@ case "$FIRMWARE" in
  		caldata_extract "ART" 0x5000 0x2f20
  		ath10k_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) -1)
  		;;

patches/0018-ramips-add-tplink-ex228-support.patch

@@ -1,7 +1,7 @@
-From 842b431559c3992e182190b7f96c4407978723c7 Mon Sep 17 00:00:00 2001
+From 2970ecaae31c8e42cf1ef5cff2a78cf57701070e Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Thu, 27 May 2021 16:48:27 +0200
-Subject: [PATCH] ramips: add tplink ex228 support
+Subject: [PATCH 18/43] ramips: add tplink ex228 support
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -148,10 +148,10 @@ index 0000000000..9e5cc9ef01
 +	};
 +};
 diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
-index a8f558326d..1a84abc842 100644
+index a3bc14d59d..6e0b9b5f76 100644
 --- a/target/linux/ramips/image/mt7621.mk
 +++ b/target/linux/ramips/image/mt7621.mk
-@@ -1138,6 +1138,16 @@ define Device/tplink_eap235-wall-v1
+@@ -1271,6 +1271,16 @@ define Device/tplink_eap235-wall-v1
  endef
  TARGET_DEVICES += tplink_eap235-wall-v1
  
@@ -169,11 +169,11 @@ index a8f558326d..1a84abc842 100644
    $(Device/dsa-migration)
    $(Device/tplink-safeloader)
 diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
-index 89e679be7c..b6b8b6482d 100755
+index 4b44669b84..1c4e29dd97 100755
 --- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
 +++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
-@@ -36,6 +36,7 @@ ramips_setup_interfaces()
- 		;;
+@@ -25,6 +25,7 @@ ramips_setup_interfaces()
+ 	ampedwireless,ally-r1900k|\
  	gehua,ghl-r-001|\
  	hiwifi,hc5962|\
 +	tplink,ex228|\
@@ -181,13 +181,13 @@ index 89e679be7c..b6b8b6482d 100755
  	xiaomi,mi-router-ac2100|\
  	xiaomi,redmi-router-ac2100)
 diff --git a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
-index c9152c5cf4..853a464ea5 100755
+index c2ad4d3ed6..acaa62d171 100755
 --- a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
 +++ b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
-@@ -61,6 +61,7 @@ platform_do_upgrade() {
- 	netgear,wac104|\
+@@ -73,6 +73,7 @@ platform_do_upgrade() {
  	netgear,wac124|\
  	netis,wf2881|\
+ 	sercomm,na502|\
 +	tplink,ex228|\
  	xiaomi,mi-router-3g|\
  	xiaomi,mi-router-3-pro|\

patches/0019-lldp-add-TIP-tweaks.patch

@@ -1,7 +1,7 @@
-From 7a4571cc0c12d54d0aca93dfedbe8dc33cff39fa Mon Sep 17 00:00:00 2001
+From 58242d355b483e105affd0c69c681e46e88ad84c Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Fri, 4 Dec 2020 16:29:35 +0100
-Subject: [PATCH 01/11] lldp: add TIP tweaks
+Subject: [PATCH 19/43] lldp: add TIP tweaks
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---

patches/0020-ramips-make-wifi-work.patch

@@ -1,7 +1,7 @@
-From 949cec1e6873109d29ee435d9f2370fbbb7b9700 Mon Sep 17 00:00:00 2001
+From e00ffc2ad678216a318106da687701aafa5a1ac7 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Fri, 4 Dec 2020 16:29:16 +0100
-Subject: [PATCH 20/21] ramips: make wifi work
+Subject: [PATCH 20/43] ramips: make wifi work
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -9,7 +9,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
  1 file changed, 1 insertion(+)
 
 diff --git a/target/linux/ramips/mt76x8/config-5.4 b/target/linux/ramips/mt76x8/config-5.4
-index ec21b3722b..725aa9b070 100644
+index dfd01598ad..e82b775758 100644
 --- a/target/linux/ramips/mt76x8/config-5.4
 +++ b/target/linux/ramips/mt76x8/config-5.4
 @@ -46,6 +46,7 @@ CONFIG_CPU_R4K_CACHE_TLB=y

patches/0021-ugps-update-to-latest-HEAD.patch

@@ -1,7 +1,7 @@
-From efdbdcd3503315022a3270886826656be116345b Mon Sep 17 00:00:00 2001
+From 6e5fd4e18759885bd25aa182d5cc7ce1c7f8eeea Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Sat, 19 Jun 2021 16:00:43 +0200
-Subject: [PATCH 38/38] ugps: update to latest HEAD
+Subject: [PATCH 21/43] ugps: update to latest HEAD
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -9,16 +9,16 @@ Signed-off-by: John Crispin <john@phrozen.org>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/package/utils/ugps/Makefile b/package/utils/ugps/Makefile
-index 4ce64d9631..e9a7f4fa8f 100644
+index c70a7b7ea6..389138d1dd 100644
 --- a/package/utils/ugps/Makefile
 +++ b/package/utils/ugps/Makefile
-@@ -12,9 +12,9 @@ PKG_RELEASE:=1
+@@ -12,9 +12,9 @@ PKG_RELEASE:=$(AUTORELEASE)
  
  PKG_SOURCE_URL=$(PROJECT_GIT)/project/ugps.git
  PKG_SOURCE_PROTO:=git
--PKG_SOURCE_DATE:=2020-08-29
--PKG_SOURCE_VERSION:=511a5b3c84fa715ef0305cf26c98619c12a4867a
--PKG_MIRROR_HASH:=551d57b4c18da4c4695fa2f7a959c25a03be35d14cf872785e7db740f12366e2
+-PKG_SOURCE_DATE:=2021-06-08
+-PKG_SOURCE_VERSION:=5e88403fc0d39ae8a270d2c6c6e9c8a4d5232cf3
+-PKG_MIRROR_HASH:=a3dfc2cc6def3b634d8b7cda9139926be3d876cf2faa5251c4821987954442a5
 +PKG_SOURCE_DATE:=2021-07-19
 +PKG_SOURCE_VERSION:=350b960b6f8b08409dcef719ef1e1e0c8911040f
 +PKG_MIRROR_HASH:=94d489072f8fccc26f624c3d3c65e7cb40e4b6267df5fb39d4e0e78469006bde

patches/0022-Revert-ipq40xx-revert-usage-of-VLAN-S-TAG.patch

@@ -1,7 +1,7 @@
-From 91d0510ff553a1dd43312eee44ef6290a9eb751c Mon Sep 17 00:00:00 2001
+From 687576be91062e5ab25e8ff4e2d990799a34210f Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Thu, 8 Apr 2021 10:46:29 +0200
-Subject: [PATCH] Revert "ipq40xx: revert usage of VLAN S-TAG"
+Subject: [PATCH 22/43] Revert "ipq40xx: revert usage of VLAN S-TAG"
 
 This reverts commit cdc8d4b46f0811292fffc6094acd81e854b5f4a5.
 

patches/0023-ipq40xx-add-ath10k-ct-fw.cfg-stubs.patch

@@ -1,7 +1,7 @@
-From 558605338e87ebac7358026eb86b7ba5f4c228a1 Mon Sep 17 00:00:00 2001
+From f6f9f9f095bdd05c66f23357228b90a8daeedd14 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Thu, 25 Mar 2021 08:03:48 +0100
-Subject: [PATCH 23/23] ipq40xx: add ath10k-ct fw.cfg stubs
+Subject: [PATCH 23/43] ipq40xx: add ath10k-ct fw.cfg stubs
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---

patches/0024-ipq40xx-fix-ecw5211-support.patch

@@ -1,25 +0,0 @@
-From c82870ef8a2ae4798ede9393254c1e18798e5d01 Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Tue, 15 Jun 2021 17:03:14 +0200
-Subject: [PATCH] ipq40xx: fix ecw5211 support
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- target/linux/ipq40xx/image/generic.mk | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk
-index 1de17dd15a..487bba77b0 100644
---- a/target/linux/ipq40xx/image/generic.mk
-+++ b/target/linux/ipq40xx/image/generic.mk
-@@ -371,6 +371,7 @@ define Device/edgecore_ecw5211
- 	SOC := qcom-ipq4018
- 	BLOCKSIZE := 128k
- 	PAGESIZE := 2048
-+	DEVICE_DTS_CONFIG := config@ap.dk01.1-c2
- 	DEVICE_PACKAGES := kmod-tpm-i2c-atmel kmod-usb-acm uboot-envtools
- endef
- TARGET_DEVICES += edgecore_ecw5211
--- 
-2.25.1
-

patches/0024-target-add-pstore-support.patch

@@ -1,23 +1,21 @@
-From e0ff8f29f0c0c147b34fe943698e8f95dfa6c688 Mon Sep 17 00:00:00 2001
+From 17dbf01adfa8cc4704873a57ae3676fe09f961fa Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Tue, 30 Mar 2021 19:03:43 +0200
-Subject: [PATCH 1/6] target: add pstore support
+Subject: [PATCH 24/43] target: add pstore support
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
  target/linux/generic/config-5.10                | 15 ++++++++++++++-
  target/linux/generic/config-5.4                 | 14 +++++++++++++-
  .../linux/ipq40xx/patches-5.4/903-pstore.patch  | 17 +++++++++++++++++
- .../patches-5.10/160-add-pstore-support.patch   | 17 +++++++++++++++++
- 4 files changed, 61 insertions(+), 2 deletions(-)
+ 3 files changed, 44 insertions(+), 2 deletions(-)
  create mode 100644 target/linux/ipq40xx/patches-5.4/903-pstore.patch
- create mode 100644 target/linux/mediatek/patches-5.10/160-add-pstore-support.patch
 
 diff --git a/target/linux/generic/config-5.10 b/target/linux/generic/config-5.10
-index ba6317e35f..3e911a2619 100644
+index 4eb5607f17..2582e8851a 100644
 --- a/target/linux/generic/config-5.10
 +++ b/target/linux/generic/config-5.10
-@@ -4424,7 +4424,20 @@ CONFIG_PROC_SYSCTL=y
+@@ -4506,7 +4506,20 @@ CONFIG_PROC_SYSCTL=y
  # CONFIG_PSAMPLE is not set
  # CONFIG_PSB6970_PHY is not set
  # CONFIG_PSI is not set
@@ -40,10 +38,10 @@ index ba6317e35f..3e911a2619 100644
  # CONFIG_PTP_1588_CLOCK is not set
  # CONFIG_PTP_1588_CLOCK_IDT82P33 is not set
 diff --git a/target/linux/generic/config-5.4 b/target/linux/generic/config-5.4
-index a0193ca718..da2cc8db65 100644
+index da0e2e2186..b6673ede4d 100644
 --- a/target/linux/generic/config-5.4
 +++ b/target/linux/generic/config-5.4
-@@ -4136,7 +4136,19 @@ CONFIG_PROC_SYSCTL=y
+@@ -4177,7 +4177,19 @@ CONFIG_PROC_SYSCTL=y
  # CONFIG_PSAMPLE is not set
  # CONFIG_PSB6970_PHY is not set
  # CONFIG_PSI is not set

patches/0025-ath79-add-Support-for-Indio-305AC.patch

@@ -1,7 +1,7 @@
-From 008a385635cafdce3498ebd6a6b429a1aa2e03bd Mon Sep 17 00:00:00 2001
+From da01b2ec475761de8ac92045329483f8a9cf7438 Mon Sep 17 00:00:00 2001
 From: Rohan Nathi <rohan.nathi@indionetworks.com>
 Date: Thu, 24 Jun 2021 13:48:45 +0000
-Subject: [PATCH] ath79: add Support for Indio 305AC
+Subject: [PATCH 25/43] ath79: add Support for Indio 305AC
 
 Signed-off-by: Rohan Nathi <rohan.nathi@indionetworks.com>
 ---
@@ -134,10 +134,10 @@ index 0000000000..763fdcefa8
 +	mtd-cal-data = <&art 0x1000>;
 +};
 diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-index 5a44dd94e5..94afc9c726 100644
+index 783895525b..80f755b343 100644
 --- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
 +++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-@@ -43,6 +43,7 @@ case "$FIRMWARE" in
+@@ -44,6 +44,7 @@ case "$FIRMWARE" in
  	ubnt,powerbeam-5ac-500|\
  	ubnt,powerbeam-5ac-gen2|\
  	ubnt,unifiac-pro|\
@@ -146,10 +146,10 @@ index 5a44dd94e5..94afc9c726 100644
  		caldata_extract "art" 0x5000 0x844
  		;;
 diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk
-index d93ebbaeba..da95360281 100644
+index ce4e462a40..24778e8f1c 100644
 --- a/target/linux/ath79/image/generic.mk
 +++ b/target/linux/ath79/image/generic.mk
-@@ -2191,6 +2191,17 @@ define Device/yuncore_a770
+@@ -2209,6 +2209,17 @@ define Device/yuncore_a770
  endef
  TARGET_DEVICES += yuncore_a770
  

patches/0026-ath79-tl-wpa8630p-fixes.patch

@@ -1,7 +1,7 @@
-From a14a7d3580ba376227eba8c28d7e632f0f4e1ffc Mon Sep 17 00:00:00 2001
+From 643d734b0d05bc9e5fe1b4588bf0876c9fd87bd4 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Wed, 30 Jun 2021 11:36:13 +0200
-Subject: [PATCH 35/36] ath79: tl-wpa8630p fixes
+Subject: [PATCH 26/43] ath79: tl-wpa8630p fixes
 
 * a certificates partition and change default port mapping
 
@@ -30,10 +30,10 @@ index 9e6d23de4e..c39dbc515b 100644
  };
  
 diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network
-index b8bc38348e..f300077dba 100755
+index 31c0f11861..3ba3d72abc 100755
 --- a/target/linux/ath79/generic/base-files/etc/board.d/02_network
 +++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network
-@@ -380,7 +380,7 @@ ath79_setup_interfaces()
+@@ -385,7 +385,7 @@ ath79_setup_interfaces()
  	tplink,tl-wpa8630p-v2.1-eu)
  		# port 5 (internal) is the power-line port
  		ucidef_add_switch "switch0" \

patches/0027-ath79-add-support-for-TP-Link-CPE710-v1.patch

@@ -1,7 +1,7 @@
-From 84b1c4894ff871686c4bd7152aca47a323857db6 Mon Sep 17 00:00:00 2001
+From 6ecffc2057aa1261846e51a3966b8710f605910a Mon Sep 17 00:00:00 2001
 From: Andrew Cameron <apcameron@softhome.net>
 Date: Mon, 12 Apr 2021 13:24:33 -0500
-Subject: [PATCH] ath79: add support for TP-Link CPE710-v1
+Subject: [PATCH 27/43] ath79: add support for TP-Link CPE710-v1
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -186,7 +186,7 @@ index 0000000000..830c3d30b8
 +	};
 +};
 diff --git a/target/linux/ath79/generic/base-files/etc/board.d/01_leds b/target/linux/ath79/generic/base-files/etc/board.d/01_leds
-index fae5ac7c92..5c7e39e48f 100755
+index 7c5eeb1112..05bdf60f78 100755
 --- a/target/linux/ath79/generic/base-files/etc/board.d/01_leds
 +++ b/target/linux/ath79/generic/base-files/etc/board.d/01_leds
 @@ -164,7 +164,8 @@ enterasys,ws-ap3705i|\
@@ -200,7 +200,7 @@ index fae5ac7c92..5c7e39e48f 100755
  	;;
  compex,wpj344-16m|\
 diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network
-index f300077dba..4fe605dee7 100755
+index 3ba3d72abc..d70432ad2b 100755
 --- a/target/linux/ath79/generic/base-files/etc/board.d/02_network
 +++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network
 @@ -63,6 +63,7 @@ ath79_setup_interfaces()
@@ -212,10 +212,10 @@ index f300077dba..4fe605dee7 100755
  	tplink,eap225-v3|\
  	tplink,eap245-v1|\
 diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-index 94afc9c726..fc110af75c 100644
+index 80f755b343..4d7940d6ba 100644
 --- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
 +++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-@@ -228,6 +228,12 @@ case "$FIRMWARE" in
+@@ -229,6 +229,12 @@ case "$FIRMWARE" in
  		ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
  			/lib/firmware/ath10k/QCA9888/hw2.0/board.bin
  		;;
@@ -229,7 +229,7 @@ index 94afc9c726..fc110af75c 100644
  	tplink,eap225-v3|\
  	tplink,eap225-wall-v2|\
 diff --git a/target/linux/ath79/image/generic-tp-link.mk b/target/linux/ath79/image/generic-tp-link.mk
-index 0058d74f77..e8c081eab1 100644
+index be6aa06b55..78340f650e 100644
 --- a/target/linux/ath79/image/generic-tp-link.mk
 +++ b/target/linux/ath79/image/generic-tp-link.mk
 @@ -362,6 +362,17 @@ define Device/tplink_cpe610-v2
@@ -251,10 +251,10 @@ index 0058d74f77..e8c081eab1 100644
    $(Device/tplink-safeloader)
    LOADER_TYPE := elf
 diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c
-index 2bc4a3cb82..2bba417dfc 100644
+index 70e21f99cb..c519a6d367 100644
 --- a/tools/firmware-utils/src/tplink-safeloader.c
 +++ b/tools/firmware-utils/src/tplink-safeloader.c
-@@ -537,6 +537,43 @@ static struct device_info boards[] = {
+@@ -530,6 +530,43 @@ static struct device_info boards[] = {
  		.first_sysupgrade_partition = "os-image",
  		.last_sysupgrade_partition = "support-list",
  	},

patches/0028-ipq4019-add-CIG-wf610d.patch

@@ -1,7 +1,7 @@
-From 859bdaad5959f972babb268eff24901b116703c8 Mon Sep 17 00:00:00 2001
+From 7244d33107173856db10bb2084146137704e7e18 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
-Date: Tue, 13 Apr 2021 16:59:32 +0200
-Subject: [PATCH] ipq4019: add CIG wf610d
+Date: Sat, 4 Sep 2021 05:56:53 +0200
+Subject: [PATCH 28/43] ipq4019: add CIG wf610d
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -19,10 +19,10 @@ Signed-off-by: John Crispin <john@phrozen.org>
  create mode 100755 target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-cig-wf610d.dts
 
 diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile
-index e5f10a1f98..513ad4ea67 100644
+index e3b25bb556..b996ee311f 100644
 --- a/package/firmware/ipq-wifi/Makefile
 +++ b/package/firmware/ipq-wifi/Makefile
-@@ -47,7 +47,8 @@ ALLWIFIBOARDS:= \
+@@ -49,7 +49,8 @@ ALLWIFIBOARDS:= \
  	nec_wg2600hp3 \
  	plasmacloud_pa1200 \
  	plasmacloud_pa2200 \
@@ -32,7 +32,7 @@ index e5f10a1f98..513ad4ea67 100644
  
  ALLWIFIPACKAGES:=$(foreach BOARD,$(ALLWIFIBOARDS),ipq-wifi-$(BOARD))
  
-@@ -131,5 +132,6 @@ $(eval $(call generate-ipq-wifi-package,nec_wg2600hp3,NEC Platforms WG2600HP3))
+@@ -135,5 +136,6 @@ $(eval $(call generate-ipq-wifi-package,nec_wg2600hp3,NEC Platforms WG2600HP3))
  $(eval $(call generate-ipq-wifi-package,plasmacloud_pa1200,Plasma Cloud PA1200))
  $(eval $(call generate-ipq-wifi-package,plasmacloud_pa2200,Plasma Cloud PA2200))
  $(eval $(call generate-ipq-wifi-package,qxwlan_e2600ac,Qxwlan E2600AC))
@@ -100,7 +100,7 @@ literal 0
 HcmV?d00001
 
 diff --git a/target/linux/ipq40xx/base-files/etc/board.d/01_leds b/target/linux/ipq40xx/base-files/etc/board.d/01_leds
-index 3e0f3ab258..f9674126ba 100755
+index ac11655904..c1d4e693f2 100755
 --- a/target/linux/ipq40xx/base-files/etc/board.d/01_leds
 +++ b/target/linux/ipq40xx/base-files/etc/board.d/01_leds
 @@ -30,6 +30,7 @@ edgecore,oap100)
@@ -111,7 +111,7 @@ index 3e0f3ab258..f9674126ba 100755
  engenius,eap1300)
  	ucidef_set_led_netdev "lan" "LAN" "blue:lan" "eth0"
  	ucidef_set_led_wlan "wlan2g" "WLAN2G" "blue:wlan2g" "phy0tpt"
-@@ -61,6 +62,8 @@ qxwlan,e2600ac-c2)
+@@ -69,6 +70,8 @@ qxwlan,e2600ac-c2)
  	ucidef_set_led_wlan "wlan2g" "WLAN0" "green:wlan0" "phy0tpt"
  	ucidef_set_led_wlan "wlan5g" "WLAN1" "green:wlan1" "phy1tpt"
  	;;
@@ -121,10 +121,10 @@ index 3e0f3ab258..f9674126ba 100755
  zyxel,wre6606)
  	ucidef_set_led_wlan "wlan2g" "WLAN2G" "green:wlan2g" "phy0tpt"
 diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network
-index 8b7364ff33..dcdb790c84 100755
+index 1d4c78833a..d62a2e5061 100755
 --- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
 +++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
-@@ -41,6 +41,7 @@ ipq40xx_setup_interfaces()
+@@ -42,6 +42,7 @@ ipq40xx_setup_interfaces()
  		;;
  	asus,map-ac2200|\
  	cilab,meshpoint-one|\
@@ -133,7 +133,7 @@ index 8b7364ff33..dcdb790c84 100755
  	edgecore,oap100|\
  	openmesh,a42|\
 diff --git a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-index 6670d310db..5eae9c6e80 100644
+index b7ee73b12e..3948c08984 100644
 --- a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
 +++ b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
 @@ -93,6 +93,10 @@ case "$FIRMWARE" in
@@ -147,7 +147,7 @@ index 6670d310db..5eae9c6e80 100644
  	cellc,rtl30vw |\
  	compex,wpj419 |\
  	compex,wpj428 |\
-@@ -197,6 +201,10 @@ case "$FIRMWARE" in
+@@ -202,6 +206,10 @@ case "$FIRMWARE" in
  		caldata_extract "ART" 0x5000 0x2f20
  		ath10k_patch_mac $(mtd_get_mac_binary ORGDATA 0x2c)
  		;;
@@ -589,10 +589,10 @@ index 0000000000..e75e35e8ef
 +
 +};
 diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk
-index 4e40b8be50..1de17dd15a 100644
+index a435a127fa..31f4971c90 100644
 --- a/target/linux/ipq40xx/image/generic.mk
 +++ b/target/linux/ipq40xx/image/generic.mk
-@@ -273,6 +273,20 @@ define Device/cilab_meshpoint-one
+@@ -271,6 +271,20 @@ define Device/cilab_meshpoint-one
  endef
  TARGET_DEVICES += cilab_meshpoint-one
  
@@ -614,19 +614,19 @@ index 4e40b8be50..1de17dd15a 100644
  	$(call Device/FitImage)
  	$(call Device/UbiFit)
 diff --git a/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch b/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
-index a3d3341587..aec0d01ed6 100644
+index 6b7c68bf63..aa2fc4bd17 100644
 --- a/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
 +++ b/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
 @@ -10,7 +10,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
  
  --- a/arch/arm/boot/dts/Makefile
  +++ b/arch/arm/boot/dts/Makefile
--@@ -837,11 +837,58 @@ dtb-$(CONFIG_ARCH_QCOM) += \
-+@@ -837,11 +837,59 @@ dtb-$(CONFIG_ARCH_QCOM) += \
+-@@ -837,11 +837,60 @@ dtb-$(CONFIG_ARCH_QCOM) += \
++@@ -837,11 +837,61 @@ dtb-$(CONFIG_ARCH_QCOM) += \
   	qcom-apq8074-dragonboard.dtb \
   	qcom-apq8084-ifc6540.dtb \
   	qcom-apq8084-mtp.dtb \
-@@ -43,6 +43,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
+@@ -45,6 +45,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
   	qcom-ipq4019-ap.dk07.1-c1.dtb \
   	qcom-ipq4019-ap.dk07.1-c2.dtb \
  +	qcom-ipq4019-a62.dtb \

patches/0029-base-files-add-a-turnoff-command-to-the-led-script.patch

@@ -1,7 +1,7 @@
-From 5da505e5f59e93a8a6e928ad6c09a076f9889af1 Mon Sep 17 00:00:00 2001
+From bc2e9052af84664a2caae0581aa745d09240b160 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Mon, 19 Apr 2021 13:49:20 +0200
-Subject: [PATCH 01/10] base-files: add a turnoff command to the led script
+Subject: [PATCH 29/43] base-files: add a turnoff command to the led script
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---

patches/0030-ath10k-ct-update-the-driver.patch

@@ -0,0 +1,30 @@
+From ed5a8958378d84bba92a70f2a56a962be73c4b3b Mon Sep 17 00:00:00 2001
+From: John Crispin <john@phrozen.org>
+Date: Fri, 23 Apr 2021 16:16:31 +0200
+Subject: [PATCH 30/43] ath10k-ct: update the driver
+
+Signed-off-by: John Crispin <john@phrozen.org>
+---
+ package/kernel/ath10k-ct/Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/package/kernel/ath10k-ct/Makefile b/package/kernel/ath10k-ct/Makefile
+index 5681c5c2cd..24e0702e2c 100644
+--- a/package/kernel/ath10k-ct/Makefile
++++ b/package/kernel/ath10k-ct/Makefile
+@@ -8,9 +8,9 @@ PKG_LICENSE_FILES:=
+ 
+ PKG_SOURCE_URL:=https://github.com/greearb/ath10k-ct.git
+ PKG_SOURCE_PROTO:=git
+-PKG_SOURCE_DATE:=2021-06-03
+-PKG_SOURCE_VERSION:=b44cd7b2e7b0df5995ece18f358d4dfc40834ba1
+-PKG_MIRROR_HASH:=59f961ad425eb1a48fa9c391a325cc0f23845daec9d12673445d3077f9756cf0
++PKG_SOURCE_DATE:=2021-04-23
++PKG_SOURCE_VERSION:=8eca56d1514042b4af34004e0bbf69e40351d499
++PKG_MIRROR_HASH:=4ce22470b0cd15cc3cb04478678407e976c48010baab517fa1ac37685b791d95
+ 
+ # Build the 5.10 ath10k-ct driver version.
+ # Probably this should match as closely as
+-- 
+2.25.1
+

patches/0031-ath10k-ct-update-the-driver.patch

@@ -1,75 +0,0 @@
-From 644f52a193d0430e41d6c28c221e801a0e87affa Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Fri, 23 Apr 2021 16:16:31 +0200
-Subject: [PATCH] ath10k-ct: update the driver
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- package/kernel/ath10k-ct/Makefile             |  6 +--
- ...64-ath10k-commit-rates-from-mac80211.patch | 37 -------------------
- 2 files changed, 3 insertions(+), 40 deletions(-)
- delete mode 100644 package/kernel/ath10k-ct/patches/164-ath10k-commit-rates-from-mac80211.patch
-
-diff --git a/package/kernel/ath10k-ct/Makefile b/package/kernel/ath10k-ct/Makefile
-index a225bd8b19..8c2c36062d 100644
---- a/package/kernel/ath10k-ct/Makefile
-+++ b/package/kernel/ath10k-ct/Makefile
-@@ -8,9 +8,9 @@ PKG_LICENSE_FILES:=
- 
- PKG_SOURCE_URL:=https://github.com/greearb/ath10k-ct.git
- PKG_SOURCE_PROTO:=git
--PKG_SOURCE_DATE:=2021-01-11
--PKG_SOURCE_VERSION:=9fe1df7d4f783b6b0cd1c99d11979e5a6e6fc40b
--PKG_MIRROR_HASH:=4e30e256716611045e930b95eadaa8bfcadd5bdd8bbe3869cfe0f377920e812b
-+PKG_SOURCE_DATE:=2021-04-23
-+PKG_SOURCE_VERSION:=8eca56d1514042b4af34004e0bbf69e40351d499
-+PKG_MIRROR_HASH:=4ce22470b0cd15cc3cb04478678407e976c48010baab517fa1ac37685b791d95
- 
- # Build the 5.10 ath10k-ct driver version.
- # Probably this should match as closely as
-diff --git a/package/kernel/ath10k-ct/patches/164-ath10k-commit-rates-from-mac80211.patch b/package/kernel/ath10k-ct/patches/164-ath10k-commit-rates-from-mac80211.patch
-deleted file mode 100644
-index 842f3ea2a5..0000000000
---- a/package/kernel/ath10k-ct/patches/164-ath10k-commit-rates-from-mac80211.patch
-+++ /dev/null
-@@ -1,37 +0,0 @@
--From: Sven Eckelmann <sven@narfation.org>
--Date: Tue, 26 Feb 2019 08:06:35 +0100
--Subject: ath10k-ct: apply mac80211 rates to ath10k-ct rate state
--
--The rates from mac80211 have to be copied to the state of ath10k-ct or
--otherwise the ath10k_check_apply_special_rates function overwrites
--them again with some default values. This breaks for example the
--mcast_rate set for a wifi-iface.
--
--Signed-off-by: Sven Eckelmann <sven@narfation.org>
--
----- a/ath10k-5.10/mac.c
--+++ b/ath10k-5.10/mac.c
--@@ -6774,6 +6774,7 @@ static void ath10k_recalculate_mgmt_rate
-- 		return;
-- 	}
-- 
--+	arvif->mgt_rate[def->chan->band] = hw_rate_code;
-- 	vdev_param = ar->wmi.vdev_param->mgmt_rate;
-- 	ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id, vdev_param,
-- 					hw_rate_code);
--@@ -7000,6 +7001,7 @@ static void ath10k_bss_info_changed(stru
-- 			   "mac vdev %d mcast_rate %x\n",
-- 			   arvif->vdev_id, rate);
-- 
--+		arvif->mcast_rate[band] = rate;
-- 		vdev_param = ar->wmi.vdev_param->mcast_data_rate;
-- 		ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id,
-- 						vdev_param, rate);
--@@ -7008,6 +7010,7 @@ static void ath10k_bss_info_changed(stru
-- 				    "failed to set mcast rate on vdev %i: %d\n",
-- 				    arvif->vdev_id,  ret);
-- 
--+		arvif->bcast_rate[band] = rate;
-- 		vdev_param = ar->wmi.vdev_param->bcast_data_rate;
-- 		ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id,
-- 						vdev_param, rate);
--- 
-2.25.1
-

patches/0031-ipq40xx-add-tplink-ec420-support.patch

@@ -1,30 +1,43 @@
-From 07b09c01d002572c58d37de90d9b69d89a179de8 Mon Sep 17 00:00:00 2001
+From 0f91fe9eea8820e68b3d754e768a673ed165b3ce Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
-Date: Fri, 18 Jun 2021 11:07:02 +0200
-Subject: [PATCH 1/7] ipq40xx: add tplink ec420 support
+Date: Sat, 4 Sep 2021 05:59:39 +0200
+Subject: [PATCH 31/43] ipq40xx: add tplink ec420 support
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
+ package/boot/uboot-envtools/files/ipq40xx     |   1 +
  package/firmware/ipq-wifi/Makefile            |   4 +-
  .../ipq-wifi/board-tp-link_ec420-g1.qca4019   | Bin 0 -> 607304 bytes
  .../ipq-wifi/board-tp-link_ec420-g1.qca9984   | Bin 0 -> 171916 bytes
  .../ipq40xx/base-files/etc/board.d/02_network |   3 +-
  .../etc/hotplug.d/firmware/11-ath10k-caldata  |  11 +-
  .../base-files/lib/upgrade/platform.sh        |   3 +-
- .../dts/qcom-ipq4019-tp-link-ec420-g1.dts     | 276 ++++++++++++++++++
+ .../dts/qcom-ipq4019-tp-link-ec420-g1.dts     | 275 ++++++++++++++++++
  target/linux/ipq40xx/image/generic.mk         |  15 +
  .../patches-5.4/998-tp-link-ec420-g1.patch    |  12 +
- 9 files changed, 316 insertions(+), 8 deletions(-)
+ 10 files changed, 316 insertions(+), 8 deletions(-)
  create mode 100644 package/firmware/ipq-wifi/board-tp-link_ec420-g1.qca4019
  create mode 100644 package/firmware/ipq-wifi/board-tp-link_ec420-g1.qca9984
  create mode 100755 target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-tp-link-ec420-g1.dts
  create mode 100644 target/linux/ipq40xx/patches-5.4/998-tp-link-ec420-g1.patch
 
+diff --git a/package/boot/uboot-envtools/files/ipq40xx b/package/boot/uboot-envtools/files/ipq40xx
+index b24cbf979e..44a8688dbe 100644
+--- a/package/boot/uboot-envtools/files/ipq40xx
++++ b/package/boot/uboot-envtools/files/ipq40xx
+@@ -59,6 +59,7 @@ linksys,ea8300 |\
+ linksys,mr8300)
+ 	ubootenv_add_uci_config "/dev/mtd7" "0x0" "0x40000" "0x20000"
+ 	;;
++tp-link,ec420-g1 |\
+ zyxel,nbg6617)
+ 	ubootenv_add_uci_config "/dev/mtd6" "0x0" "0x10000" "0x10000"
+ 	;;
 diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile
-index 513ad4ea67..87dcf9a769 100644
+index b996ee311f..c9d113ae6a 100644
 --- a/package/firmware/ipq-wifi/Makefile
 +++ b/package/firmware/ipq-wifi/Makefile
-@@ -48,7 +48,8 @@ ALLWIFIBOARDS:= \
+@@ -50,7 +50,8 @@ ALLWIFIBOARDS:= \
  	plasmacloud_pa1200 \
  	plasmacloud_pa2200 \
  	qxwlan_e2600ac \
@@ -34,7 +47,7 @@ index 513ad4ea67..87dcf9a769 100644
  
  ALLWIFIPACKAGES:=$(foreach BOARD,$(ALLWIFIBOARDS),ipq-wifi-$(BOARD))
  
-@@ -133,5 +134,6 @@ $(eval $(call generate-ipq-wifi-package,plasmacloud_pa1200,Plasma Cloud PA1200))
+@@ -137,5 +138,6 @@ $(eval $(call generate-ipq-wifi-package,plasmacloud_pa1200,Plasma Cloud PA1200))
  $(eval $(call generate-ipq-wifi-package,plasmacloud_pa2200,Plasma Cloud PA2200))
  $(eval $(call generate-ipq-wifi-package,qxwlan_e2600ac,Qxwlan E2600AC))
  $(eval $(call generate-ipq-wifi-package,cig_wf610d,CIG WF_610D))
@@ -1082,11 +1095,11 @@ literal 0
 HcmV?d00001
 
 diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network
-index 597fa9f08b..238376afca 100755
+index d62a2e5061..16f6040b6e 100755
 --- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
 +++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
-@@ -31,8 +31,9 @@ ipq40xx_setup_interfaces()
- 	meraki,mr33|\
+@@ -32,8 +32,9 @@ ipq40xx_setup_interfaces()
+ 	mikrotik,sxtsq-5-ac|\
  	netgear,ex6100v2|\
  	netgear,ex6150v2|\
 +	tp-link,ec420-g1|\
@@ -1097,7 +1110,7 @@ index 597fa9f08b..238376afca 100755
  	aruba,ap-303h)
  		ucidef_set_interfaces_lan_wan "eth0" "eth1"
 diff --git a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-index 5eae9c6e80..8d3006381d 100644
+index 3948c08984..c8943d3ba3 100644
 --- a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
 +++ b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
 @@ -46,6 +46,9 @@ case "$FIRMWARE" in
@@ -1110,7 +1123,7 @@ index 5eae9c6e80..8d3006381d 100644
  	esac
  	;;
  "ath10k/pre-cal-ahb-a000000.wifi.bin")
-@@ -154,6 +157,9 @@ case "$FIRMWARE" in
+@@ -159,6 +162,9 @@ case "$FIRMWARE" in
  		caldata_extract "ART" 0x1000 0x2f20
  		ath10k_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) -2)
  		;;
@@ -1120,7 +1133,7 @@ index 5eae9c6e80..8d3006381d 100644
  	esac
  	;;
  "ath10k/pre-cal-ahb-a800000.wifi.bin")
-@@ -262,11 +268,6 @@ case "$FIRMWARE" in
+@@ -273,11 +279,6 @@ case "$FIRMWARE" in
  		caldata_extract "ART" 0x5000 0x2f20
  		ath10k_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) -1)
  		;;
@@ -1133,7 +1146,7 @@ index 5eae9c6e80..8d3006381d 100644
  	;;
  *)
 diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
-index 5582696759..530545e442 100644
+index 54683977cd..cbdd12c750 100644
 --- a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
 +++ b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
 @@ -72,7 +72,8 @@ platform_do_upgrade() {
@@ -1148,10 +1161,10 @@ index 5582696759..530545e442 100644
  	alfa-network,ap120c-ac)
 diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-tp-link-ec420-g1.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-tp-link-ec420-g1.dts
 new file mode 100755
-index 0000000000..fc48e605d5
+index 0000000000..9f6fdd5e76
 --- /dev/null
 +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-tp-link-ec420-g1.dts
-@@ -0,0 +1,276 @@
+@@ -0,0 +1,275 @@
 +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 +
 +#include "qcom-ipq4019.dtsi"
@@ -1344,7 +1357,6 @@ index 0000000000..fc48e605d5
 +			partition5@e0000 {
 +				label = "0:APPSBLENV";
 +				reg = <0x000e0000 0x00010000>;
-+				read-only;
 +			};
 +			partition6@f0000 {
 +				label = "0:APPSBL";
@@ -1429,10 +1441,10 @@ index 0000000000..fc48e605d5
 +};
 +
 diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk
-index 487bba77b0..ee648edc50 100644
+index 31f4971c90..ec3e779a44 100644
 --- a/target/linux/ipq40xx/image/generic.mk
 +++ b/target/linux/ipq40xx/image/generic.mk
-@@ -820,3 +820,18 @@ define Device/zyxel_wre6606
+@@ -816,3 +816,18 @@ define Device/zyxel_wre6606
  	DEVICE_PACKAGES := -kmod-ath10k-ct kmod-ath10k-ct-smallbuffers
  endef
  TARGET_DEVICES += zyxel_wre6606
@@ -1448,7 +1460,7 @@ index 487bba77b0..ee648edc50 100644
 +	BLOCKSIZE := 128k
 +	PAGESIZE := 2048
 +	SUPPORTED_DEVICES := tp-link,ec420-g1
-+	DEVICE_PACKAGES := ath10k-firmware-qca9984-ct ipq-wifi-tp-link_ec420-g1
++	DEVICE_PACKAGES := ath10k-firmware-qca9984-ct ipq-wifi-tp-link_ec420-g1 uboot-envtools
 +endef
 +TARGET_DEVICES += tp-link_ec420_g1
 diff --git a/target/linux/ipq40xx/patches-5.4/998-tp-link-ec420-g1.patch b/target/linux/ipq40xx/patches-5.4/998-tp-link-ec420-g1.patch

patches/0032-ipq806x-update-to-latest-HEAD.patch

@@ -1,16 +1,15 @@
-From f50e63e5eb4a8b3a15985183c337301f87e5b6ed Mon Sep 17 00:00:00 2001
+From a16429d604a6c2cff7b2791e380fc57827485f03 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
-Date: Wed, 18 Aug 2021 12:13:29 +0200
-Subject: [PATCH] ipq806x: update to latest HEAD
+Date: Sat, 4 Sep 2021 06:01:17 +0200
+Subject: [PATCH 32/43] ipq806x: update to latest HEAD
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
  target/linux/ipq806x/Makefile                 |   1 +
  .../ipq806x/base-files/etc/board.d/01_leds    |   1 -
- .../ipq806x/base-files/etc/board.d/02_network |  22 +-
+ .../ipq806x/base-files/etc/board.d/02_network |  17 +-
  .../etc/hotplug.d/firmware/11-ath10k-caldata  |  58 +-
  .../ipq806x/base-files/etc/init.d/bootcount   |   7 +-
- .../ipq806x/base-files/etc/init.d/cpufreq     |  17 +
  .../base-files/lib/preinit/04_reorder_eth     |  13 +
  .../ipq806x/base-files/lib/upgrade/asrock.sh  |   4 +-
  .../base-files/lib/upgrade/platform.sh        |  19 +-
@@ -93,7 +92,6 @@ Signed-off-by: John Crispin <john@phrozen.org>
  ...-dt-Add-L2-frequency-scaling-support.patch | 199 ----
  ...056-cpufreq-dt-Add-missing-rcu-locks.patch |  23 -
  ...conflicts-with-OpenWrt-auto-mounting.patch |  23 -
- ...sens-support-configurable-interrupts.patch |   2 +-
  .../0069-arm-boot-add-dts-files.patch         |   3 +-
  .../083-ipq8064-dtsi-additions.patch          |  84 +-
  ...qcom-cpufreq-nvmem-support-specific-.patch |  51 +
@@ -106,8 +104,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
  ...conflicts-with-OpenWrt-auto-mounting.patch |  24 +
  .../patches-5.4/851-add-gsbi1-dts.patch       |   2 +-
  .../linux/ipq806x/patches-5.4/999-at803.patch |  12 -
- 101 files changed, 9212 insertions(+), 1367 deletions(-)
- create mode 100755 target/linux/ipq806x/base-files/etc/init.d/cpufreq
+ 99 files changed, 9190 insertions(+), 1365 deletions(-)
  create mode 100644 target/linux/ipq806x/base-files/lib/preinit/04_reorder_eth
  create mode 100644 target/linux/ipq806x/config-5.10
  create mode 100644 target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-rt4230w-rev6.dts
@@ -194,7 +191,7 @@ index 284f9e2c1d..74b94a29b4 100755
  # Copyright (C) 2015 OpenWrt.org
  #
 diff --git a/target/linux/ipq806x/base-files/etc/board.d/02_network b/target/linux/ipq806x/base-files/etc/board.d/02_network
-index ddef4b7ac6..1a1cec51aa 100755
+index 1e00b97092..1a1cec51aa 100755
 --- a/target/linux/ipq806x/base-files/etc/board.d/02_network
 +++ b/target/linux/ipq806x/base-files/etc/board.d/02_network
 @@ -1,4 +1,3 @@
@@ -227,23 +224,7 @@ index ddef4b7ac6..1a1cec51aa 100755
  	;;
  linksys,ea7500-v1)
  	hw_mac_addr=$(mtd_get_mac_ascii devinfo hw_mac_addr)
-@@ -51,7 +57,6 @@ nec,wg2600hp3)
- 		"2:lan" "3:lan" "4:lan" "5:lan" "0@eth1" "1:wan" "6@eth0"
- 	;;
- netgear,r7800 |\
--tplink,ad7200 |\
- tplink,c2600)
- 	ucidef_add_switch "switch0" \
- 		"1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "6@eth1" "5:wan" "0@eth0"
-@@ -66,11 +71,18 @@ qcom,ipq8064-db149)
- 	ucidef_add_switch "switch0" \
- 		"1:lan" "2:lan" "3:lan" "4:lan" "6u@eth1" "5:wan" "0u@eth0"
- 	;;
-+tplink,ad7200)
-+	ucidef_add_switch "switch0" \
-+		"2:lan:1" "3:lan:2" "4:lan:3" "5:lan:4" "6@eth1" "1:wan" "0@eth0"
-+	;;
- ubnt,unifi-ac-hd)
+@@ -73,7 +79,10 @@ ubnt,unifi-ac-hd)
  	ucidef_set_interface_lan "eth0 eth1"
  	;;
  zyxel,nbg6817)
@@ -404,29 +385,6 @@ index 7a54c34dba..cb32a4ed35 100755
  		;;
  	edgecore,ecw5410)
  		fw_setenv bootcount 0
-diff --git a/target/linux/ipq806x/base-files/etc/init.d/cpufreq b/target/linux/ipq806x/base-files/etc/init.d/cpufreq
-new file mode 100755
-index 0000000000..19278902ed
---- /dev/null
-+++ b/target/linux/ipq806x/base-files/etc/init.d/cpufreq
-@@ -0,0 +1,17 @@
-+#!/bin/sh /etc/rc.common
-+
-+START=15
-+
-+boot() {
-+  local governor
-+
-+  governor=$(cat /sys/devices/system/cpu/cpufreq/policy0/scaling_governor)
-+
-+  if [ "$governor" = "ondemand" ]; then
-+    # Effective only with ondemand
-+    echo 600000 > /sys/devices/system/cpu/cpufreq/policy0/scaling_min_freq
-+    echo 600000 > /sys/devices/system/cpu/cpufreq/policy1/scaling_min_freq
-+    echo 10 > /sys/devices/system/cpu/cpufreq/ondemand/sampling_down_factor
-+    echo 50 > /sys/devices/system/cpu/cpufreq/ondemand/up_threshold
-+  fi
-+}
 diff --git a/target/linux/ipq806x/base-files/lib/preinit/04_reorder_eth b/target/linux/ipq806x/base-files/lib/preinit/04_reorder_eth
 new file mode 100644
 index 0000000000..9f58473617
@@ -6662,7 +6620,7 @@ diff --git a/target/linux/ipq806x/patches-5.4/0002-dmaengine-Add-ADM-driver.patc
 similarity index 82%
 rename from target/linux/ipq806x/patches-5.4/0002-dmaengine-Add-ADM-driver.patch
 rename to target/linux/ipq806x/patches-5.10/100-v5.11-dmaengine-qcom-add_ADM_driver.patch
-index aa7d2e791e..2d24da01e4 100644
+index 7aa46526f2..2d24da01e4 100644
 --- a/target/linux/ipq806x/patches-5.4/0002-dmaengine-Add-ADM-driver.patch
 +++ b/target/linux/ipq806x/patches-5.10/100-v5.11-dmaengine-qcom-add_ADM_driver.patch
 @@ -1,86 +1,88 @@
@@ -6714,7 +6672,7 @@ index aa7d2e791e..2d24da01e4 100644
  
  --- a/drivers/dma/qcom/Kconfig
  +++ b/drivers/dma/qcom/Kconfig
--@@ -28,3 +28,13 @@ config QCOM_HIDMA
+-@@ -29,3 +29,13 @@ config QCOM_HIDMA
 - 	  (user to kernel, kernel to kernel, etc.).  It only supports
 - 	  memcpy interface. The core is not intended for general
 - 	  purpose slave DMA.
@@ -9874,19 +9832,6 @@ index ff6f6edf49..0000000000
 - 		/*
 - 		 * The last SMEM partition may have its size marked as
 - 		 * something like 0xffffffff, which means "until the end of the
-diff --git a/target/linux/ipq806x/patches-5.4/0063-2-tsens-support-configurable-interrupts.patch b/target/linux/ipq806x/patches-5.4/0063-2-tsens-support-configurable-interrupts.patch
-index 585bd62a58..54488f25a8 100644
---- a/target/linux/ipq806x/patches-5.4/0063-2-tsens-support-configurable-interrupts.patch
-+++ b/target/linux/ipq806x/patches-5.4/0063-2-tsens-support-configurable-interrupts.patch
-@@ -163,7 +163,7 @@ Signed-off-by: Rajith Cherian <rajith@codeaurora.org>
-  	mutex_unlock(&tzd->lock);
-  
-  	return tzd;
--@@ -762,7 +802,10 @@ static const char * const trip_types[] =
-+@@ -765,7 +805,10 @@ static const char * const trip_types[] =
-  	[THERMAL_TRIP_ACTIVE]	= "active",
-  	[THERMAL_TRIP_PASSIVE]	= "passive",
-  	[THERMAL_TRIP_HOT]	= "hot",
 diff --git a/target/linux/ipq806x/patches-5.4/0069-arm-boot-add-dts-files.patch b/target/linux/ipq806x/patches-5.4/0069-arm-boot-add-dts-files.patch
 index 055a4cbc30..b97d36fd7c 100644
 --- a/target/linux/ipq806x/patches-5.4/0069-arm-boot-add-dts-files.patch

patches/0033-feeds.conf.default-drop-luci.patch

@@ -1,7 +1,7 @@
-From 1a20d4d44bf4601fef37aaf0e9f12d1bee89a022 Mon Sep 17 00:00:00 2001
+From a53506fd073dd451840c3c1974e579a8861f9205 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Tue, 4 May 2021 16:48:48 +0200
-Subject: [PATCH] feeds.conf.default: drop luci
+Subject: [PATCH 33/43] feeds.conf.default: drop luci
 
 we require luci-trunk for the gateway images.
 

patches/0034-ath79-various-fixes.patch

@@ -0,0 +1,38 @@
+From 83b7e4074c238cb64f727cde16cdfcc530aaa329 Mon Sep 17 00:00:00 2001
+From: John Crispin <john@phrozen.org>
+Date: Sat, 8 May 2021 11:30:32 +0200
+Subject: [PATCH 34/43] ath79: various fixes
+
+* free up additional 1MB rootfs space
+* make the target use bridge-vlan
+* use the single eth port as wan
+
+Signed-off-by: John Crispin <john@phrozen.org>
+---
+ target/linux/ath79/generic/base-files/etc/board.d/02_network | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network
+index d70432ad2b..b0b152ba74 100755
+--- a/target/linux/ath79/generic/base-files/etc/board.d/02_network
++++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network
+@@ -95,7 +95,7 @@ ath79_setup_interfaces()
+ 	ubnt,unifi|\
+ 	wd,mynet-wifi-rangeextender|\
+ 	winchannel,wb2000)
+-		ucidef_set_interface_lan "eth0"
++		ucidef_set_interface_wan "eth0"
+ 		;;
+ 	airtight,c-75)
+ 		ucidef_add_switch "switch0" \
+@@ -675,6 +675,7 @@ ath79_setup_macs()
+ 
+ board_config_update
+ board=$(board_name)
++ucidef_set_bridge_device bridge
+ ath79_setup_interfaces $board
+ ath79_setup_macs $board
+ board_config_flush
+-- 
+2.25.1
+

patches/0035-ath79-various-fixes.patch

@@ -1,88 +0,0 @@
-From 167c998efc5ba755bafc1aca1bf68d9e694e4c10 Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Sat, 8 May 2021 11:30:32 +0200
-Subject: [PATCH] ath79: various fixes
-
-* free up additional 1MB rootfs space
-* make the target use bridge-vlan
-* use the single eth port as wan
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- target/linux/ath79/dts/ar9344_tplink_cpe.dtsi | 20 ++++++++-----------
- .../generic/base-files/etc/board.d/02_network |  3 ++-
- tools/firmware-utils/src/tplink-safeloader.c  |  4 ++--
- 3 files changed, 12 insertions(+), 15 deletions(-)
-
-diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe.dtsi b/target/linux/ath79/dts/ar9344_tplink_cpe.dtsi
-index d4b7de440a..c5ab963174 100644
---- a/target/linux/ath79/dts/ar9344_tplink_cpe.dtsi
-+++ b/target/linux/ath79/dts/ar9344_tplink_cpe.dtsi
-@@ -59,20 +59,16 @@
- 			partition@40000 {
- 				label = "firmware";
- 				reg = <0x040000 0x780000>;
-+			};
- 
--				compatible = "fixed-partitions";
--				#address-cells = <1>;
--				#size-cells = <1>;
--
--				partition@0 {
--					label = "kernel";
--					reg = <0x000000 0x300000>;
--				};
-+			partition@040000 {
-+				label = "kernel";
-+				reg = <0x040000 0x210000>;
-+			};
- 
--				partition@300000 {
--					label = "rootfs";
--					reg = <0x300000 0x480000>;
--				};
-+			partition@340000 {
-+				label = "rootfs";
-+				reg = <0x250000 0x560000>;
- 			};
- 
- 			partition@7c0000 {
-diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network
-index 1e522b91c6..b8bc38348e 100755
---- a/target/linux/ath79/generic/base-files/etc/board.d/02_network
-+++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network
-@@ -94,7 +94,7 @@ ath79_setup_interfaces()
- 	ubnt,unifi|\
- 	wd,mynet-wifi-rangeextender|\
- 	winchannel,wb2000)
--		ucidef_set_interface_lan "eth0"
-+		ucidef_set_interface_wan "eth0"
- 		;;
- 	airtight,c-75)
- 		ucidef_add_switch "switch0" \
-@@ -669,6 +669,7 @@ ath79_setup_macs()
- 
- board_config_update
- board=$(board_name)
-+ucidef_set_bridge_device bridge
- ath79_setup_interfaces $board
- ath79_setup_macs $board
- board_config_flush
-diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c
-index ac71b3305e..2bc4a3cb82 100644
---- a/tools/firmware-utils/src/tplink-safeloader.c
-+++ b/tools/firmware-utils/src/tplink-safeloader.c
-@@ -443,8 +443,8 @@ static struct device_info boards[] = {
- 			{"default-mac", 0x30000, 0x00020},
- 			{"product-info", 0x31100, 0x00100},
- 			{"signature", 0x32000, 0x00400},
--			{"os-image", 0x40000, 0x300000},
--			{"file-system", 0x340000, 0x470000},
-+			{"os-image", 0x40000, 0x210000},
-+			{"file-system", 0x250000, 0x560000},
- 			{"soft-version", 0x7b0000, 0x00100},
- 			{"support-list", 0x7b1000, 0x00400},
- 			{"user-config", 0x7c0000, 0x10000},
--- 
-2.25.1
-

patches/0035-certificates-add-ability-to-persistently-store-certi.patch

@@ -1,16 +1,15 @@
-From 6d0385f31cc4f19df8fc51b56bb08af7c9c0922a Mon Sep 17 00:00:00 2001
+From ee837f028bd7af515d30a8a90cc2b5ee61eecf19 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
-Date: Sun, 23 May 2021 09:59:53 +0200
-Subject: [PATCH 07/11] certificates: add ability to persistently store
+Date: Sat, 4 Sep 2021 06:04:54 +0200
+Subject: [PATCH 35/43] certificates: add ability to persistently store
  certificates
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
- target/linux/ath79/dts/qca9563_tplink_cpe710-v1.dts       | 7 ++++++-
- .../files/arch/arm/boot/dts/qcom-ipq4019-xx8300.dtsi      | 3 +--
- .../linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi  | 7 ++++++-
- .../linux/realtek/dts/rtl8392_edgecore_ecs4100-12ph.dts   | 8 ++++++--
- 4 files changed, 19 insertions(+), 6 deletions(-)
+ target/linux/ath79/dts/qca9563_tplink_cpe710-v1.dts        | 7 ++++++-
+ .../files/arch/arm/boot/dts/qcom-ipq4019-xx8300.dtsi       | 3 +--
+ .../linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi   | 7 ++++++-
+ 3 files changed, 13 insertions(+), 4 deletions(-)
 
 diff --git a/target/linux/ath79/dts/qca9563_tplink_cpe710-v1.dts b/target/linux/ath79/dts/qca9563_tplink_cpe710-v1.dts
 index 830c3d30b8..71c6381f86 100644
@@ -63,28 +62,6 @@ index b6ce7b1f56..471be72001 100644
  			};
  
  			partition@7c0000 {
-diff --git a/target/linux/realtek/dts/rtl8392_edgecore_ecs4100-12ph.dts b/target/linux/realtek/dts/rtl8392_edgecore_ecs4100-12ph.dts
-index 303b79ac83..7a228aea86 100644
---- a/target/linux/realtek/dts/rtl8392_edgecore_ecs4100-12ph.dts
-+++ b/target/linux/realtek/dts/rtl8392_edgecore_ecs4100-12ph.dts
-@@ -176,11 +176,15 @@
- 				reg = <0x100000 0x100000>;
- 				read-only;
- 			};
--			partition@b260000 {
-+			partition@200000 {
- 				label = "firmware";
--				reg = <0x200000 0xe00000>;
-+				reg = <0x200000 0xdf0000>;
- 				compatible = "openwrt,uimage", "denx,uimage";
- 			};
-+			partition@ff0000 {
-+				label = "certificates";
-+				reg = <0xff0000 0x10000>;
-+			};
- 		};
- 	};
- };
 -- 
 2.25.1
 

patches/0036-ipq4018-add-EdgeCore-SPW2AC1200-support.patch

@@ -1,7 +1,7 @@
-From c651355c099a42c12f1953f4d027b32172a45bbb Mon Sep 17 00:00:00 2001
+From f7eed3ee6f7bb086a9bc0e049cc411d1bc98ed33 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
-Date: Thu, 1 Jul 2021 16:37:24 +0200
-Subject: [PATCH] ipq4018: add EdgeCore SPW2AC1200 support
+Date: Sat, 4 Sep 2021 06:15:19 +0200
+Subject: [PATCH 36/43] ipq4018: add EdgeCore SPW2AC1200 support
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -17,7 +17,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
  create mode 100644 target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-spw2ac1200.dts
 
 diff --git a/package/boot/uboot-envtools/files/ipq40xx b/package/boot/uboot-envtools/files/ipq40xx
-index b24cbf979e..ac66a7f2bd 100644
+index 44a8688dbe..ab489a6e18 100644
 --- a/package/boot/uboot-envtools/files/ipq40xx
 +++ b/package/boot/uboot-envtools/files/ipq40xx
 @@ -34,6 +34,7 @@ case "$board" in
@@ -29,10 +29,10 @@ index b24cbf979e..ac66a7f2bd 100644
  glinet,gl-b1300 |\
  luma,wrtq-329acn |\
 diff --git a/target/linux/ipq40xx/base-files/etc/board.d/01_leds b/target/linux/ipq40xx/base-files/etc/board.d/01_leds
-index f9674126ba..efd5d002db 100755
+index c1d4e693f2..d473448137 100755
 --- a/target/linux/ipq40xx/base-files/etc/board.d/01_leds
 +++ b/target/linux/ipq40xx/base-files/etc/board.d/01_leds
-@@ -63,6 +63,7 @@ qxwlan,e2600ac-c2)
+@@ -71,6 +71,7 @@ qxwlan,e2600ac-c2)
  	ucidef_set_led_wlan "wlan5g" "WLAN1" "green:wlan1" "phy1tpt"
  	;;
  edgecore,ecw5211 |\
@@ -41,10 +41,10 @@ index f9674126ba..efd5d002db 100755
  zyxel,nbg6617 |\
  zyxel,wre6606)
 diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network
-index 597fa9f08b..7bc8c5e6aa 100755
+index 16f6040b6e..0240798bbb 100755
 --- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
 +++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
-@@ -43,6 +43,7 @@ ipq40xx_setup_interfaces()
+@@ -45,6 +45,7 @@ ipq40xx_setup_interfaces()
  	cilab,meshpoint-one|\
  	cig,wf610d|\
  	edgecore,ecw5211|\
@@ -53,10 +53,10 @@ index 597fa9f08b..7bc8c5e6aa 100755
  	openmesh,a42|\
  	openmesh,a62)
 diff --git a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-index a9bbc791b8..da7931d018 100644
+index c8943d3ba3..ad2946f636 100644
 --- a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
 +++ b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-@@ -101,6 +101,7 @@ case "$FIRMWARE" in
+@@ -104,6 +104,7 @@ case "$FIRMWARE" in
  	compex,wpj419 |\
  	compex,wpj428 |\
  	edgecore,ecw5211 |\
@@ -64,7 +64,7 @@ index a9bbc791b8..da7931d018 100644
  	edgecore,oap100 |\
  	engenius,eap1300 |\
  	engenius,eap2200 |\
-@@ -212,6 +213,7 @@ case "$FIRMWARE" in
+@@ -220,6 +221,7 @@ case "$FIRMWARE" in
  	compex,wpj419 |\
  	compex,wpj428 |\
  	edgecore,ecw5211 |\
@@ -73,7 +73,7 @@ index a9bbc791b8..da7931d018 100644
  	engenius,eap1300 |\
  	engenius,eap2200 |\
 diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
-index 530545e442..f6fc828134 100644
+index cbdd12c750..84abd181dc 100644
 --- a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
 +++ b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
 @@ -76,7 +76,9 @@ platform_do_upgrade() {
@@ -426,10 +426,10 @@ index 0000000000..a152ba57f4
 +	status = "okay";
 +};
 diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk
-index ee648edc50..e4e437bb95 100644
+index ec3e779a44..4448ed6083 100644
 --- a/target/linux/ipq40xx/image/generic.mk
 +++ b/target/linux/ipq40xx/image/generic.mk
-@@ -376,6 +376,19 @@ define Device/edgecore_ecw5211
+@@ -374,6 +374,19 @@ define Device/edgecore_ecw5211
  endef
  TARGET_DEVICES += edgecore_ecw5211
  
@@ -450,15 +450,15 @@ index ee648edc50..e4e437bb95 100644
  	$(call Device/FitImage)
  	$(call Device/UbiFit)
 diff --git a/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch b/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
-index aec0d01ed6..492cc67b2c 100644
+index aa2fc4bd17..ae0b8f2025 100644
 --- a/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
 +++ b/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
 @@ -10,7 +10,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
  
  --- a/arch/arm/boot/dts/Makefile
  +++ b/arch/arm/boot/dts/Makefile
--@@ -837,11 +837,59 @@ dtb-$(CONFIG_ARCH_QCOM) += \
-+@@ -837,11 +837,60 @@ dtb-$(CONFIG_ARCH_QCOM) += \
+-@@ -837,11 +837,61 @@ dtb-$(CONFIG_ARCH_QCOM) += \
++@@ -837,11 +837,62 @@ dtb-$(CONFIG_ARCH_QCOM) += \
   	qcom-apq8074-dragonboard.dtb \
   	qcom-apq8084-ifc6540.dtb \
   	qcom-apq8084-mtp.dtb \

patches/0037-Revert-libusb-update-to-1.0.24.patch

@@ -0,0 +1,141 @@
+From 0cb58169aa1f1b29c0c713469bdc7b352cdf85f3 Mon Sep 17 00:00:00 2001
+From: John Crispin <john@phrozen.org>
+Date: Fri, 2 Jul 2021 12:02:04 +0200
+Subject: [PATCH 21/27] Revert "libusb: update to 1.0.24"
+
+This reverts commit 0798b13d7df0deafd005b14d52420c4f480d146e.
+---
+ package/libs/libusb/Makefile                  |  6 +-
+ ...n-the-Changelog-and-clean-up-a-stray.patch | 29 ---------
+ ...parsing-of-descriptors-for-multi-con.patch | 61 -------------------
+ 3 files changed, 3 insertions(+), 93 deletions(-)
+ delete mode 100644 package/libs/libusb/patches/001-Correct-a-typo-in-the-Changelog-and-clean-up-a-stray.patch
+ delete mode 100644 package/libs/libusb/patches/002-linux_usbfs-Fix-parsing-of-descriptors-for-multi-con.patch
+
+diff --git a/package/libs/libusb/Makefile b/package/libs/libusb/Makefile
+index 6b80b3848d..1667fb2840 100644
+--- a/package/libs/libusb/Makefile
++++ b/package/libs/libusb/Makefile
+@@ -8,14 +8,14 @@
+ include $(TOPDIR)/rules.mk
+ 
+ PKG_NAME:=libusb
+-PKG_VERSION:=1.0.24
+-PKG_RELEASE:=$(AUTORELEASE)
++PKG_VERSION:=1.0.22
++PKG_RELEASE:=2
+ 
+ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+ PKG_SOURCE_URL:=\
+   https://github.com/libusb/libusb/releases/download/v$(PKG_VERSION) \
+   @SF/$(PKG_NAME)
+-PKG_HASH:=7efd2685f7b327326dcfb85cee426d9b871fd70e22caa15bb68d595ce2a2b12a
++PKG_HASH:=75aeb9d59a4fdb800d329a545c2e6799f732362193b465ea198f2aa275518157
+ 
+ PKG_MAINTAINER:= Felix Fietkau <nbd@nbd.name>
+ PKG_LICENSE:=LGPL-2.1-or-later
+diff --git a/package/libs/libusb/patches/001-Correct-a-typo-in-the-Changelog-and-clean-up-a-stray.patch b/package/libs/libusb/patches/001-Correct-a-typo-in-the-Changelog-and-clean-up-a-stray.patch
+deleted file mode 100644
+index b17d6178d3..0000000000
+--- a/package/libs/libusb/patches/001-Correct-a-typo-in-the-Changelog-and-clean-up-a-stray.patch
++++ /dev/null
+@@ -1,29 +0,0 @@
+-From 369af149e3ad92514a2d24f112cedfeb7acaf558 Mon Sep 17 00:00:00 2001
+-From: Chris Dickens <christopher.a.dickens@gmail.com>
+-Date: Sun, 13 Dec 2020 15:46:27 -0800
+-Subject: [PATCH] Correct a typo in the Changelog and clean up a stray file
+-
+-Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
+----
+- ChangeLog             | 2 +-
+- libusb/version_nano.h | 2 +-
+- test                  | 0
+- 3 files changed, 2 insertions(+), 2 deletions(-)
+- delete mode 100644 test
+-
+---- a/ChangeLog
+-+++ b/ChangeLog
+-@@ -12,7 +12,7 @@ visit: http://log.libusb.info
+- * Darwin (macOS): use IOUSBDevice as darwin_device_class explicitly (#693)
+- * Linux: Drop support for kernel older than 2.6.32
+- * Linux: Provide an event thread name (#689)
+--* Linux: Wait until all USBs have been reaped before freeing them (#607)
+-+* Linux: Wait until all URBs have been reaped before freeing them (#607)
+- * NetBSD: Recognize device timeouts (#710)
+- * OpenBSD: Allow opening ugen devices multiple times (#763)
+- * OpenBSD: Support libusb_get_port_number() (#764)
+---- a/libusb/version_nano.h
+-+++ b/libusb/version_nano.h
+-@@ -1 +1 @@
+--#define LIBUSB_NANO 11584
+-+#define LIBUSB_NANO 11585
+diff --git a/package/libs/libusb/patches/002-linux_usbfs-Fix-parsing-of-descriptors-for-multi-con.patch b/package/libs/libusb/patches/002-linux_usbfs-Fix-parsing-of-descriptors-for-multi-con.patch
+deleted file mode 100644
+index a53a8900de..0000000000
+--- a/package/libs/libusb/patches/002-linux_usbfs-Fix-parsing-of-descriptors-for-multi-con.patch
++++ /dev/null
+@@ -1,61 +0,0 @@
+-From f6d2cb561402c3b6d3627c0eb89e009b503d9067 Mon Sep 17 00:00:00 2001
+-From: Chris Dickens <christopher.a.dickens@gmail.com>
+-Date: Sun, 13 Dec 2020 15:49:19 -0800
+-Subject: [PATCH] linux_usbfs: Fix parsing of descriptors for
+- multi-configuration devices
+-
+-Commit e2be556bd2 ("linux_usbfs: Parse config descriptors during device
+-initialization") introduced a regression for devices with multiple
+-configurations. The logic that verifies the reported length of the
+-configuration descriptors failed to count the length of the
+-configuration descriptor itself and would truncate the actual length by
+-9 bytes, leading to a parsing error for subsequent descriptors.
+-
+-Closes #825
+-
+-Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
+----
+- libusb/os/linux_usbfs.c | 12 ++++++++----
+- libusb/version_nano.h   |  2 +-
+- 2 files changed, 9 insertions(+), 5 deletions(-)
+-
+---- a/libusb/os/linux_usbfs.c
+-+++ b/libusb/os/linux_usbfs.c
+-@@ -641,7 +641,12 @@ static int seek_to_next_config(struct li
+- 	uint8_t *buffer, size_t len)
+- {
+- 	struct usbi_descriptor_header *header;
+--	int offset = 0;
+-+	int offset;
+-+
+-+	/* Start seeking past the config descriptor */
+-+	offset = LIBUSB_DT_CONFIG_SIZE;
+-+	buffer += LIBUSB_DT_CONFIG_SIZE;
+-+	len -= LIBUSB_DT_CONFIG_SIZE;
+- 
+- 	while (len > 0) {
+- 		if (len < 2) {
+-@@ -718,7 +723,7 @@ static int parse_config_descriptors(stru
+- 		}
+- 
+- 		if (priv->sysfs_dir) {
+--			 /*
+-+			/*
+- 			 * In sysfs wTotalLength is ignored, instead the kernel returns a
+- 			 * config descriptor with verified bLength fields, with descriptors
+- 			 * with an invalid bLength removed.
+-@@ -727,8 +732,7 @@ static int parse_config_descriptors(stru
+- 			int offset;
+- 
+- 			if (num_configs > 1 && idx < num_configs - 1) {
+--				offset = seek_to_next_config(ctx, buffer + LIBUSB_DT_CONFIG_SIZE,
+--							     remaining - LIBUSB_DT_CONFIG_SIZE);
+-+				offset = seek_to_next_config(ctx, buffer, remaining);
+- 				if (offset < 0)
+- 					return offset;
+- 				sysfs_config_len = (uint16_t)offset;
+---- a/libusb/version_nano.h
+-+++ b/libusb/version_nano.h
+-@@ -1 +1 @@
+--#define LIBUSB_NANO 11585
+-+#define LIBUSB_NANO 11586
+-- 
+2.25.1
+

patches/0038-Revert-libusb-update-to-1.0.24.patch

@@ -1,35 +0,0 @@
-From 4f4e6eec1cab67d6cea9bfa61da5fbbd1a21fdee Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Fri, 2 Jul 2021 12:02:04 +0200
-Subject: [PATCH] Revert "libusb: update to 1.0.24"
-
-This reverts commit 0798b13d7df0deafd005b14d52420c4f480d146e.
----
- package/libs/libusb/Makefile | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/package/libs/libusb/Makefile b/package/libs/libusb/Makefile
-index e931536339..1667fb2840 100644
---- a/package/libs/libusb/Makefile
-+++ b/package/libs/libusb/Makefile
-@@ -8,14 +8,14 @@
- include $(TOPDIR)/rules.mk
- 
- PKG_NAME:=libusb
--PKG_VERSION:=1.0.24
--PKG_RELEASE:=1
-+PKG_VERSION:=1.0.22
-+PKG_RELEASE:=2
- 
- PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
- PKG_SOURCE_URL:=\
-   https://github.com/libusb/libusb/releases/download/v$(PKG_VERSION) \
-   @SF/$(PKG_NAME)
--PKG_HASH:=7efd2685f7b327326dcfb85cee426d9b871fd70e22caa15bb68d595ce2a2b12a
-+PKG_HASH:=75aeb9d59a4fdb800d329a545c2e6799f732362193b465ea198f2aa275518157
- 
- PKG_MAINTAINER:= Felix Fietkau <nbd@nbd.name>
- PKG_LICENSE:=LGPL-2.1-or-later
--- 
-2.25.1
-

patches/0038-firewall-enable-ssh-on-wan-during-early-boot-stage.patch

@@ -1,7 +1,7 @@
-From 1147a7312c432eebe0de619463fae582051e2e97 Mon Sep 17 00:00:00 2001
+From a7bfcdcf6675076c1a8a71aac6e2d8793345e8a6 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Mon, 12 Jul 2021 13:10:48 +0200
-Subject: [PATCH 37/37] firewall: enable ssh on wan during early boot stage
+Subject: [PATCH 38/43] firewall: enable ssh on wan during early boot stage
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---

patches/0039-netifd-fix-compile-on-older-kernels.patch

@@ -1,7 +1,7 @@
-From 5bf7a4a5befe6add789249fe02b737e353137146 Mon Sep 17 00:00:00 2001
+From 4b7e51305fcbf27d8c447e165484f513f9ec7185 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Wed, 4 Aug 2021 08:36:30 +0200
-Subject: [PATCH] netifd: fix compile on older kernels
+Subject: [PATCH 39/43] netifd: fix compile on older kernels
 
 The ethtool features do not exist on ancient qualcomm kernels.
 Disable that feature if running on QCA.

patches/0040-ipq40xx-add-Wallys-DR40x9-support.patch

@@ -1,7 +1,7 @@
-From 5a0366889960ae89594177854b77889cdf22ac63 Mon Sep 17 00:00:00 2001
+From 5a9dfd7deb119a2960b062afb9c1a5e7ddc4cf2e Mon Sep 17 00:00:00 2001
 From: Robert Marko <robert.marko@sartura.hr>
-Date: Fri, 13 Aug 2021 18:28:21 +0200
-Subject: [PATCH] ipq40xx: add Wallys DR40x9 support
+Date: Sat, 4 Sep 2021 06:19:42 +0200
+Subject: [PATCH 40/43] ipq40xx: add Wallys DR40x9 support
 
 Adds support for the Wallys DR40x9 series boards.
 They come in IPQ4019 and IPQ4029 versions.
@@ -54,10 +54,10 @@ Signed-off-by: Robert Marko <robert.marko@sartura.hr>
  create mode 100644 target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq40x9-dr40x9.dts
 
 diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile
-index 87dcf9a769..192e8dcf7e 100644
+index c9d113ae6a..b222ce30d6 100644
 --- a/package/firmware/ipq-wifi/Makefile
 +++ b/package/firmware/ipq-wifi/Makefile
-@@ -49,6 +49,7 @@ ALLWIFIBOARDS:= \
+@@ -51,6 +51,7 @@ ALLWIFIBOARDS:= \
  	plasmacloud_pa2200 \
  	qxwlan_e2600ac \
  	cig_wf610d \
@@ -65,7 +65,7 @@ index 87dcf9a769..192e8dcf7e 100644
  	tp-link_ec420-g1
  
  ALLWIFIPACKAGES:=$(foreach BOARD,$(ALLWIFIBOARDS),ipq-wifi-$(BOARD))
-@@ -135,5 +136,6 @@ $(eval $(call generate-ipq-wifi-package,plasmacloud_pa2200,Plasma Cloud PA2200))
+@@ -139,5 +140,6 @@ $(eval $(call generate-ipq-wifi-package,plasmacloud_pa2200,Plasma Cloud PA2200))
  $(eval $(call generate-ipq-wifi-package,qxwlan_e2600ac,Qxwlan E2600AC))
  $(eval $(call generate-ipq-wifi-package,cig_wf610d,CIG WF_610D))
  $(eval $(call generate-ipq-wifi-package,tp-link_ec420-g1,tp-link EC420-G1))
@@ -135,7 +135,7 @@ literal 0
 HcmV?d00001
 
 diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network
-index 9d03b620ce..cfcf518907 100755
+index 0240798bbb..5a2a3a47f7 100755
 --- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
 +++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
 @@ -19,7 +19,8 @@ ipq40xx_setup_interfaces()
@@ -163,7 +163,7 @@ index c255707f91..e1f75fd4bd 100755
  
  board_config_flush
 diff --git a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-index 56b9935541..561c8289e7 100644
+index ad2946f636..64bb4efaf8 100644
 --- a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
 +++ b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
 @@ -115,7 +115,8 @@ case "$FIRMWARE" in
@@ -176,7 +176,7 @@ index 56b9935541..561c8289e7 100644
  		caldata_extract "0:ART" 0x1000 0x2f20
  		;;
  	devolo,magic-2-wifi-next)
-@@ -227,7 +228,8 @@ case "$FIRMWARE" in
+@@ -232,7 +233,8 @@ case "$FIRMWARE" in
  	plasmacloud,pa2200 |\
  	qxwlan,e2600ac-c1 |\
  	qxwlan,e2600ac-c2 |\
@@ -187,7 +187,7 @@ index 56b9935541..561c8289e7 100644
  		;;
  	devolo,magic-2-wifi-next)
 diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
-index f6fc828134..7ebe0396f6 100644
+index 84abd181dc..8840372ba9 100644
 --- a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
 +++ b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
 @@ -73,6 +73,7 @@ platform_do_upgrade() {
@@ -592,10 +592,10 @@ index 0000000000..cb3296f5e5
 +	status = "okay";
 +};
 diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk
-index e4e437bb95..7cbfecb233 100644
+index 4448ed6083..540f1f2778 100644
 --- a/target/linux/ipq40xx/image/generic.mk
 +++ b/target/linux/ipq40xx/image/generic.mk
-@@ -834,6 +834,19 @@ define Device/zyxel_wre6606
+@@ -830,6 +830,19 @@ define Device/zyxel_wre6606
  endef
  TARGET_DEVICES += zyxel_wre6606
  
@@ -616,19 +616,19 @@ index e4e437bb95..7cbfecb233 100644
  	$(call Device/FitImage)
  	$(call Device/UbiFit)
 diff --git a/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch b/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
-index 492cc67b2c..4d686df304 100644
+index ae0b8f2025..826e17b0e9 100644
 --- a/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
 +++ b/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
 @@ -10,7 +10,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
  
  --- a/arch/arm/boot/dts/Makefile
  +++ b/arch/arm/boot/dts/Makefile
--@@ -837,11 +837,60 @@ dtb-$(CONFIG_ARCH_QCOM) += \
-+@@ -837,11 +837,61 @@ dtb-$(CONFIG_ARCH_QCOM) += \
+-@@ -837,11 +837,62 @@ dtb-$(CONFIG_ARCH_QCOM) += \
++@@ -837,11 +837,63 @@ dtb-$(CONFIG_ARCH_QCOM) += \
   	qcom-apq8074-dragonboard.dtb \
   	qcom-apq8084-ifc6540.dtb \
   	qcom-apq8084-mtp.dtb \
-@@ -68,6 +68,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
+@@ -70,6 +70,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
  +	qcom-ipq4029-gl-b1300.dtb \
  +	qcom-ipq4029-gl-s1300.dtb \
  +	qcom-ipq4029-mr33.dtb \

patches/0041-base-files-fix-rootfs_data_max-support-during-sysupg.patch

@@ -0,0 +1,27 @@
+From 35412c4626e6b2195421452926dd9b2854bceb9a Mon Sep 17 00:00:00 2001
+From: John Crispin <john@phrozen.org>
+Date: Tue, 17 Aug 2021 17:29:22 +0200
+Subject: [PATCH 41/43] base-files: fix rootfs_data_max support during
+ sysupgrade
+
+Signed-off-by: John Crispin <john@phrozen.org>
+---
+ package/base-files/files/sbin/sysupgrade | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
+index 7e0a00e13b..5a2d459013 100755
+--- a/package/base-files/files/sbin/sysupgrade
++++ b/package/base-files/files/sbin/sysupgrade
+@@ -357,6 +357,8 @@ if [ $TEST -eq 1 ]; then
+ 	exit 0
+ fi
+ 
++fw_printenv > /dev/null
++
+ install_bin /sbin/upgraded
+ v "Commencing upgrade. Closing all shell sessions."
+ 
+-- 
+2.25.1
+

patches/0042-ipq40xx-add-HFCL-ION4-support.patch

@@ -1,7 +1,7 @@
-From e3a96108c0773915b53a08d04a98192338c5aeb9 Mon Sep 17 00:00:00 2001
+From 5804d7fe3e3860c33a6957320661efd40b077a9e Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Thu, 26 Aug 2021 17:34:47 +0200
-Subject: [PATCH] ipq40xx: add HFCL ION4 support
+Subject: [PATCH 42/43] ipq40xx: add HFCL ION4 support
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -12,17 +12,17 @@ Signed-off-by: John Crispin <john@phrozen.org>
  .../etc/hotplug.d/firmware/11-ath10k-caldata  |   6 +
  .../base-files/lib/upgrade/platform.sh        |   1 +
  .../arm/boot/dts/qcom-ipq4019-hfcl-ion4.dts   | 226 ++++++++++++++++++
- target/linux/ipq40xx/image/generic.mk         |  19 ++
+ target/linux/ipq40xx/image/generic.mk         |  18 ++
  .../ipq40xx/patches-5.4/999-hfcl_ion.patch    |  12 +
- 9 files changed, 276 insertions(+), 1 deletion(-)
+ 9 files changed, 275 insertions(+), 1 deletion(-)
  create mode 100644 target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-hfcl-ion4.dts
  create mode 100644 target/linux/ipq40xx/patches-5.4/999-hfcl_ion.patch
 
 diff --git a/package/boot/uboot-envtools/files/ipq40xx b/package/boot/uboot-envtools/files/ipq40xx
-index ac66a7f2bd..9d39350544 100644
+index ab489a6e18..fd7ad69eff 100644
 --- a/package/boot/uboot-envtools/files/ipq40xx
 +++ b/package/boot/uboot-envtools/files/ipq40xx
-@@ -63,6 +63,10 @@ linksys,mr8300)
+@@ -64,6 +64,10 @@ tp-link,ec420-g1 |\
  zyxel,nbg6617)
  	ubootenv_add_uci_config "/dev/mtd6" "0x0" "0x10000" "0x10000"
  	;;
@@ -34,10 +34,10 @@ index ac66a7f2bd..9d39350544 100644
  
  config_load ubootenv
 diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile
-index 23fc4caa2e..e887e5ad1c 100644
+index b222ce30d6..cd7bfc3c82 100644
 --- a/package/firmware/ipq-wifi/Makefile
 +++ b/package/firmware/ipq-wifi/Makefile
-@@ -51,7 +51,8 @@ ALLWIFIBOARDS:= \
+@@ -52,7 +52,8 @@ ALLWIFIBOARDS:= \
  	qxwlan_e2600ac \
  	cig_wf610d \
  	wallys_dr40x9 \
@@ -47,7 +47,7 @@ index 23fc4caa2e..e887e5ad1c 100644
  
  ALLWIFIPACKAGES:=$(foreach BOARD,$(ALLWIFIBOARDS),ipq-wifi-$(BOARD))
  
-@@ -139,5 +140,6 @@ $(eval $(call generate-ipq-wifi-package,qxwlan_e2600ac,Qxwlan E2600AC))
+@@ -141,5 +142,6 @@ $(eval $(call generate-ipq-wifi-package,qxwlan_e2600ac,Qxwlan E2600AC))
  $(eval $(call generate-ipq-wifi-package,cig_wf610d,CIG WF_610D))
  $(eval $(call generate-ipq-wifi-package,tp-link_ec420-g1,tp-link EC420-G1))
  $(eval $(call generate-ipq-wifi-package,wallys_dr40x9,Wallys DR40X9))
@@ -55,10 +55,10 @@ index 23fc4caa2e..e887e5ad1c 100644
  
  $(foreach PACKAGE,$(ALLWIFIPACKAGES),$(eval $(call BuildPackage,$(PACKAGE))))
 diff --git a/target/linux/ipq40xx/base-files/etc/board.d/01_leds b/target/linux/ipq40xx/base-files/etc/board.d/01_leds
-index efd5d002db..57d3664423 100755
+index d473448137..d944d72184 100755
 --- a/target/linux/ipq40xx/base-files/etc/board.d/01_leds
 +++ b/target/linux/ipq40xx/base-files/etc/board.d/01_leds
-@@ -70,6 +70,10 @@ zyxel,wre6606)
+@@ -78,6 +78,10 @@ zyxel,wre6606)
  	ucidef_set_led_wlan "wlan2g" "WLAN2G" "green:wlan2g" "phy0tpt"
  	ucidef_set_led_wlan "wlan5g" "WLAN5G" "green:wlan5g" "phy1tpt"
  	;;
@@ -70,10 +70,10 @@ index efd5d002db..57d3664423 100755
  
  board_config_flush
 diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network
-index cfcf518907..84596dcf88 100755
+index 5a2a3a47f7..e4b009bf93 100755
 --- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
 +++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
-@@ -33,6 +33,7 @@ ipq40xx_setup_interfaces()
+@@ -34,6 +34,7 @@ ipq40xx_setup_interfaces()
  	netgear,ex6100v2|\
  	netgear,ex6150v2|\
  	tp-link,ec420-g1|\
@@ -82,10 +82,10 @@ index cfcf518907..84596dcf88 100755
  		ucidef_set_interface_wan "eth0"
  		;;
 diff --git a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-index 561c8289e7..d38decf77b 100644
+index 64bb4efaf8..97dd1b4039 100644
 --- a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
 +++ b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-@@ -162,6 +162,9 @@ case "$FIRMWARE" in
+@@ -167,6 +167,9 @@ case "$FIRMWARE" in
  	tp-link,ec420-g1)
  		caldata_extract "0:ART" 0x1000 0x2f20
  		;;
@@ -95,7 +95,7 @@ index 561c8289e7..d38decf77b 100644
  	esac
  	;;
  "ath10k/pre-cal-ahb-a800000.wifi.bin")
-@@ -272,6 +275,9 @@ case "$FIRMWARE" in
+@@ -283,6 +286,9 @@ case "$FIRMWARE" in
  		caldata_extract "ART" 0x5000 0x2f20
  		ath10k_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) -1)
  		;;
@@ -106,7 +106,7 @@ index 561c8289e7..d38decf77b 100644
  	;;
  *)
 diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
-index 7ebe0396f6..c404f32f41 100644
+index 8840372ba9..53bc1adeb5 100644
 --- a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
 +++ b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
 @@ -74,6 +74,7 @@ platform_do_upgrade() {
@@ -119,7 +119,7 @@ index 7ebe0396f6..c404f32f41 100644
  		;;
 diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-hfcl-ion4.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-hfcl-ion4.dts
 new file mode 100644
-index 0000000000..662eb7dff0
+index 0000000000..7437b98c02
 --- /dev/null
 +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-hfcl-ion4.dts
 @@ -0,0 +1,226 @@
@@ -350,11 +350,11 @@ index 0000000000..662eb7dff0
 +	vlan_tag = <0 0x20>;
 +};
 diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk
-index 7cbfecb233..896f2a657c 100644
+index 540f1f2778..ae1e2e49cf 100644
 --- a/target/linux/ipq40xx/image/generic.mk
 +++ b/target/linux/ipq40xx/image/generic.mk
-@@ -861,3 +861,22 @@ define Device/tp-link_ec420_g1
- 	DEVICE_PACKAGES := ath10k-firmware-qca9984-ct ipq-wifi-tp-link_ec420-g1
+@@ -857,3 +857,21 @@ define Device/tp-link_ec420_g1
+ 	DEVICE_PACKAGES := ath10k-firmware-qca9984-ct ipq-wifi-tp-link_ec420-g1 uboot-envtools
  endef
  TARGET_DEVICES += tp-link_ec420_g1
 +
@@ -373,7 +373,6 @@ index 7cbfecb233..896f2a657c 100644
 +	IMAGES := nand-sysupgrade.bin
 +	IMAGE/nand-sysupgrade.bin := sysupgrade-tar | append-metadata
 +	DEVICE_PACKAGES := uboot-envtools
-+	_DEVICE_PACKAGES := ipq-wifi-hfcl_ion4 uboot-envtools
 +endef
 +TARGET_DEVICES += hfcl_ion4
 diff --git a/target/linux/ipq40xx/patches-5.4/999-hfcl_ion.patch b/target/linux/ipq40xx/patches-5.4/999-hfcl_ion.patch

patches/0043-ipq806x-add-edgecore_ssw2ac2600-support.patch

@@ -1,7 +1,7 @@
-From e5f38285a39a57f3f6faa6450e8b9e9847dfcc7a Mon Sep 17 00:00:00 2001
+From 282fff50a526b7eef8f4ffbaf9c2a01c407920ad Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Wed, 18 Aug 2021 15:49:56 +0200
-Subject: [PATCH] ipq806x: add edgecore_ssw2ac2600 support
+Subject: [PATCH 43/43] ipq806x: add edgecore_ssw2ac2600 support
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -33,7 +33,7 @@ index 96a4ee6450..1b49fd51d4 100644
  	ubootenv_add_uci_config "/dev/mtd11" "0x0" "0x10000" "0x10000"
  	;;
 diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile
-index 192e8dcf7e..23fc4caa2e 100644
+index cd7bfc3c82..a400ac9470 100644
 --- a/package/firmware/ipq-wifi/Makefile
 +++ b/package/firmware/ipq-wifi/Makefile
 @@ -33,6 +33,7 @@ ALLWIFIBOARDS:= \
@@ -44,7 +44,7 @@ index 192e8dcf7e..23fc4caa2e 100644
  	edgecore_oap100 \
  	engenius_eap2200 \
  	engenius_emd1 \
-@@ -119,6 +120,7 @@ $(eval $(call generate-ipq-wifi-package,cellc_rtl30vw, Cell C RTL30VW))
+@@ -122,6 +123,7 @@ $(eval $(call generate-ipq-wifi-package,cellc_rtl30vw, Cell C RTL30VW))
  $(eval $(call generate-ipq-wifi-package,devolo_magic-2-wifi-next,devolo Magic 2 WiFi next))
  $(eval $(call generate-ipq-wifi-package,dlink_dap2610,D-Link DAP-2610))
  $(eval $(call generate-ipq-wifi-package,edgecore_ecw5410,Edgecore ECW5410))