Merge pull request #2736 from freifunk-gluon/master-modules-bump

modules: update modules
This commit is contained in:
Jan-Niklas Burfeind 2022-12-29 16:49:07 +01:00 committed by GitHub
commit 21bf0fbf54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 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=6cd1035d8dc001561331ca9e613d7dfc7d0fd7a6 OPENWRT_COMMIT=6c3e16055ae5d79205812e8436110fd862266c94
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=04eadf8600fa21dbdd1bc4de846fefe11d06797b PACKAGES_PACKAGES_COMMIT=91312dbde702c652be531b95cbfe7976d1edb79e
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

@ -16,7 +16,7 @@ index 756105b94c7f844439132ab57837c9ac87d231ca..5563968de9ab3f491fa89d755fcc6e6f
endef endef
diff --git a/target/linux/lantiq/image/vr9.mk b/target/linux/lantiq/image/vr9.mk diff --git a/target/linux/lantiq/image/vr9.mk b/target/linux/lantiq/image/vr9.mk
index d17045b6db157a878534a28988accd8998ddd572..e83da928e57d827d33bca6bdef96df290bb67347 100644 index deea3996670fcef6d2a546373425c4ca5d92734b..d23b80e94e5548ccb19738f22c29c75fa19ab1e7 100644
--- a/target/linux/lantiq/image/vr9.mk --- a/target/linux/lantiq/image/vr9.mk
+++ b/target/linux/lantiq/image/vr9.mk +++ b/target/linux/lantiq/image/vr9.mk
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@

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 e04ee161a1a18453a99b73a96b510add1f7b0c80..334d86907d96a76c5fe161f887b857cdfb668775 100644 index efc0861f1c99eedb29d40ea0e6f52a26008c901b..a99c836e2f9413936f010ef53f1f3d3c82d46dff 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