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

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

Browse Source 
modules: update modules
This commit is contained in:
David Bauer 2022-09-21 22:47:29 +02:00 committed by GitHub
commit 8f11053e30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules
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=81388f74b58e98d79274a788b442b7a1aa8a11c7 OPENWRT_COMMIT=b472753d79ab014c799f28aac99e698e5caf0b19
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=219b0a1e5888a48d4460f7557e4e7f86b959f122 PACKAGES_PACKAGES_COMMIT=91d060fd94dd1be4610dd26828e71fa23455da64
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

6
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 7f903485aa9e3055ae0bb490bb8e6d5aab565b45..5b502710b7959825bc2e079d0ffcbbe9c1b063ae 100644 index 8860be11b8c879c067901cf6642a133b27b1e3b2..f8a846cfc67c306fedfbdb2bd2056fa3d6aa1b61 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
@@ -172,7 +172,6 @@ endef @@ -172,7 +172,6 @@ endef
@ -54,7 +54,7 @@ index 7f903485aa9e3055ae0bb490bb8e6d5aab565b45..5b502710b7959825bc2e079d0ffcbbe9
$(Device/uimage-lzma-loader) $(Device/uimage-lzma-loader)
DEVICE_VENDOR := Ubiquiti DEVICE_VENDOR := Ubiquiti
IMAGE_SIZE := 256768k IMAGE_SIZE := 256768k
@@ -2131,7 +2125,6 @@ endef @@ -2142,7 +2136,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 7f903485aa9e3055ae0bb490bb8e6d5aab565b45..5b502710b7959825bc2e079d0ffcbbe9
$(Device/uimage-lzma-loader) $(Device/uimage-lzma-loader)
IMAGE_SIZE := 16064k IMAGE_SIZE := 16064k
DEVICE_VENDOR := Zbtlink DEVICE_VENDOR := Zbtlink
@@ -2144,7 +2137,6 @@ endef @@ -2155,7 +2148,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 4f054903203b28ffb67d43ceb2e401b1d8e47234..57309f6e92097e74c647f5b4629696e8bc28050a 100644 index 6fa7394201375a44bc630db570e869e9b6d28743..ae1b22cb36f9a313bf76283b543ff8616ae7b85f 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
@@ -736,6 +736,7 @@ CONFIG_BRIDGE=y @@ -736,6 +736,7 @@ CONFIG_BRIDGE=y