Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

modules: update to latest HEAD #3378

Merged
merged 2 commits into from
Nov 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions modules
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ GLUON_FEEDS='gluon packages routing'

OPENWRT_REPO=https://github.com/openwrt/openwrt.git
OPENWRT_BRANCH=openwrt-23.05
OPENWRT_COMMIT=33b45c0a0e1405d2b390e9231c29d5fb5314707a
OPENWRT_COMMIT=cd9998ef1b7b842bf052fc5e7034f23a22e67bf7

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=7ee4fe7705f8b44ccfd2ec9470e91c8d900a65ab

PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git
PACKAGES_ROUTING_BRANCH=openwrt-23.05
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down