Merge pull request #3388 from herbetom/v2023.2.x-updates

[v2023.2.x] modules: update to latest HEAD
freifunk-gluon · Dec 22, 2024 · 534b880 · 534b880
2 parents 6f289cf + 02b8c46
commit 534b880
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/modules b/modules
@@ -2,15 +2,15 @@ GLUON_FEEDS='gluon packages routing'
 
 OPENWRT_REPO=https://github.com/openwrt/openwrt.git
 OPENWRT_BRANCH=openwrt-23.05
-OPENWRT_COMMIT=33b45c0a0e1405d2b390e9231c29d5fb5314707a
+OPENWRT_COMMIT=b551214c9db80e9c660ad2e47d3d9899dde07ebc
 
 PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git
 PACKAGES_GLUON_COMMIT=3d08b0fee8dc5d96d8bcdb985fad1d5564de4022
 
 PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
 PACKAGES_PACKAGES_BRANCH=openwrt-23.05
-PACKAGES_PACKAGES_COMMIT=4689289706f7c1c4ff907e7a5bcade1f99c38a61
+PACKAGES_PACKAGES_COMMIT=030d96422ad81eac64ac73d6bec11c10263bb781
 
 PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git
 PACKAGES_ROUTING_BRANCH=openwrt-23.05
-PACKAGES_ROUTING_COMMIT=67fb1bc0cbe1cf26748e83acb872513434bd0471
+PACKAGES_ROUTING_COMMIT=be6e1a44582451172fac68f241138936f80d7734
diff --git a/...enwrt/0005-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch b/...enwrt/0005-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch
@@ -174,7 +174,7 @@ index 0000000000000000000000000000000000000000..077a563b6066cd1d3aee4b1e82328e8c
 + 
 + int system_bridge_addif(struct device *bridge, struct device *dev)
 diff --git a/target/linux/generic/config-5.15 b/target/linux/generic/config-5.15
-index 4b059cb53f4fe1b7132675d15b66a175a0d44a60..ed36acdb8dc055bef60709191ad0950520f9cb57 100644
+index fd386467ef4585a5cb10c887a8cb922b7a2d9197..e18b099011c2e407f701d8afa5c37bb208b5a6ce 100644
 --- a/target/linux/generic/config-5.15
 +++ b/target/linux/generic/config-5.15
 @@ -762,6 +762,7 @@ CONFIG_BRIDGE=y

diff --git a/patches/openwrt/0006-ath79-don-t-create-DIR-825-B1-factory-image.patch b/patches/openwrt/0006-ath79-don-t-create-DIR-825-B1-factory-image.patch
@@ -12,7 +12,7 @@ factory image and install a Gluon sysupgrade.
 Signed-off-by: David Bauer <[email protected]>
 
 diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk
-index f264c14314ca862e39c71e821621a81f8f1957fa..d3e2a9ccd7ae3cb03e35bb4b68a2360bb4d4f84c 100644
+index 637788c73e8cc58aafce4b1f928952aa87924083..b35ad772f7747fb7fe26f67112e27f93d7c57525 100644
 --- a/target/linux/ath79/image/generic.mk
 +++ b/target/linux/ath79/image/generic.mk
 @@ -1073,11 +1073,6 @@ define Device/dlink_dir-825-b1