Merge pull request #2896 from herbetom/v2022.1.x-updates

[v2022.1.x]: modules: update to latest HEAD
This commit is contained in:
David Bauer 2023-05-09 09:40:31 +02:00 committed by GitHub
commit 3807f12250
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions

View File

@ -2,11 +2,11 @@ GLUON_FEEDS='packages routing gluon'
OPENWRT_REPO=https://github.com/openwrt/openwrt.git OPENWRT_REPO=https://github.com/openwrt/openwrt.git
OPENWRT_BRANCH=openwrt-22.03 OPENWRT_BRANCH=openwrt-22.03
OPENWRT_COMMIT=3960c220daabe5b58381af1a8c7b9dd2e6b7e815 OPENWRT_COMMIT=e500494771537b9f42f78e4d907bed18b6383606
PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
PACKAGES_PACKAGES_BRANCH=openwrt-22.03 PACKAGES_PACKAGES_BRANCH=openwrt-22.03
PACKAGES_PACKAGES_COMMIT=d057936acbefd76b033e7c365baa68b48ccb9166 PACKAGES_PACKAGES_COMMIT=55eed1761207f4dfdb8e7d79138f6f65c8849b50
PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git
PACKAGES_ROUTING_BRANCH=openwrt-22.03 PACKAGES_ROUTING_BRANCH=openwrt-22.03

View File

@ -3,7 +3,7 @@ Date: Sun, 5 Jun 2022 23:43:38 +0200
Subject: ramips-mt7621: make DSA images swconfig upgradable Subject: ramips-mt7621: make DSA images swconfig upgradable
diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
index 9c451c26bf180a0ea45a33f567def4770b07398e..5a72f5b8435f20c72e4dc0c6c5b199f00cb6da84 100644 index ab0ff95f7529aa43e69e67a4e3a303242c9b2605..e559f1b14714fe5310a7d37eca1048565036db58 100644
--- a/target/linux/ramips/image/mt7621.mk --- a/target/linux/ramips/image/mt7621.mk
+++ b/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk
@@ -180,7 +180,6 @@ endef @@ -180,7 +180,6 @@ endef
@ -14,7 +14,7 @@ index 9c451c26bf180a0ea45a33f567def4770b07398e..5a72f5b8435f20c72e4dc0c6c5b199f0
DEVICE_VENDOR := ASUS DEVICE_VENDOR := ASUS
DEVICE_MODEL := RT-AC57U DEVICE_MODEL := RT-AC57U
DEVICE_ALT0_VENDOR := ASUS DEVICE_ALT0_VENDOR := ASUS
@@ -452,7 +451,6 @@ endef @@ -466,7 +465,6 @@ endef
TARGET_DEVICES += dlink_dir-853-r1 TARGET_DEVICES += dlink_dir-853-r1
define Device/dlink_dir-860l-b1 define Device/dlink_dir-860l-b1
@ -22,7 +22,7 @@ index 9c451c26bf180a0ea45a33f567def4770b07398e..5a72f5b8435f20c72e4dc0c6c5b199f0
$(Device/seama-lzma-loader) $(Device/seama-lzma-loader)
SEAMA_SIGNATURE := wrgac13_dlink.2013gui_dir860lb SEAMA_SIGNATURE := wrgac13_dlink.2013gui_dir860lb
IMAGE_SIZE := 16064k IMAGE_SIZE := 16064k
@@ -1272,7 +1270,6 @@ endef @@ -1286,7 +1284,6 @@ endef
TARGET_DEVICES += mts_wg430223 TARGET_DEVICES += mts_wg430223
define Device/netgear_ex6150 define Device/netgear_ex6150
@ -30,7 +30,7 @@ index 9c451c26bf180a0ea45a33f567def4770b07398e..5a72f5b8435f20c72e4dc0c6c5b199f0
$(Device/uimage-lzma-loader) $(Device/uimage-lzma-loader)
DEVICE_VENDOR := NETGEAR DEVICE_VENDOR := NETGEAR
DEVICE_MODEL := EX6150 DEVICE_MODEL := EX6150
@@ -1285,7 +1282,6 @@ endef @@ -1299,7 +1296,6 @@ endef
TARGET_DEVICES += netgear_ex6150 TARGET_DEVICES += netgear_ex6150
define Device/netgear_sercomm_nand define Device/netgear_sercomm_nand
@ -38,7 +38,7 @@ index 9c451c26bf180a0ea45a33f567def4770b07398e..5a72f5b8435f20c72e4dc0c6c5b199f0
$(Device/uimage-lzma-loader) $(Device/uimage-lzma-loader)
BLOCKSIZE := 128k BLOCKSIZE := 128k
PAGESIZE := 2048 PAGESIZE := 2048
@@ -1468,7 +1464,6 @@ endef @@ -1482,7 +1478,6 @@ endef
TARGET_DEVICES += netgear_wax202 TARGET_DEVICES += netgear_wax202
define Device/netgear_wndr3700-v5 define Device/netgear_wndr3700-v5
@ -46,7 +46,7 @@ index 9c451c26bf180a0ea45a33f567def4770b07398e..5a72f5b8435f20c72e4dc0c6c5b199f0
$(Device/netgear_sercomm_nor) $(Device/netgear_sercomm_nor)
$(Device/uimage-lzma-loader) $(Device/uimage-lzma-loader)
IMAGE_SIZE := 15232k IMAGE_SIZE := 15232k
@@ -1805,7 +1800,6 @@ endef @@ -1819,7 +1814,6 @@ endef
TARGET_DEVICES += tplink_tl-wpa8631p-v3 TARGET_DEVICES += tplink_tl-wpa8631p-v3
define Device/ubnt_edgerouter_common define Device/ubnt_edgerouter_common
@ -54,7 +54,7 @@ index 9c451c26bf180a0ea45a33f567def4770b07398e..5a72f5b8435f20c72e4dc0c6c5b199f0
$(Device/uimage-lzma-loader) $(Device/uimage-lzma-loader)
DEVICE_VENDOR := Ubiquiti DEVICE_VENDOR := Ubiquiti
IMAGE_SIZE := 256768k IMAGE_SIZE := 256768k
@@ -2221,7 +2215,6 @@ endef @@ -2235,7 +2229,6 @@ endef
TARGET_DEVICES += zbtlink_zbt-wg2626 TARGET_DEVICES += zbtlink_zbt-wg2626
define Device/zbtlink_zbt-wg3526-16m define Device/zbtlink_zbt-wg3526-16m
@ -62,7 +62,7 @@ index 9c451c26bf180a0ea45a33f567def4770b07398e..5a72f5b8435f20c72e4dc0c6c5b199f0
$(Device/uimage-lzma-loader) $(Device/uimage-lzma-loader)
IMAGE_SIZE := 16064k IMAGE_SIZE := 16064k
DEVICE_VENDOR := Zbtlink DEVICE_VENDOR := Zbtlink
@@ -2234,7 +2227,6 @@ endef @@ -2248,7 +2241,6 @@ endef
TARGET_DEVICES += zbtlink_zbt-wg3526-16m TARGET_DEVICES += zbtlink_zbt-wg3526-16m
define Device/zbtlink_zbt-wg3526-32m define Device/zbtlink_zbt-wg3526-32m