diff --git a/targets/ath79-generic b/targets/ath79-generic index 11d78ba28089a26c5bf0724146ed9549d12312fb..05c9c208997f777decc3adf5fbee5306fbb5a50d 100644 --- a/targets/ath79-generic +++ b/targets/ath79-generic @@ -69,11 +69,8 @@ device('avm-fritz-wlan-repeater-1750e', 'avm_fritz1750e', { device('buffalo-wzr-hp-ag300h', 'buffalo_wzr-hp-ag300h') device('buffalo-wzr-600dhp', 'buffalo_wzr-600dhp') -device('buffalo-wzr-hp-g300nh-rtl8366s', 'buffalo_wzr-hp-g300nh-s', { - manifest_aliases = { - 'buffalo-wzr-hp-g300nh', -- Upgrade from OpenWrt 19.07 - }, -}) +device('buffalo-wzr-hp-g300nh-rtl8366s', 'buffalo_wzr-hp-g300nh-s') + -- devolo @@ -120,18 +117,11 @@ device('d-link-dap-2660-a1', 'dlink_dap-2660-a1', { device('d-link-dir-505', 'dlink_dir-505', { factory = false, - manifest_aliases = { - 'd-link-dir-505-rev-a1', -- Upgrade from OpenWrt 19.07 - 'd-link-dir-505-rev-a2', -- Upgrade from OpenWrt 19.07 - }, }) device('d-link-dir825b1', 'dlink_dir-825-b1', { factory = false, class = 'tiny', -- Only 6M of usable Firmware space - manifest_aliases = { - 'd-link-dir-825-rev-b1', -- Upgrade from OpenWrt 19.07 - }, }) @@ -154,9 +144,6 @@ device('extreme-networks-ws-ap3805i', 'extreme-networks_ws-ap3805i', { device('gl.inet-6416', 'glinet_6416', { factory = false, - manifest_aliases = { - 'gl-inet-6416a-v1', -- Upgrade from OpenWrt 19.07 - }, }) device('gl.inet-gl-ar150', 'glinet_gl-ar150', { @@ -197,9 +184,6 @@ device('netgear-wndr3700', 'netgear_wndr3700', { }) device('netgear-wndr3700-v2', 'netgear_wndr3700-v2', { - manifest_aliases = { - 'netgear-wndr3700v2', -- Upgrade from OpenWrt 19.07 - }, factory_ext = '.img', }) @@ -209,13 +193,9 @@ device('netgear-wndr3800', 'netgear_wndr3800', { device('netgear-wndr3800ch', 'netgear_wndr3800ch', { factory_ext = '.img', - manifest_aliases = {'netgear-wndr3800chmychart'}, -- Upgrade from OpenWrt 19.07 }) device('netgear-wnr2200-8m', 'netgear_wnr2200-8m', { - manifest_aliases = { - 'netgear-wnr2200', -- Upgrade from OpenWrt 19.07 - }, factory_ext = '.img', }) @@ -256,86 +236,56 @@ device('openmesh-a60', 'openmesh_a60', { device('openmesh-mr600-v1', 'openmesh_mr600-v1', { factory = false, - -- old name from OpenWrt 19.07.x - manifest_aliases = {'openmesh-mr600'}, }) device('openmesh-mr600-v2', 'openmesh_mr600-v2', { factory = false, - -- old name from OpenWrt 19.07.x - manifest_aliases = {'openmesh-mr600v2'}, }) device('openmesh-mr900-v1', 'openmesh_mr900-v1', { factory = false, - -- old name from OpenWrt 19.07.x - manifest_aliases = {'openmesh-mr900'}, }) device('openmesh-mr900-v2', 'openmesh_mr900-v2', { factory = false, - -- old name from OpenWrt 19.07.x - manifest_aliases = {'openmesh-mr900v2'}, }) device('openmesh-mr1750-v1', 'openmesh_mr1750-v1', { packages = ATH10K_PACKAGES_QCA9880, factory = false, - -- old name from OpenWrt 19.07.x - manifest_aliases = {'openmesh-mr1750'}, }) device('openmesh-mr1750-v2', 'openmesh_mr1750-v2', { packages = ATH10K_PACKAGES_QCA9880, factory = false, - -- old name from OpenWrt 19.07.x - manifest_aliases = {'openmesh-mr1750v2'}, }) device('openmesh-om2p-v1', 'openmesh_om2p-v1', { factory = false, - -- old name from OpenWrt 19.07.x - manifest_aliases = {'openmesh-om2p'}, }) device('openmesh-om2p-v2', 'openmesh_om2p-v2', { factory = false, - -- old name from OpenWrt 19.07.x; deacticated at the moment because - -- the physical ethernet port for this device changed between 19.07 - -- and 21.02. And automated update could therefore "break" the - -- device until someone physically changed the ethernet cable. - -- See https://github.com/freifunk-gluon/gluon/pull/2325#issuecomment-940749284 - --manifest_aliases = {'openmesh-om2pv2'}, }) device('openmesh-om2p-v4', 'openmesh_om2p-v4', { factory = false, - -- old name from OpenWrt 19.07.x - manifest_aliases = {'openmesh-om2pv4'}, }) device('openmesh-om2p-hs-v1', 'openmesh_om2p-hs-v1', { factory = false, - -- old name from OpenWrt 19.07.x - manifest_aliases = {'openmesh-om2p-hs'}, }) device('openmesh-om2p-hs-v2', 'openmesh_om2p-hs-v2', { factory = false, - -- old name from OpenWrt 19.07.x - manifest_aliases = {'openmesh-om2p-hsv2'}, }) device('openmesh-om2p-hs-v3', 'openmesh_om2p-hs-v3', { factory = false, - -- old name from OpenWrt 19.07.x - manifest_aliases = {'openmesh-om2p-hsv3'}, }) device('openmesh-om2p-hs-v4', 'openmesh_om2p-hs-v4', { factory = false, - -- old name from OpenWrt 19.07.x - manifest_aliases = {'openmesh-om2p-hsv4'}, }) device('openmesh-om2p-lc', 'openmesh_om2p-lc', { @@ -349,15 +299,11 @@ device('openmesh-om5p', 'openmesh_om5p', { device('openmesh-om5p-ac-v1', 'openmesh_om5p-ac-v1', { packages = ATH10K_PACKAGES_QCA9880, factory = false, - -- old name from OpenWrt 19.07.x - manifest_aliases = {'openmesh-om5p-ac'}, }) device('openmesh-om5p-ac-v2', 'openmesh_om5p-ac-v2', { packages = ATH10K_PACKAGES_QCA9880, factory = false, - -- old name from OpenWrt 19.07.x - manifest_aliases = {'openmesh-om5p-acv2'}, }) device('openmesh-om5p-an', 'openmesh_om5p-an', { @@ -442,9 +388,6 @@ device('tp-link-archer-c58-v1', 'tplink_archer-c58-v1', { device('tp-link-archer-c6-v2-eu-ru-jp', 'tplink_archer-c6-v2', { packages = ATH10K_PACKAGES_QCA9888, - manifest_aliases = { - 'tp-link-archer-c6-v2', -- Upgrade from OpenWrt 19.07 - }, }) device('tp-link-archer-c7-v2', 'tplink_archer-c7-v2', { @@ -474,31 +417,16 @@ device('tp-link-archer-d50-v1', 'tplink_archer-d50-v1', { broken = true, -- 64M ath9k + ath10k & power LED not working }) -device('tp-link-cpe210-v1', 'tplink_cpe210-v1', { - manifest_aliases = { - 'tp-link-cpe210-v1.0', -- Upgrade from OpenWrt 19.07 - 'tp-link-cpe210-v1.1', -- Upgrade from OpenWrt 19.07 - }, -}) -device('tp-link-cpe210-v2', 'tplink_cpe210-v2', { - manifest_aliases = { - 'tp-link-cpe210-v2.0', -- Upgrade from OpenWrt 19.07 - }, -}) -device('tp-link-cpe210-v3', 'tplink_cpe210-v3', { - manifest_aliases = { - 'tp-link-cpe210-v3.0', -- Upgrade from OpenWrt 19.07 - 'tp-link-cpe210-v3.1', -- Upgrade from OpenWrt 19.07 - 'tp-link-cpe210-v3.20', -- Upgrade from OpenWrt 19.07 - }, -}) +device('tp-link-cpe210-v1', 'tplink_cpe210-v1') + +device('tp-link-cpe210-v2', 'tplink_cpe210-v2') + +device('tp-link-cpe210-v3', 'tplink_cpe210-v3') + device('tp-link-cpe220-v3', 'tplink_cpe220-v3') -device('tp-link-cpe510-v1', 'tplink_cpe510-v1', { - manifest_aliases = { - 'tp-link-cpe510-v1.0', -- upgrade from OpenWrt 19.07 - 'tp-link-cpe510-v1.1', -- upgrade from OpenWrt 19.07 - }, -}) + +device('tp-link-cpe510-v1', 'tplink_cpe510-v1') + device('tp-link-cpe510-v2', 'tplink_cpe510-v2') device('tp-link-cpe510-v3', 'tplink_cpe510-v3') @@ -518,11 +446,7 @@ device('tp-link-tl-wdr4300-v1', 'tplink_tl-wdr4300-v1') device('tp-link-tl-wr810n-v1', 'tplink_tl-wr810n-v1') -device('tp-link-tl-wr842n-v3', 'tplink_tl-wr842n-v3', { - manifest_aliases = { - 'tp-link-tl-wr842n-nd-v3', -- upgrade from OpenWrt 19.07 - }, -}) +device('tp-link-tl-wr842n-v3', 'tplink_tl-wr842n-v3') device('tp-link-tl-wr902ac-v1', 'tplink_tl-wr902ac-v1', { packages = ATH10K_PACKAGES_SMALLBUFFERS_QCA9887, @@ -530,42 +454,22 @@ device('tp-link-tl-wr902ac-v1', 'tplink_tl-wr902ac-v1', { class = 'tiny', -- 64M ath9k + ath10k }) -device('tp-link-tl-wr1043nd-v2', 'tplink_tl-wr1043nd-v2', { - manifest_aliases = { - 'tp-link-tl-wr1043n-nd-v2', -- upgrade from OpenWrt 19.07 - }, -}) -device('tp-link-tl-wr1043nd-v3', 'tplink_tl-wr1043nd-v3', { - manifest_aliases = { - 'tp-link-tl-wr1043n-nd-v3', -- upgrade from OpenWrt 19.07 - }, -}) -device('tp-link-tl-wr1043nd-v4', 'tplink_tl-wr1043nd-v4', { - manifest_aliases = { - 'tp-link-tl-wr1043n-nd-v4', -- upgrade from OpenWrt 19.07 - }, -}) +device('tp-link-tl-wr1043nd-v2', 'tplink_tl-wr1043nd-v2') + +device('tp-link-tl-wr1043nd-v3', 'tplink_tl-wr1043nd-v3') + +device('tp-link-tl-wr1043nd-v4', 'tplink_tl-wr1043nd-v4') + device('tp-link-tl-wr1043n-v5', 'tplink_tl-wr1043n-v5') -device('tp-link-tl-wr2543n-nd', 'tplink_tl-wr2543-v1', { - manifest_aliases = { - 'tp-link-tl-wr2543n-nd-v1', -- upgrade from OpenWrt 19.07 - }, -}) +device('tp-link-tl-wr2543n-nd', 'tplink_tl-wr2543-v1') -device('tp-link-wbs210-v1', 'tplink_wbs210-v1', { - manifest_aliases = { - 'tp-link-wbs210-v1.20', -- upgrade from OpenWrt 19.07 - }, -}) +device('tp-link-wbs210-v1', 'tplink_wbs210-v1') device('tp-link-wbs210-v2', 'tplink_wbs210-v2') -device('tp-link-wbs510-v1', 'tplink_wbs510-v1', { - manifest_aliases = { - 'tp-link-wbs510-v1.20', -- upgrade from OpenWrt 19.07 - }, -}) +device('tp-link-wbs510-v1', 'tplink_wbs510-v1') + -- Ubiquiti @@ -599,15 +503,11 @@ device('ubiquiti-unifi-ap', 'ubnt_unifi-ap', { 'ubiquiti-unifi-ap-lr', }, manifest_aliases = { - 'ubiquiti-unifi', + 'ubiquiti-unifi', -- Upgrade from OpenWrt 22.03 }, }) -device('ubiquiti-unifi-ap-outdoor+', 'ubnt_unifi-ap-outdoor-plus', { - manifest_aliases = { - 'ubiquiti-unifiap-outdoor+', -- upgrade from OpenWrt 19.07 - }, -}) +device('ubiquiti-unifi-ap-outdoor+', 'ubnt_unifi-ap-outdoor-plus') device('ubiquiti-unifi-ap-pro', 'ubnt_unifi-ap-pro') diff --git a/targets/ath79-nand b/targets/ath79-nand index 68bffa4e9fa2f08e50ef8490e80452935777739e..a3cf67859c5e587bbf43a0495bc070fa323b1931 100644 --- a/targets/ath79-nand +++ b/targets/ath79-nand @@ -26,9 +26,6 @@ device('aerohive-hiveap-121', 'aerohive_hiveap-121') device('gl.inet-gl-ar300m-nor', 'glinet_gl-ar300m-nor', { factory = false, - manifest_aliases = { - 'gl.inet-gl-ar300m', -- Upgrade from OpenWrt 19.07 - }, }) device('gl.inet-gl-ar750s-nor', 'glinet_gl-ar750s-nor', { @@ -45,9 +42,6 @@ device('gl.inet-gl-xe300', 'glinet_gl-xe300', { device('netgear-wndr3700-v4', 'netgear_wndr3700-v4', { factory_ext = '.img', - manifest_aliases = { - 'netgear-wndr3700v4', -- Upgrade from OpenWrt 19.07 - }, }) device('netgear-wndr4300', 'netgear_wndr4300', { diff --git a/targets/mediatek-mt7622 b/targets/mediatek-mt7622 index 8376c39723f7e2aad91b5aef45176682e1297a1f..ca526087b0e44f9825439e76205c9ae9b9258c71 100644 --- a/targets/mediatek-mt7622 +++ b/targets/mediatek-mt7622 @@ -8,7 +8,7 @@ device('linksys-e8450-ubi', 'linksys_e8450-ubi', { device('ubiquiti-unifi-6-lr-v1', 'ubnt_unifi-6-lr-v1', { factory = false, - manifest_aliases = {'ubiquiti-unifi-6-lr'}, + manifest_aliases = {'ubiquiti-unifi-6-lr'}, -- Upgrade from OpenWrt 22.03 }) -- Xiaomi diff --git a/targets/ramips-mt7620 b/targets/ramips-mt7620 index fbf57ba85d3c4b08657da0222cb66fe18f84cacc..ed4b9a2d2ee153845913fcd3cc59f98962fbc87e 100644 --- a/targets/ramips-mt7620 +++ b/targets/ramips-mt7620 @@ -58,7 +58,6 @@ device('tp-link-archer-c20i', 'tplink_archer-c20i') device('tp-link-archer-c50-v1', 'tplink_archer-c50-v1', { factory = '-squashfs-factory' .. tplink_region_suffix, - manifest_aliases = {'tp-link-archer-c50'}, }) diff --git a/targets/ramips-mt7621 b/targets/ramips-mt7621 index 01b9b94cdf4ba65b08880447ec71c3bb2dd49b2e..4a4eb9ae4bb1720d349425c04d26bce957ae4815 100644 --- a/targets/ramips-mt7621 +++ b/targets/ramips-mt7621 @@ -81,9 +81,6 @@ device('netgear-wax202', 'netgear_wax202', { device('netgear-wndr3700-v5', 'netgear_wndr3700-v5', { factory = false, broken = true, -- untested - manifest_aliases = { - 'netgear-wndr3700v5', - }, }) @@ -133,18 +130,10 @@ device('xiaomi-mi-router-3g-v2', 'xiaomi_mi-router-3g-v2', { device('zbtlink-zbt-wg3526-16m', 'zbtlink_zbt-wg3526-16m', { factory = false, - manifest_aliases = { - 'zbt-wg3526', - 'zbt-wg3526-16m', - }, }) device('zbtlink-zbt-wg3526-32m', 'zbtlink_zbt-wg3526-32m', { factory = false, - manifest_aliases = { - 'zbt-wg3526-32m', - }, - }) @@ -167,15 +156,9 @@ device('zyxel-wsm20', 'zyxel_wsm20', { device('ubiquiti-edgerouter-x', 'ubnt_edgerouter-x', { factory = false, packages = {'-hostapd-mini'}, - manifest_aliases = { - 'ubnt-erx', - }, }) device('ubiquiti-edgerouter-x-sfp', 'ubnt_edgerouter-x-sfp', { factory = false, packages = {'-hostapd-mini'}, - manifest_aliases = { - 'ubnt-erx-sfp', - }, }) diff --git a/targets/x86-generic b/targets/x86-generic index bee0bd95365ca3ca706fd8e5e7a341167f330687..57fce8a8911a99159204b9aa5430f80514bebca5 100644 --- a/targets/x86-generic +++ b/targets/x86-generic @@ -11,8 +11,4 @@ device('x86-generic', 'generic', { {'-kernel', '-kernel', '.bin'}, {'-squashfs-rootfs', '-rootfs', '.img.gz'}, }, - manifest_aliases = { - 'x86-kvm', - 'x86-xen_domu', - }, })