modules: switch to OpenWrt master
Signed-off-by: David Bauer <mail@david-bauer.net>
This commit is contained in:
David Bauer
parent
5da06538b7
commit
8d0bd40024
12
modules
12
modules
@ -1,16 +1,16 @@
|
||||
GLUON_FEEDS='packages routing gluon'
|
||||
|
||||
OPENWRT_REPO=https://github.com/openwrt/openwrt.git
|
||||
OPENWRT_BRANCH=openwrt-22.03
|
||||
OPENWRT_COMMIT=d1f14d17aaa1866eee1fe2d0d074b2a003c2a210
|
||||
OPENWRT_BRANCH=master
|
||||
OPENWRT_COMMIT=a96382c1bb204698cd43e82193877c10e4b63027
|
||||
|
||||
PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
|
||||
PACKAGES_PACKAGES_BRANCH=openwrt-22.03
|
||||
PACKAGES_PACKAGES_COMMIT=bcafba4320e5942f2ca8c1ad63b3a8a84ca0c3d1
|
||||
PACKAGES_PACKAGES_BRANCH=master
|
||||
PACKAGES_PACKAGES_COMMIT=437f7a54ffe476932c6f13b16d91b1ebd9382894
|
||||
|
||||
PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git
|
||||
PACKAGES_ROUTING_BRANCH=openwrt-22.03
|
||||
PACKAGES_ROUTING_COMMIT=8872359011eee64981804f7ed42d5d6b54add6d8
|
||||
PACKAGES_ROUTING_BRANCH=master
|
||||
PACKAGES_ROUTING_COMMIT=9abed610185f60c7e2054f5466e0ba2c225154e7
|
||||
|
||||
PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git
|
||||
PACKAGES_GLUON_COMMIT=04d2b6ffbb6ee02012f2733b7752d8db0d12eaff
|
||||
|
||||
@ -1,72 +0,0 @@
|
||||
From: David Bauer <mail@david-bauer.net>
|
||||
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 7f903485aa9e3055ae0bb490bb8e6d5aab565b45..5b502710b7959825bc2e079d0ffcbbe9c1b063ae 100644
|
||||
--- a/target/linux/ramips/image/mt7621.mk
|
||||
+++ b/target/linux/ramips/image/mt7621.mk
|
||||
@@ -172,7 +172,6 @@ endef
|
||||
TARGET_DEVICES += asiarf_ap7621-nv1
|
||||
|
||||
define Device/asus_rt-ac57u
|
||||
- $(Device/dsa-migration)
|
||||
DEVICE_VENDOR := ASUS
|
||||
DEVICE_MODEL := RT-AC57U
|
||||
DEVICE_ALT0_VENDOR := ASUS
|
||||
@@ -418,7 +417,6 @@ endef
|
||||
TARGET_DEVICES += dlink_dir-853-r1
|
||||
|
||||
define Device/dlink_dir-860l-b1
|
||||
- $(Device/dsa-migration)
|
||||
$(Device/seama)
|
||||
SEAMA_SIGNATURE := wrgac13_dlink.2013gui_dir860lb
|
||||
LOADER_TYPE := bin
|
||||
@@ -1226,7 +1224,6 @@ endef
|
||||
TARGET_DEVICES += mts_wg430223
|
||||
|
||||
define Device/netgear_ex6150
|
||||
- $(Device/dsa-migration)
|
||||
DEVICE_VENDOR := NETGEAR
|
||||
DEVICE_MODEL := EX6150
|
||||
DEVICE_PACKAGES := kmod-mt76x2
|
||||
@@ -1238,7 +1235,6 @@ endef
|
||||
TARGET_DEVICES += netgear_ex6150
|
||||
|
||||
define Device/netgear_sercomm_nand
|
||||
- $(Device/dsa-migration)
|
||||
$(Device/uimage-lzma-loader)
|
||||
BLOCKSIZE := 128k
|
||||
PAGESIZE := 2048
|
||||
@@ -1421,7 +1417,6 @@ endef
|
||||
TARGET_DEVICES += netgear_wax202
|
||||
|
||||
define Device/netgear_wndr3700-v5
|
||||
- $(Device/dsa-migration)
|
||||
$(Device/netgear_sercomm_nor)
|
||||
$(Device/uimage-lzma-loader)
|
||||
IMAGE_SIZE := 15232k
|
||||
@@ -1745,7 +1740,6 @@ endef
|
||||
TARGET_DEVICES += tplink_tl-wpa8631p-v3
|
||||
|
||||
define Device/ubnt_edgerouter_common
|
||||
- $(Device/dsa-migration)
|
||||
$(Device/uimage-lzma-loader)
|
||||
DEVICE_VENDOR := Ubiquiti
|
||||
IMAGE_SIZE := 256768k
|
||||
@@ -2131,7 +2125,6 @@ endef
|
||||
TARGET_DEVICES += zbtlink_zbt-wg2626
|
||||
|
||||
define Device/zbtlink_zbt-wg3526-16m
|
||||
- $(Device/dsa-migration)
|
||||
$(Device/uimage-lzma-loader)
|
||||
IMAGE_SIZE := 16064k
|
||||
DEVICE_VENDOR := Zbtlink
|
||||
@@ -2144,7 +2137,6 @@ endef
|
||||
TARGET_DEVICES += zbtlink_zbt-wg3526-16m
|
||||
|
||||
define Device/zbtlink_zbt-wg3526-32m
|
||||
- $(Device/dsa-migration)
|
||||
$(Device/uimage-lzma-loader)
|
||||
IMAGE_SIZE := 32448k
|
||||
DEVICE_VENDOR := Zbtlink
|
||||
@ -1,53 +0,0 @@
|
||||
From: David Bauer <mail@david-bauer.net>
|
||||
Date: Sat, 18 Jun 2022 02:37:56 +0200
|
||||
Subject: ramips: add MT7621 WiFi devpath migration
|
||||
|
||||
Add a migration script to migrate the device path of PCIe WiFi hardware
|
||||
from OpenWrt 19.07 to the one used with OpenWrt 21.02+.
|
||||
|
||||
Signed-off-by: David Bauer <mail@david-bauer.net>
|
||||
|
||||
diff --git a/target/linux/ramips/mt7621/base-files/etc/hotplug.d/ieee80211/00-wifi-migration b/target/linux/ramips/mt7621/base-files/etc/hotplug.d/ieee80211/00-wifi-migration
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..17fd4a58ff2d56694743e149292746c136b6f27a
|
||||
--- /dev/null
|
||||
+++ b/target/linux/ramips/mt7621/base-files/etc/hotplug.d/ieee80211/00-wifi-migration
|
||||
@@ -0,0 +1,38 @@
|
||||
+#!/bin/sh
|
||||
+
|
||||
+# Migrate WiFi path from 19.07 to 21.02+
|
||||
+
|
||||
+WIFI_PATH_CHANGED=0
|
||||
+
|
||||
+. /lib/functions.sh
|
||||
+
|
||||
+migrate_wifi_path() {
|
||||
+ local section="$1"
|
||||
+ local path
|
||||
+
|
||||
+ config_get path ${section} path
|
||||
+ case ${path} in
|
||||
+ "pci0000:00/0000:00:00.0/0000:01:00.0")
|
||||
+ path="1e140000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0"
|
||||
+ WIFI_PATH_CHANGED=1
|
||||
+ ;;
|
||||
+ "pci0000:00/0000:00:01.0/0000:02:00.0")
|
||||
+ path="1e140000.pcie/pci0000:00/0000:00:01.0/0000:02:00.0"
|
||||
+ WIFI_PATH_CHANGED=1
|
||||
+ ;;
|
||||
+ *)
|
||||
+ return 0
|
||||
+ ;;
|
||||
+ esac
|
||||
+
|
||||
+ uci set wireless.${section}.path=${path}
|
||||
+}
|
||||
+
|
||||
+[ "${ACTION}" = "add" ] && {
|
||||
+ [ ! -e /etc/config/wireless ] && return 0
|
||||
+
|
||||
+ config_load wireless
|
||||
+ config_foreach migrate_wifi_path wifi-device
|
||||
+
|
||||
+ [ "${WIFI_PATH_CHANGED}" = "1" ] && uci commit wireless
|
||||
+}
|
||||
@ -1,30 +0,0 @@
|
||||
From: David Bauer <mail@david-bauer.net>
|
||||
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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user