From 9271070cdd01e21bf4e9b4498ee9bafc2f63e1bd Mon Sep 17 00:00:00 2001 From: Florian Maurer Date: Fri, 27 Dec 2024 00:47:03 +0100 Subject: [PATCH 1/5] modules: update openwrt 4cc1da1e44 hostapd: add SAE support for wifi-station and optimize PSK file creation db0300cb1b ath79: port buffalo WZR-450HP2 from ar71xx 7271ee587c mediatek: filogic: Add support for D-Link AQUILA PRO AI M60 5829178074 netfilter: add kmod-nfnetlink-ct{helper,timeout} d9bbed6507 mediatek: update openembed som7981 support 48f9284232 kernel: crypto: add atmel i2c hw accelerator support 738c9e5286 yafut: Mark as nonshared 55d1fe4aa6 mediatek: add Comfast CF-E395AX support by adding an alternative model name 45bf30e062 bmips: dts: fix pinctrl error ec49df8692 realtek: generate compat_version 2.0 for GS1900 d036b42dd9 uboot-rockchip: fix build with swig 4.3.0 f7398101db ipq40xx-generic: ws-ap3915i fix macadress 08f1bde12b ipq40xx-generic: EN WS-AP3915i remove BLOCKSIZE from image definition 372afe10f0 OpenWrt v24.10.0-rc4: revert to branch defaults 1e530e5831 OpenWrt v24.10.0-rc4: adjust config defaults d55754ce0d uboot-d1: Adapt BUILD_DEVICES to renamed boards 654c9732dc realtek: merge Zyxel GS1900 firmware partitions feb7a2a232 realtek: ZyXEL GS1900-48: drop gpio-restart f94c3af814 kernel: generic: netfilter: nft_set_hash: unaligned atomic read on struct nft_set_ext 4111210b27 kernel: bump 6.6 to 6.6.67 b2a172170c octeon: enable AT803x PHY driver 81c0cf031e build: d1: add SUPPORTED_DEVICES 975811921e OpenWrt v24.10.0-rc3: revert to branch defaults dd04edfba2 OpenWrt v24.10.0-rc3: adjust config defaults 8667ca841b generic: fix BCM54612E suspend/resume backport patch 5289460fd0 wifi-scripts: don't fail on unset PSK 9f76cda378 lantiq: grow kernel partition Zyxel P-2812HNU-F1 5415fb06d2 lantiq/xrx200: move 8M flash devices to a small flash subtarget 21549dbf7b kernel: bump 6.6 to 6.6.66 Signed-off-by: Florian Maurer --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index df7e0e93b5..3db13b78ec 100644 --- a/modules +++ b/modules @@ -2,7 +2,7 @@ GLUON_FEEDS='gluon packages routing' OPENWRT_REPO=https://github.com/openwrt/openwrt.git OPENWRT_BRANCH=openwrt-24.10 -OPENWRT_COMMIT=5a715cdbcdac03f5cdf1c3e89334c37dc8a008a2 +OPENWRT_COMMIT=4cc1da1e44c28aa153956e179f28b8ee38dc3ac6 PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git PACKAGES_GLUON_COMMIT=3d08b0fee8dc5d96d8bcdb985fad1d5564de4022 From d66cfc0cef1de1182108811bac07b20691f22c41 Mon Sep 17 00:00:00 2001 From: Florian Maurer Date: Fri, 27 Dec 2024 00:47:05 +0100 Subject: [PATCH 2/5] modules: update packages dfeae07c2 cloudflared: Update to 2024.12.2 f53926772 xray-core: Update to 24.12.18 37b019ae9 ack: Update to 3.8.0 62adf9e0e alist: Update to 3.41.0 b003ab1ee v2ray-geodata: Update to latest version 498a93ec9 dnsproxy: Update to 0.73.4 b9883eb8a nano: Update to 8.3 81d22b35c pbr: update to 1.1.8 Signed-off-by: Florian Maurer --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index 3db13b78ec..493378cf25 100644 --- a/modules +++ b/modules @@ -9,7 +9,7 @@ PACKAGES_GLUON_COMMIT=3d08b0fee8dc5d96d8bcdb985fad1d5564de4022 PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git PACKAGES_PACKAGES_BRANCH=openwrt-24.10 -PACKAGES_PACKAGES_COMMIT=e558c89b1b65cb1cb0babb3fbf9ee90eb64e21cc +PACKAGES_PACKAGES_COMMIT=dfeae07c2495539f85dbcb4c633eb52c6a9b2e72 PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git PACKAGES_ROUTING_BRANCH=openwrt-24.10 From b720d4d056f01ae61fcd95c2c3490d6731375945 Mon Sep 17 00:00:00 2001 From: Florian Maurer Date: Fri, 27 Dec 2024 00:47:06 +0100 Subject: [PATCH 3/5] patches: make refresh-patches Signed-off-by: Florian Maurer --- ...ement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/openwrt/0005-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch b/patches/openwrt/0005-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch index 54c9860b5f..5f90ad3f65 100644 --- a/patches/openwrt/0005-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch +++ b/patches/openwrt/0005-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch @@ -174,7 +174,7 @@ index 0000000000000000000000000000000000000000..077a563b6066cd1d3aee4b1e82328e8c + + int system_bridge_addif(struct device *bridge, struct device *dev) diff --git a/target/linux/generic/config-6.6 b/target/linux/generic/config-6.6 -index 105dc0d344fa82c85b09482e051f35a282a60b08..032dd15bbb2b8603799032647f7a47625751836f 100644 +index 2ea1b7910388f57a7ba3e5868a323618c0838d9c..cf46bf89de743c83410ea0ebd856ce13a8d38ed4 100644 --- a/target/linux/generic/config-6.6 +++ b/target/linux/generic/config-6.6 @@ -716,6 +716,7 @@ CONFIG_BRIDGE=y From b110494f6e7778a763627cad139e2a31664ec3d9 Mon Sep 17 00:00:00 2001 From: Florian Maurer Date: Fri, 27 Dec 2024 00:47:08 +0100 Subject: [PATCH 4/5] remove devices which were moved to lantiq-xrx200_legacy TP-Link TD-W8970 and TD-W8980 are affected Signed-off-by: Florian Maurer --- targets/lantiq-xrx200 | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/targets/lantiq-xrx200 b/targets/lantiq-xrx200 index 744fdea44e..7d000d89d2 100644 --- a/targets/lantiq-xrx200 +++ b/targets/lantiq-xrx200 @@ -54,21 +54,3 @@ device('arcadyan-vgv7510kw22', 'arcadyan_vgv7510kw22-nor', { factory = false, aliases = {'o2-box-6431'}, }) - - --- TP-Link - --- CAVEAT: These devices don't have a dedicated WAN port. --- All ethernet ports on the device are bridged and --- used as WAN ports. Clients connected to these --- ports will be connected to your private network. - -device('tp-link-td-w8970', 'tplink_tdw8970', { - factory = false, -}) - -device('tp-link-td-w8980', 'tplink_tdw8980', { - factory = false, - aliases = {'tp-link-td-w9980'}, - broken = true, -- 5GHz unsupported -}) From b5ba291b54b628724786eb8d72096c8a705f2f07 Mon Sep 17 00:00:00 2001 From: Florian Maurer Date: Fri, 27 Dec 2024 00:47:09 +0100 Subject: [PATCH 5/5] readd moved xrx200_legacy target replace only the first underscore in target_config_lib Signed-off-by: Florian Maurer --- .github/filters.yml | 10 ++++++++++ docs/user/supported_devices.rst | 3 +++ scripts/target_config_lib.lua | 2 +- targets/lantiq-xrx200_legacy | 30 ++++++++++++++++++++++++++++++ targets/targets.mk | 1 + 5 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 targets/lantiq-xrx200_legacy diff --git a/.github/filters.yml b/.github/filters.yml index 41e4b5a210..aa6ea75da6 100644 --- a/.github/filters.yml +++ b/.github/filters.yml @@ -115,6 +115,16 @@ "targets/generic", "targets/targets.mk" ], + "lantiq-xrx200_legacy": [ + "targets/lantiq-xrx200_legacy", + ".github/workflows/build-gluon.yml", + "modules", + "Makefile", + "patches/**", + "scripts/**", + "targets/generic", + "targets/targets.mk" + ], "lantiq-xway": [ "targets/lantiq-xway", ".github/workflows/build-gluon.yml", diff --git a/docs/user/supported_devices.rst b/docs/user/supported_devices.rst index 2946a3e21f..4d99d7e6ee 100644 --- a/docs/user/supported_devices.rst +++ b/docs/user/supported_devices.rst @@ -287,6 +287,9 @@ lantiq-xrx200 - FRITZ!Box 7362 SL [#eva_ramboot]_ [#lan_as_wan]_ - FRITZ!Box 7412 [#eva_ramboot]_ +lantiq-xrx200_legacy +-------------------- + * TP-Link - TD-W8970 (v1) [#lan_as_wan]_ diff --git a/scripts/target_config_lib.lua b/scripts/target_config_lib.lua index c20e64013e..750a419e9f 100644 --- a/scripts/target_config_lib.lua +++ b/scripts/target_config_lib.lua @@ -150,7 +150,7 @@ local function handle_target_pkgs(pkgs) end local function get_default_pkgs() - local targetinfo_target = string.gsub(openwrt_config_target, '_', '/') + local targetinfo_target = string.gsub(openwrt_config_target, '_', '/', 1) local target_matches = false for line in io.lines('openwrt/tmp/.targetinfo') do local target_match = string.match(line, '^Target: (.+)$') diff --git a/targets/lantiq-xrx200_legacy b/targets/lantiq-xrx200_legacy new file mode 100644 index 0000000000..c0ff62b021 --- /dev/null +++ b/targets/lantiq-xrx200_legacy @@ -0,0 +1,30 @@ +packages { + '-ltq-vdsl-vr9-vectoring-fw-installer', + '-kmod-ltq-vdsl-vr9-mei', + '-kmod-ltq-vdsl-vr9', + '-kmod-ltq-atm-vr9', + '-kmod-ltq-ptm-vr9', + '-kmod-ltq-deu-vr9', + '-ltq-vdsl-vr9-app', + '-dsl-vrx200-firmware-xdsl-a', + '-dsl-vrx200-firmware-xdsl-b-patch', + '-ppp-mod-pppoa', + '-ltq-dsl-base', +} + +-- TP-Link + +-- CAVEAT: These devices don't have a dedicated WAN port. +-- All ethernet ports on the device are bridged and +-- used as WAN ports. Clients connected to these +-- ports will be connected to your private network. + +device('tp-link-td-w8970', 'tplink_tdw8970', { + factory = false, +}) + +device('tp-link-td-w8980', 'tplink_tdw8980', { + factory = false, + aliases = {'tp-link-td-w9980'}, + broken = true, -- 5GHz unsupported +}) diff --git a/targets/targets.mk b/targets/targets.mk index 45a9f395f6..1ee2fe7c35 100644 --- a/targets/targets.mk +++ b/targets/targets.mk @@ -9,6 +9,7 @@ $(eval $(call GluonTarget,ipq40xx,generic)) $(eval $(call GluonTarget,ipq40xx,mikrotik)) $(eval $(call GluonTarget,ipq806x,generic)) $(eval $(call GluonTarget,lantiq,xrx200)) +$(eval $(call GluonTarget,lantiq,xrx200_legacy)) $(eval $(call GluonTarget,lantiq,xway)) $(eval $(call GluonTarget,mediatek,filogic)) $(eval $(call GluonTarget,mediatek,mt7622))