nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2703 from blocktrron/upstream-master-updates

Browse Source 
modules: update modules
This commit is contained in:
David Bauer 2022-11-14 09:25:35 +01:00 committed by GitHub
commit 7a49faec4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules
View File

@ -2,15 +2,15 @@ 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=4628e7ae4d404c2ba718ae48bfb9fb102d25b953 OPENWRT_COMMIT=8c1f8f997841de13c32b9e083c2c6b85c0f6f590
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=419f6737741b35f95ecb646da7809bb4fd7c45e5 PACKAGES_PACKAGES_COMMIT=a74d1b82ef4a88ef47579a6caecf53d7accb0478
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
PACKAGES_ROUTING_COMMIT=4903e1868e77e81bbc50b31b9a4835d1e5f1674c PACKAGES_ROUTING_COMMIT=9388f0e4a29c6b6d1059adacfcf56d01d01fe3e6
PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git
PACKAGES_GLUON_COMMIT=04d2b6ffbb6ee02012f2733b7752d8db0d12eaff PACKAGES_GLUON_COMMIT=04d2b6ffbb6ee02012f2733b7752d8db0d12eaff

22
patches/openwrt/0004-ramips-mt7621-make-DSA-images-swconfig-upgradable.patch
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 94b040e361c89e7363116e461ec4f678854f64f3..8327f8653b65f18814ecea2096b0516c4a144515 100644 index 4057c4ea11b29233be7673a77fc2c8100209d8b3..c80d6e7f3aa0d1222aa087ba3cb11b8905a576b3 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
@@ -179,7 +179,6 @@ endef @@ -179,7 +179,6 @@ endef
@ -14,15 +14,7 @@ index 94b040e361c89e7363116e461ec4f678854f64f3..8327f8653b65f18814ecea2096b0516c
DEVICE_VENDOR := ASUS DEVICE_VENDOR := ASUS
DEVICE_MODEL := RT-AC57U DEVICE_MODEL := RT-AC57U
DEVICE_ALT0_VENDOR := ASUS DEVICE_ALT0_VENDOR := ASUS
@@ -426,7 +425,6 @@ endef @@ -1233,7 +1232,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
@@ -1236,7 +1234,6 @@ endef
TARGET_DEVICES += mts_wg430223 TARGET_DEVICES += mts_wg430223
define Device/netgear_ex6150 define Device/netgear_ex6150
@ -30,7 +22,7 @@ index 94b040e361c89e7363116e461ec4f678854f64f3..8327f8653b65f18814ecea2096b0516c
$(Device/uimage-lzma-loader) $(Device/uimage-lzma-loader)
DEVICE_VENDOR := NETGEAR DEVICE_VENDOR := NETGEAR
DEVICE_MODEL := EX6150 DEVICE_MODEL := EX6150
@@ -1249,7 +1246,6 @@ endef @@ -1246,7 +1244,6 @@ endef
TARGET_DEVICES += netgear_ex6150 TARGET_DEVICES += netgear_ex6150
define Device/netgear_sercomm_nand define Device/netgear_sercomm_nand
@ -38,7 +30,7 @@ index 94b040e361c89e7363116e461ec4f678854f64f3..8327f8653b65f18814ecea2096b0516c
$(Device/uimage-lzma-loader) $(Device/uimage-lzma-loader)
BLOCKSIZE := 128k BLOCKSIZE := 128k
PAGESIZE := 2048 PAGESIZE := 2048
@@ -1432,7 +1428,6 @@ endef @@ -1429,7 +1426,6 @@ endef
TARGET_DEVICES += netgear_wax202 TARGET_DEVICES += netgear_wax202
define Device/netgear_wndr3700-v5 define Device/netgear_wndr3700-v5
@ -46,7 +38,7 @@ index 94b040e361c89e7363116e461ec4f678854f64f3..8327f8653b65f18814ecea2096b0516c
$(Device/netgear_sercomm_nor) $(Device/netgear_sercomm_nor)
$(Device/uimage-lzma-loader) $(Device/uimage-lzma-loader)
IMAGE_SIZE := 15232k IMAGE_SIZE := 15232k
@@ -1756,7 +1751,6 @@ endef @@ -1753,7 +1749,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 +46,7 @@ index 94b040e361c89e7363116e461ec4f678854f64f3..8327f8653b65f18814ecea2096b0516c
$(Device/uimage-lzma-loader) $(Device/uimage-lzma-loader)
DEVICE_VENDOR := Ubiquiti DEVICE_VENDOR := Ubiquiti
IMAGE_SIZE := 256768k IMAGE_SIZE := 256768k
@@ -2153,7 +2147,6 @@ endef @@ -2152,7 +2147,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 +54,7 @@ index 94b040e361c89e7363116e461ec4f678854f64f3..8327f8653b65f18814ecea2096b0516c
$(Device/uimage-lzma-loader) $(Device/uimage-lzma-loader)
IMAGE_SIZE := 16064k IMAGE_SIZE := 16064k
DEVICE_VENDOR := Zbtlink DEVICE_VENDOR := Zbtlink
@@ -2166,7 +2159,6 @@ endef @@ -2165,7 +2159,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

2
patches/openwrt/0007-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch
View File

@ -208,7 +208,7 @@ index 0000000000000000000000000000000000000000..e3da684dc950ea4c226705d27b23b047
+ +
+ int system_bridge_addif(struct device *bridge, struct device *dev) + int system_bridge_addif(struct device *bridge, struct device *dev)
diff --git a/target/linux/generic/config-5.10 b/target/linux/generic/config-5.10 diff --git a/target/linux/generic/config-5.10 b/target/linux/generic/config-5.10
index 5023b2f8108c4c68f8e875bb0a2977a0090f7b5e..b9d811fd563efe948c738c26a50672696d2e49c9 100644 index e04ee161a1a18453a99b73a96b510add1f7b0c80..334d86907d96a76c5fe161f887b857cdfb668775 100644
--- a/target/linux/generic/config-5.10 --- a/target/linux/generic/config-5.10
+++ b/target/linux/generic/config-5.10 +++ b/target/linux/generic/config-5.10
@@ -737,6 +737,7 @@ CONFIG_BRIDGE=y @@ -737,6 +737,7 @@ CONFIG_BRIDGE=y