From 3aba0fe610909b743b5fd9570d9acafb1157f43d Mon Sep 17 00:00:00 2001 From: David Bauer Date: Tue, 5 Jul 2022 23:45:04 +0200 Subject: [PATCH 1/2] gluon-core: remove unused lantiq case There was never a device with a dedicated WAN port supported in Gluon which could make use of such a workaround. As the only relevant lantiq-xrx200 target now uses swconfig anyways, we can remove this workaround. Signed-off-by: David Bauer --- .../gluon-core/luasrc/lib/gluon/upgrade/020-interfaces | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces b/package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces index 24a32e39..53febdb1 100755 --- a/package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces +++ b/package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces @@ -62,16 +62,6 @@ elseif platform.match('ath79', 'generic', { 'ubnt,unifiac-pro', }) then lan_ifname, wan_ifname = 'eth0.2', 'eth0.1' -elseif platform.match('lantiq') then - local switch_data = board_data.switch or {} - local switch0_data = switch_data.switch0 or {} - local roles_data = switch0_data.roles or {} - for _, role_data in ipairs(roles_data) do - if role_data.role == 'wan' then - wan_ifname = iface_exists(role_data.device) - break - end - end elseif platform.match('ramips', 'mt7621', { 'netgear,wac104', }) then From 17156cc06bd3efcb8505ad8f7cb6ee7902fee963 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Tue, 5 Jul 2022 23:49:49 +0200 Subject: [PATCH 2/2] lantiq-xrx200: make DSA images swconfig upgradable Update the device-support version for image-metadata so that older Gluon versions not implementing skipping minor compat-version checks are able to update to newer Gluon versions. Signed-off-by: David Bauer --- ...-make-DSA-images-swconfig-upgradable.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 patches/openwrt/0006-lantiq-xrx200-make-DSA-images-swconfig-upgradable.patch diff --git a/patches/openwrt/0006-lantiq-xrx200-make-DSA-images-swconfig-upgradable.patch b/patches/openwrt/0006-lantiq-xrx200-make-DSA-images-swconfig-upgradable.patch new file mode 100644 index 00000000..f97e3c05 --- /dev/null +++ b/patches/openwrt/0006-lantiq-xrx200-make-DSA-images-swconfig-upgradable.patch @@ -0,0 +1,30 @@ +From: David Bauer +Date: Tue, 5 Jul 2022 23:49:31 +0200 +Subject: lantiq-xrx200: make DSA images swconfig upgradable + +diff --git a/target/linux/lantiq/image/tp-link.mk b/target/linux/lantiq/image/tp-link.mk +index 756105b94c7f844439132ab57837c9ac87d231ca..5563968de9ab3f491fa89d755fcc6e6fff79948f 100644 +--- a/target/linux/lantiq/image/tp-link.mk ++++ b/target/linux/lantiq/image/tp-link.mk +@@ -1,7 +1,7 @@ + DEVICE_VARS += TPLINK_FLASHLAYOUT TPLINK_HWID TPLINK_HWREV TPLINK_HWREVADD TPLINK_HVERSION + + define Device/dsa-migration +- DEVICE_COMPAT_VERSION := 1.1 ++ DEVICE_COMPAT_VERSION := 1.0 + DEVICE_COMPAT_MESSAGE := Config cannot be migrated from swconfig to DSA + endef + +diff --git a/target/linux/lantiq/image/vr9.mk b/target/linux/lantiq/image/vr9.mk +index d17045b6db157a878534a28988accd8998ddd572..e83da928e57d827d33bca6bdef96df290bb67347 100644 +--- a/target/linux/lantiq/image/vr9.mk ++++ b/target/linux/lantiq/image/vr9.mk +@@ -1,7 +1,7 @@ + DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID + + define Device/dsa-migration +- DEVICE_COMPAT_VERSION := 1.1 ++ DEVICE_COMPAT_VERSION := 1.0 + DEVICE_COMPAT_MESSAGE := Config cannot be migrated from swconfig to DSA + endef +