From c5e297e9c83a0fd0641f29e4633cff7d6b8ca4b0 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Fri, 14 Oct 2022 23:17:20 +0200 Subject: [PATCH 1/3] modules: update openwrt a7fb589e8a image: always rebuild kernel loaders 5db6914f7c mpc85xx: p1010: make TP-Link WDR4900 v1 build again f7a43e4606 mpc85xx: add SPI kernel loader for TP-Link TL-WDR4900 v1 c1fcca50ba ramips: fix ZyXEL NWA55AXE model name 2050bc4f64 ramips: add support for ZyXEL NWA50AX / NWA55AXE bc8e24c654 busybox: nslookup: ensure unique transaction IDs for the DNS queries --- modules | 2 +- ...1-make-DSA-images-swconfig-upgradable.patch | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules b/modules index 204011a8..9cb8e3dd 100644 --- a/modules +++ b/modules @@ -2,7 +2,7 @@ GLUON_FEEDS='packages routing gluon' OPENWRT_REPO=https://github.com/openwrt/openwrt.git OPENWRT_BRANCH=openwrt-22.03 -OPENWRT_COMMIT=f1de43d0a045a154c74281bc60bf1c44c990071b +OPENWRT_COMMIT=a7fb589e8a9df06bd0e36c91d05806f1e8aeb9e8 PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git PACKAGES_PACKAGES_BRANCH=openwrt-22.03 diff --git a/patches/openwrt/0004-ramips-mt7621-make-DSA-images-swconfig-upgradable.patch b/patches/openwrt/0004-ramips-mt7621-make-DSA-images-swconfig-upgradable.patch index c65aeb46..b85a7608 100644 --- a/patches/openwrt/0004-ramips-mt7621-make-DSA-images-swconfig-upgradable.patch +++ b/patches/openwrt/0004-ramips-mt7621-make-DSA-images-swconfig-upgradable.patch @@ -3,10 +3,10 @@ Date: Sun, 5 Jun 2022 23:43:38 +0200 Subject: ramips-mt7621: make DSA images swconfig upgradable diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk -index c07ab39afdebd38b7e1764b86eaceb4e2108768c..635e1a0b006347197751d8850feed3c30202a1ea 100644 +index a3bdacb32a1657c15cba29512466b34a97af2e9a..b5ca3438de9fe20112110e653b016f13cb7f55ea 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk -@@ -172,7 +172,6 @@ endef +@@ -179,7 +179,6 @@ endef TARGET_DEVICES += asiarf_ap7621-nv1 define Device/asus_rt-ac57u @@ -14,7 +14,7 @@ index c07ab39afdebd38b7e1764b86eaceb4e2108768c..635e1a0b006347197751d8850feed3c3 DEVICE_VENDOR := ASUS DEVICE_MODEL := RT-AC57U DEVICE_ALT0_VENDOR := ASUS -@@ -418,7 +417,6 @@ endef +@@ -425,7 +424,6 @@ endef TARGET_DEVICES += dlink_dir-853-r1 define Device/dlink_dir-860l-b1 @@ -22,7 +22,7 @@ index c07ab39afdebd38b7e1764b86eaceb4e2108768c..635e1a0b006347197751d8850feed3c3 $(Device/seama) SEAMA_SIGNATURE := wrgac13_dlink.2013gui_dir860lb LOADER_TYPE := bin -@@ -1227,7 +1225,6 @@ endef +@@ -1234,7 +1232,6 @@ endef TARGET_DEVICES += mts_wg430223 define Device/netgear_ex6150 @@ -30,7 +30,7 @@ index c07ab39afdebd38b7e1764b86eaceb4e2108768c..635e1a0b006347197751d8850feed3c3 DEVICE_VENDOR := NETGEAR DEVICE_MODEL := EX6150 DEVICE_PACKAGES := kmod-mt76x2 -@@ -1239,7 +1236,6 @@ endef +@@ -1246,7 +1243,6 @@ endef TARGET_DEVICES += netgear_ex6150 define Device/netgear_sercomm_nand @@ -38,7 +38,7 @@ index c07ab39afdebd38b7e1764b86eaceb4e2108768c..635e1a0b006347197751d8850feed3c3 $(Device/uimage-lzma-loader) BLOCKSIZE := 128k PAGESIZE := 2048 -@@ -1422,7 +1418,6 @@ endef +@@ -1429,7 +1425,6 @@ endef TARGET_DEVICES += netgear_wax202 define Device/netgear_wndr3700-v5 @@ -46,7 +46,7 @@ index c07ab39afdebd38b7e1764b86eaceb4e2108768c..635e1a0b006347197751d8850feed3c3 $(Device/netgear_sercomm_nor) $(Device/uimage-lzma-loader) IMAGE_SIZE := 15232k -@@ -1746,7 +1741,6 @@ endef +@@ -1753,7 +1748,6 @@ endef TARGET_DEVICES += tplink_tl-wpa8631p-v3 define Device/ubnt_edgerouter_common @@ -54,7 +54,7 @@ index c07ab39afdebd38b7e1764b86eaceb4e2108768c..635e1a0b006347197751d8850feed3c3 $(Device/uimage-lzma-loader) DEVICE_VENDOR := Ubiquiti IMAGE_SIZE := 256768k -@@ -2143,7 +2137,6 @@ endef +@@ -2150,7 +2144,6 @@ endef TARGET_DEVICES += zbtlink_zbt-wg2626 define Device/zbtlink_zbt-wg3526-16m @@ -62,7 +62,7 @@ index c07ab39afdebd38b7e1764b86eaceb4e2108768c..635e1a0b006347197751d8850feed3c3 $(Device/uimage-lzma-loader) IMAGE_SIZE := 16064k DEVICE_VENDOR := Zbtlink -@@ -2156,7 +2149,6 @@ endef +@@ -2163,7 +2156,6 @@ endef TARGET_DEVICES += zbtlink_zbt-wg3526-16m define Device/zbtlink_zbt-wg3526-32m From 95385f6de732ea8ad51525979ef97ed28305a39d Mon Sep 17 00:00:00 2001 From: David Bauer Date: Fri, 14 Oct 2022 23:17:36 +0200 Subject: [PATCH 2/3] modules: update packages dba8a0102 gnunnet: halt build if any command fails c1700e3a3 gnunnet: don't copy non-existing files 9c68da83e gnunet: gnunet-rest: add libjose dependency e1d799255 opendoas: avoid libpam dependency 53c0a2767 Revert "wget: update to 1.21.3" e0502e477 zabbix: add variants for SSL support opkg does not offer ssl varients: zabbix-agentd zabbix-sender zabbix-get zabbix-proxy zabbix-server f9bbda2e4 wget: update to 1.21.3 0f48935ab auc: update to 0.3.1 62a7ef57d auc: update to version 0.3.0 427008a2a snowflake: update to version 2.3.1 d57a6a35b perl-net-dns: update to version 1.35 b4be6d6b1 pcsc-lite: update to verion 1.9.9 37de51dba gawk: update to version 5.2.0 5ca1c82f8 libksba: update to version 1.6.1 c033edcca gnunet: update to version 0.17.5 30b493619 libp11: update to version 0.4.12 f8f768f90 libinput: update to version 1.19.4 19874c3a7 libevdev: update to version 1.13.0 7dc69e306 postgresql: update to version 14.5 4493098f6 pcsc-lite: update to version 1.9.8 5d5348bc5 exim: update to version 4.96 8013e8929 gpgme: update to version 1.18.0 d0dd2a730 cryptsetup: update to version 2.5.0 c2296d930 lvm2: update to release 2.03.16 --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index 9cb8e3dd..6d05cb61 100644 --- a/modules +++ b/modules @@ -6,7 +6,7 @@ OPENWRT_COMMIT=a7fb589e8a9df06bd0e36c91d05806f1e8aeb9e8 PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git PACKAGES_PACKAGES_BRANCH=openwrt-22.03 -PACKAGES_PACKAGES_COMMIT=97a25e677817a97617ef017117e4ce18e1c8e639 +PACKAGES_PACKAGES_COMMIT=dba8a0102e5965cad58a871335002e9c964b6719 PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git PACKAGES_ROUTING_BRANCH=openwrt-22.03 From 301443da0237cab1a64f75a6624a6fc7d41d5623 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Fri, 14 Oct 2022 23:19:19 +0200 Subject: [PATCH 3/3] mpc85xx-p1010: re-enable TP-Link WDR4900 Upstream added a standalone SPI kernel-loader which fixes the unbootable image for the WDR4900. Thus, we can re-introduce this device to Gluon. Signed-off-by: David Bauer --- docs/user/supported_devices.rst | 4 ++++ targets/mpc85xx-p1010 | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/docs/user/supported_devices.rst b/docs/user/supported_devices.rst index 824e00fe..aeda89f5 100644 --- a/docs/user/supported_devices.rst +++ b/docs/user/supported_devices.rst @@ -274,6 +274,10 @@ mpc85xx-p1010 - RED 15w Rev.1 +* TP-Link + + - WDR4900 + mpc85xx-p1020 --------------- diff --git a/targets/mpc85xx-p1010 b/targets/mpc85xx-p1010 index eaf77294..1667509b 100644 --- a/targets/mpc85xx-p1010 +++ b/targets/mpc85xx-p1010 @@ -5,3 +5,7 @@ device('sophos-red-15w-rev.1', 'sophos_red-15w-rev1', { }) +-- TP-Link + +device('tp-link-tl-wdr4900-v1', 'tplink_tl-wdr4900-v1') +