diff --git a/patches/0001-gluon-web-cellular-add-auth-option-to-GUI.patch b/patches/0001-gluon-web-cellular-add-auth-option-to-GUI.patch deleted file mode 100644 index 735d0dce..00000000 --- a/patches/0001-gluon-web-cellular-add-auth-option-to-GUI.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 3e1c937d0eb8946cc8226c7255734f6ffc26b3a5 Mon Sep 17 00:00:00 2001 -From: Tobias <5702338+T0biii@users.noreply.github.com> -Date: Sat, 6 Jul 2024 01:03:28 +0200 -Subject: [PATCH] gluon-web-cellular: add auth option to GUI - ---- - .../luasrc/lib/gluon/upgrade/250-cellular | 2 ++ - package/gluon-web-cellular/i18n/de.po | 15 +++++++++++++++ - .../i18n/gluon-web-cellular.pot | 15 +++++++++++++++ - .../gluon/config-mode/model/admin/cellular.lua | 9 +++++++++ - 4 files changed, 41 insertions(+) - -diff --git a/package/gluon-core/luasrc/lib/gluon/upgrade/250-cellular b/package/gluon-core/luasrc/lib/gluon/upgrade/250-cellular -index 27294c4d..300347e3 100755 ---- a/package/gluon-core/luasrc/lib/gluon/upgrade/250-cellular -+++ b/package/gluon-core/luasrc/lib/gluon/upgrade/250-cellular -@@ -21,6 +21,7 @@ local function setup_ncm_qmi(devpath, control_type, delay) - local pincode = uci:get('gluon', 'cellular', 'pin') - local username = uci:get('gluon', 'cellular', 'username') - local password = uci:get('gluon', 'cellular', 'password') -+ local auth = uci:get('gluon', 'cellular', 'auth') - - uci:section('network', 'interface', 'cellular', { - proto = control_type, -@@ -40,6 +41,7 @@ local function setup_ncm_qmi(devpath, control_type, delay) - set_or_delete('network', 'cellular', 'pincode', pincode) - set_or_delete('network', 'cellular', 'username', username) - set_or_delete('network', 'cellular', 'password', password) -+ set_or_delete('network', 'cellular', 'auth', auth) - set_or_delete('network', 'cellular', 'delay', delay) - end - -diff --git a/package/gluon-web-cellular/i18n/de.po b/package/gluon-web-cellular/i18n/de.po -index 81405234..daf464a4 100644 ---- a/package/gluon-web-cellular/i18n/de.po -+++ b/package/gluon-web-cellular/i18n/de.po -@@ -47,3 +47,18 @@ msgstr "" - "Du kannst den Uplink über einen Mobilfunk Service aktivieren. Wenn du " - "dich dafür entscheidest, wird die VPN-Verbindung über das integrierte " - "Mobilfunk-Modem hergestellt." -+ -+msgid "Authentication" -+msgstr "Authentifizierung" -+ -+msgid "None" -+msgstr "Keine" -+ -+msgid "PAP" -+msgstr "" -+ -+msgid "CHAP" -+msgstr "" -+ -+msgid "Both" -+msgstr "Beide" -diff --git a/package/gluon-web-cellular/i18n/gluon-web-cellular.pot b/package/gluon-web-cellular/i18n/gluon-web-cellular.pot -index 5b3b8ae0..cf345329 100644 ---- a/package/gluon-web-cellular/i18n/gluon-web-cellular.pot -+++ b/package/gluon-web-cellular/i18n/gluon-web-cellular.pot -@@ -35,3 +35,18 @@ msgid "" - "You can enable uplink via cellular service. If you decide so, the VPN " - "connection is established using the integrated WWAN modem." - msgstr "" -+ -+msgid "Authentication" -+msgstr "" -+ -+msgid "None" -+msgstr "" -+ -+msgid "PAP" -+msgstr "" -+ -+msgid "CHAP" -+msgstr "" -+ -+msgid "Both" -+msgstr "" -diff --git a/package/gluon-web-cellular/luasrc/lib/gluon/config-mode/model/admin/cellular.lua b/package/gluon-web-cellular/luasrc/lib/gluon/config-mode/model/admin/cellular.lua -index 38a4dd2c..123ed6f2 100644 ---- a/package/gluon-web-cellular/luasrc/lib/gluon/config-mode/model/admin/cellular.lua -+++ b/package/gluon-web-cellular/luasrc/lib/gluon/config-mode/model/admin/cellular.lua -@@ -33,6 +33,14 @@ local password = s:option(Value, "password", translate("Password")) - password:depends(enabled, true) - password.default = uci:get('gluon', 'cellular', 'password') - -+local auth = s:option(ListValue, "auth", translate("Authentication")) -+auth:depends(enabled, true) -+auth:value("none", translate("None")) -+auth:value("pap", translate("PAP")) -+auth:value("chap", translate("CHAP")) -+auth:value("both", translate("Both")) -+auth.default = uci:get('gluon', 'cellular', 'auth') or "none" -+ - function f:write() - local cellular_enabled = false - if enabled.data then -@@ -46,6 +54,7 @@ function f:write() - pin = pin.data, - username = username.data, - password = password.data, -+ auth = auth.data, - }) - - uci:commit('gluon') --- -2.45.1 - diff --git a/patches/0001-kirkwood-add-Linksys-E4200-v2-Viper-Router-3240.patch b/patches/0001-kirkwood-add-Linksys-E4200-v2-Viper-Router-3240.patch deleted file mode 100644 index 8fa40b59..00000000 --- a/patches/0001-kirkwood-add-Linksys-E4200-v2-Viper-Router-3240.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 7a5e752560bb035a6436b82b26892edfee795e8c Mon Sep 17 00:00:00 2001 -From: darkdragon-001 -Date: Tue, 9 Apr 2024 14:15:15 +0200 -Subject: [PATCH 1/2] kirkwood: add Linksys E4200 v2 (Viper) Router (#3240) - ---- - .github/filters.yml | 10 ++++++++++ - .../luasrc/lib/gluon/upgrade/010-primary-mac | 3 +++ - targets/kirkwood-generic | 5 +++++ - targets/targets.mk | 1 + - 4 files changed, 19 insertions(+) - create mode 100644 targets/kirkwood-generic - -diff --git a/.github/filters.yml b/.github/filters.yml -index 2f634f35..41e4b5a2 100644 ---- a/.github/filters.yml -+++ b/.github/filters.yml -@@ -292,6 +292,16 @@ - "targets/targets.mk", - "targets/bcm27xx.inc" - ], -+ "kirkwood-generic": [ -+ "targets/kirkwood-generic", -+ ".github/workflows/build-gluon.yml", -+ "modules", -+ "Makefile", -+ "patches/**", -+ "scripts/**", -+ "targets/generic", -+ "targets/targets.mk" -+ ], - "mvebu-cortexa9": [ - "targets/mvebu-cortexa9", - ".github/workflows/build-gluon.yml", -diff --git a/package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac b/package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac -index fce501a6..a2946d9e 100755 ---- a/package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac -+++ b/package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac -@@ -119,6 +119,9 @@ local primary_addrs = { - 'openmesh,a42', - 'openmesh,a62', - }}, -+ {'kirkwood', 'generic', { -+ 'linksys,e4200-v2', -+ }}, - {'mpc85xx', 'p1020', { - 'aerohive,hiveap-330', - 'ocedo,panda', -diff --git a/targets/kirkwood-generic b/targets/kirkwood-generic -new file mode 100644 -index 00000000..e36ae484 ---- /dev/null -+++ b/targets/kirkwood-generic -@@ -0,0 +1,5 @@ -+-- Linksys -+ -+device('linksys-e4200-v2', 'linksys_e4200-v2', { -+ broken = true, -- 802.11s untested -+}) -diff --git a/targets/targets.mk b/targets/targets.mk -index 14955134..20224a06 100644 ---- a/targets/targets.mk -+++ b/targets/targets.mk -@@ -29,5 +29,6 @@ $(eval $(call GluonTarget,x86,64)) - ifeq ($(BROKEN),1) - $(eval $(call GluonTarget,bcm27xx,bcm2710)) # BROKEN: Untested - $(eval $(call GluonTarget,bcm27xx,bcm2711)) # BROKEN: No 11s support, no reset button, sys LED issues -+$(eval $(call GluonTarget,kirkwood,generic)) # BROKEN: 11s support untested - $(eval $(call GluonTarget,mvebu,cortexa9)) # BROKEN: No 11s support - endif --- -2.34.1 - diff --git a/patches/0002-kirkwood-generic-fix-device-name-of-Linksys-E4200-v2.patch b/patches/0002-kirkwood-generic-fix-device-name-of-Linksys-E4200-v2.patch deleted file mode 100644 index 24d33c1c..00000000 --- a/patches/0002-kirkwood-generic-fix-device-name-of-Linksys-E4200-v2.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3634f2126f159c01b55f62190a29ff61ad04e7ad Mon Sep 17 00:00:00 2001 -From: Matthias Schiffer -Date: Mon, 24 Jun 2024 23:18:28 +0200 -Subject: [PATCH 2/2] kirkwood-generic: fix device name of Linksys E4200 v2 - -The model name has a codename suffix: -https://git.openwrt.org/?p=openwrt/openwrt.git;a=blob;f=target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-e4200-v2.dts;h=bfd708a677c96a9f3bdf80ead2db4498487ac5f8;hb=refs/heads/openwrt-23.05#l6 ---- - targets/kirkwood-generic | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/targets/kirkwood-generic b/targets/kirkwood-generic -index e36ae484..0c61da01 100644 ---- a/targets/kirkwood-generic -+++ b/targets/kirkwood-generic -@@ -1,5 +1,5 @@ - -- Linksys - --device('linksys-e4200-v2', 'linksys_e4200-v2', { -+device('linksys-e4200-v2-viper', 'linksys_e4200-v2', { - broken = true, -- 802.11s untested - }) --- -2.34.1 - diff --git a/patches/fritzbox-7530-7520-lan1-as-wan-pr3312.patch b/patches/fritzbox-7530-7520-lan1-as-wan-pr3312.patch deleted file mode 100644 index 585fc4c3..00000000 --- a/patches/fritzbox-7530-7520-lan1-as-wan-pr3312.patch +++ /dev/null @@ -1,52 +0,0 @@ -From be4213de25403d808f1c3e9c45030119091eff77 Mon Sep 17 00:00:00 2001 -From: Florian Maurer -Date: Thu, 21 Dec 2023 15:35:57 +0100 -Subject: [PATCH 1/2] fritzbox-7530: utilize lan1 as wan, others as lan With - the switch to DSA on this board, we can now utilize the ports better, by - splitting them according to their usage - -Signed-off-by: Florian Maurer ---- - package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces b/package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces -index 9c3f1dc9b66..5e5243a0a15 100755 ---- a/package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces -+++ b/package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces -@@ -63,6 +63,10 @@ elseif platform.match('ath79', 'generic', { - 'ubnt,unifiac-pro', - }) then - lan_ifname, wan_ifname = 'eth0.2', 'eth0.1' -+elseif platform.match('ipq40xx', 'generic', { -+ 'avm,fritzbox-7530', -+}) then -+ lan_ifname, wan_ifname = 'lan2 lan3 lan4', 'lan1' - elseif platform.match('ramips', 'mt7621', { - 'netgear,wac104', - }) then - -From 27fe1ed4e28c31fdbc0c84366957ad4329324c03 Mon Sep 17 00:00:00 2001 -From: Grische -Date: Tue, 9 Jul 2024 18:25:54 +0200 -Subject: [PATCH 2/2] gluon-core: migrate lan role of single port config - -when a device is migrated from a single WAN/LAN configuration to a -multi-port configuration (e.g. using DSA), set the same role on all -ports and not just the new WAN port. ---- - package/gluon-core/luasrc/lib/gluon/upgrade/021-interface-roles | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/package/gluon-core/luasrc/lib/gluon/upgrade/021-interface-roles b/package/gluon-core/luasrc/lib/gluon/upgrade/021-interface-roles -index 6bceb36e55b..3040341155f 100755 ---- a/package/gluon-core/luasrc/lib/gluon/upgrade/021-interface-roles -+++ b/package/gluon-core/luasrc/lib/gluon/upgrade/021-interface-roles -@@ -43,6 +43,7 @@ if uci:get('gluon', 'iface_wan') then - end - if uci:get('gluon', 'iface_single') then - roles.wan = uci:get_list('gluon', 'iface_single', 'role') -+ roles.lan = uci:get_list('gluon', 'iface_single', 'role') - end - - -- Non-existing interfaces are nil, so they will not be added to the table