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.

Sign up for GitHub

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

Jump to bottom

modules: update to latest HEAD #3071

Merged
merged 2 commits into from
Nov 29, 2023
Merged

modules: update to latest HEAD #3071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da10e58
modules: update openwrt
blocktrron Nov 27, 2023
26dcfd9
modules: update packages
blocktrron Nov 27, 2023
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
View file
Open in desktop
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=7c43ced160a01ad2300bf103d457d9f2b20c2772
OPENWRT_COMMIT=6264d12ed8e4beef6e3707837cb95f0e0d9e4e92

PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git
PACKAGES_GLUON_COMMIT=dc99bbb906f9faae472e48da013dbf67e1a00c23

PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
PACKAGES_PACKAGES_BRANCH=openwrt-23.05
PACKAGES_PACKAGES_COMMIT=55aef54b755a3cb39cf9eb42513a2c3a3eeab36e
PACKAGES_PACKAGES_COMMIT=df580180d08b45818ff44ddaa22b4f1c126f71c8

PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git
PACKAGES_ROUTING_BRANCH=openwrt-23.05
Expand Down
85 changes: 14 additions & 71 deletions ...enwrt/0005-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ Signed-off-by: Linus Lüssing <[email protected]>

diff --git a/package/network/config/netifd/patches/0001-bridge-Add-multicast_wakeupcall-option.patch b/package/network/config/netifd/patches/0001-bridge-Add-multicast_wakeupcall-option.patch
new file mode 100644
index 0000000000000000000000000000000000000000..c9e3a2d4e4420387ae48cc5828d4284f2a987c3d
index 0000000000000000000000000000000000000000..077a563b6066cd1d3aee4b1e82328e8cc5e042ea
--- /dev/null
+++ b/package/network/config/netifd/patches/0001-bridge-Add-multicast_wakeupcall-option.patch
@@ -0,0 +1,199 @@
@@ -0,0 +1,142 @@
+From d23a49e6542dc068b12fbc7b6a4520f9fb3626f9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Linus=20L=C3=BCssing?= <[email protected]>
+Date: Sun, 5 Jul 2020 23:33:51 +0200
Expand Down Expand Up @@ -72,23 +72,23 @@ index 0000000000000000000000000000000000000000..c9e3a2d4e4420387ae48cc5828d4284f
+
+--- a/device.c
++++ b/device.c
+@@ -47,6 +47,7 @@ static const struct blobmsg_policy dev_a
+@@ -49,6 +49,7 @@ static const struct blobmsg_policy dev_a
+ [DEV_ATTR_NEIGHGCSTALETIME] = { .name = "neighgcstaletime", .type = BLOBMSG_TYPE_INT32 },
+ [DEV_ATTR_DADTRANSMITS] = { .name = "dadtransmits", .type = BLOBMSG_TYPE_INT32 },
+ [DEV_ATTR_MULTICAST_TO_UNICAST] = { .name = "multicast_to_unicast", .type = BLOBMSG_TYPE_BOOL },
++ [DEV_ATTR_MULTICAST_WAKEUPCALL] = { .name = "multicast_wakeupcall", .type = BLOBMSG_TYPE_INT32 },
+ [DEV_ATTR_MULTICAST_ROUTER] = { .name = "multicast_router", .type = BLOBMSG_TYPE_INT32 },
+ [DEV_ATTR_MULTICAST_FAST_LEAVE] = { .name = "multicast_fast_leave", . type = BLOBMSG_TYPE_BOOL },
+ [DEV_ATTR_MULTICAST] = { .name ="multicast", .type = BLOBMSG_TYPE_BOOL },
+@@ -267,6 +268,7 @@ device_merge_settings(struct device *dev
+@@ -275,6 +276,7 @@ device_merge_settings(struct device *dev
+ n->multicast = s->flags & DEV_OPT_MULTICAST ?
+ s->multicast : os->multicast;
+ n->multicast_to_unicast = s->multicast_to_unicast;
++ n->multicast_wakeupcall = s->multicast_wakeupcall;
+ n->multicast_router = s->multicast_router;
+ n->multicast_fast_leave = s->multicast_fast_leave;
+ n->learning = s->learning;
+@@ -438,6 +440,11 @@ device_init_settings(struct device *dev,
+@@ -449,6 +451,11 @@ device_init_settings(struct device *dev,
+ s->flags |= DEV_OPT_MULTICAST_TO_UNICAST;
+ }
+
Expand All @@ -100,7 +100,7 @@ index 0000000000000000000000000000000000000000..c9e3a2d4e4420387ae48cc5828d4284f
+ if ((cur = tb[DEV_ATTR_MULTICAST_ROUTER])) {
+ s->multicast_router = blobmsg_get_u32(cur);
+ if (s->multicast_router <= 2)
+@@ -1281,6 +1288,8 @@ device_dump_status(struct blob_buf *b, s
+@@ -1372,6 +1379,8 @@ device_dump_status(struct blob_buf *b, s
+ blobmsg_add_u32(b, "dadtransmits", st.dadtransmits);
+ if (st.flags & DEV_OPT_MULTICAST_TO_UNICAST)
+ blobmsg_add_u8(b, "multicast_to_unicast", st.multicast_to_unicast);
Expand All @@ -119,15 +119,15 @@ index 0000000000000000000000000000000000000000..c9e3a2d4e4420387ae48cc5828d4284f
+ DEV_ATTR_MULTICAST_ROUTER,
+ DEV_ATTR_MULTICAST_FAST_LEAVE,
+ DEV_ATTR_MULTICAST,
+@@ -137,6 +138,7 @@ enum {
+ DEV_OPT_RXPAUSE = (1ULL << 34),
+ DEV_OPT_TXPAUSE = (1ULL << 35),
+ DEV_OPT_AUTONEG = (1ULL << 36),
++ DEV_OPT_MULTICAST_WAKEUPCALL = (1ULL << 63)
+@@ -144,6 +145,7 @@ enum {
+ DEV_OPT_GRO = (1ULL << 37),
+ DEV_OPT_MASTER = (1ULL << 38),
+ DEV_OPT_EEE = (1ULL << 39),
++ DEV_OPT_MULTICAST_WAKEUPCALL = (1ULL << 63),
+ };
+
+ /* events broadcasted to all users of a device */
+@@ -198,6 +200,7 @@ struct device_settings {
+@@ -205,6 +207,7 @@ struct device_settings {
+ int neigh4locktime;
+ unsigned int dadtransmits;
+ bool multicast_to_unicast;
Expand All @@ -149,7 +149,7 @@ index 0000000000000000000000000000000000000000..c9e3a2d4e4420387ae48cc5828d4284f
+ static void system_bridge_set_multicast_fast_leave(struct device *dev, const char *val)
+ {
+ system_set_dev_sysfs("brport/multicast_fast_leave", dev->ifname, val);
+@@ -915,8 +920,10 @@ static char *system_get_bridge(const cha
+@@ -923,8 +928,10 @@ static char *system_get_bridge(const cha
+ static void
+ system_bridge_set_wireless(struct device *bridge, struct device *dev)
+ {
Expand All @@ -160,7 +160,7 @@ index 0000000000000000000000000000000000000000..c9e3a2d4e4420387ae48cc5828d4284f
+
+ if (dev->settings.flags & DEV_OPT_MULTICAST_TO_UNICAST)
+ mcast_to_ucast = dev->settings.multicast_to_unicast;
+@@ -931,6 +938,12 @@ system_bridge_set_wireless(struct device
+@@ -939,6 +946,12 @@ system_bridge_set_wireless(struct device
+ system_bridge_set_multicast_to_unicast(dev, mcast_to_ucast ? "1" : "0");
+ system_bridge_set_hairpin_mode(dev, hairpin ? "1" : "0");
+ system_bridge_set_proxyarp_wifi(dev, dev->wireless_proxyarp ? "1" : "0");
Expand All @@ -173,63 +173,6 @@ index 0000000000000000000000000000000000000000..c9e3a2d4e4420387ae48cc5828d4284f
+ }
+
+ int system_bridge_addif(struct device *bridge, struct device *dev)
+--- a/interface.c
++++ b/interface.c
+@@ -1248,7 +1248,7 @@ interface_device_config_changed(struct i
+ struct blob_attr *ntb[__DEV_ATTR_MAX];
+ struct blob_attr *otb[__DEV_ATTR_MAX];
+ struct device *dev = if_old->main_dev.dev;
+- unsigned long diff = 0;
++ unsigned long diff[2] = {};
+
+ BUILD_BUG_ON(sizeof(diff) < __DEV_ATTR_MAX / 8);
+
+@@ -1267,8 +1267,8 @@ interface_device_config_changed(struct i
+ blobmsg_parse(device_attr_list.params, __DEV_ATTR_MAX, ntb,
+ blob_data(if_new->config), blob_len(if_new->config));
+
+- uci_blob_diff(ntb, otb, &device_attr_list, &diff);
+- return diff;
++ uci_blob_diff(ntb, otb, &device_attr_list, diff);
++ return diff[0] | diff[1];
+ }
+
+ static void
+--- a/bonding.c
++++ b/bonding.c
+@@ -442,7 +442,7 @@ bonding_reload(struct device *dev, struc
+ struct blob_attr *tb_dev[__DEV_ATTR_MAX];
+ struct blob_attr *tb_b[__BOND_ATTR_MAX];
+ enum dev_change_type ret = DEV_CONFIG_APPLIED;
+- unsigned long diff;
++ unsigned long diff[2];
+ struct bonding_device *bdev;
+
+ BUILD_BUG_ON(sizeof(diff) < __BOND_ATTR_MAX / 8);
+@@ -472,17 +472,17 @@ bonding_reload(struct device *dev, struc
+ blobmsg_parse(device_attr_list.params, __DEV_ATTR_MAX, otb_dev,
+ blob_data(bdev->config_data), blob_len(bdev->config_data));
+
+- diff = 0;
+- uci_blob_diff(tb_dev, otb_dev, &device_attr_list, &diff);
+- if (diff)
++ diff[0] = diff[1] = 0;
++ uci_blob_diff(tb_dev, otb_dev, &device_attr_list, diff);
++ if (diff[0] | diff[1])
+ ret = DEV_CONFIG_RESTART;
+
+ blobmsg_parse(bonding_attrs, __BOND_ATTR_MAX, otb_b,
+ blob_data(bdev->config_data), blob_len(bdev->config_data));
+
+- diff = 0;
+- uci_blob_diff(tb_b, otb_b, &bonding_attr_list, &diff);
+- if (diff & ~(1 << BOND_ATTR_PORTS))
++ diff[0] = diff[1] = 0;
++ uci_blob_diff(tb_b, otb_b, &bonding_attr_list, diff);
++ if (diff[0] & ~(1 << BOND_ATTR_PORTS))
+ ret = DEV_CONFIG_RESTART;
+
+ bonding_config_init(dev);
diff --git a/target/linux/generic/config-5.15 b/target/linux/generic/config-5.15
index 214a1e6ecd83c067b96cb55ad052ae00b82fa8b5..bf6709ae2dbb87a21659558161d4882befd88b49 100644
--- a/target/linux/generic/config-5.15
Expand Down
2 changes: 1 addition & 1 deletion patches/packages/packages/0001-perl-don-t-build-in-parallel-and-bump-release.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ https://github.com/openwrt/packages/issues/8238
https://github.com/openwrt/packages/pull/17274

diff --git a/lang/perl/Makefile b/lang/perl/Makefile
index 40532b5f0163ffffc3ce8dfb697592c3a81e0af0..17e9202847b555a8e78a14f22b3536c2ceef9dd7 100644
index 2763de2777f8e3e60db9917ad64da7d5d127ba8f..7468e6db8ea561a6285b77990c8786ef3d46967f 100644
--- a/lang/perl/Makefile
+++ b/lang/perl/Makefile
@@ -34,8 +34,8 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/perl/$(PKG_NAME)-$(PKG_VERSION)
Expand Down