feeds/packages/libs/libmariadb - Flow control statements are not properly nested.
target is x86_64 on trunk - TLS library/version: OpenSSL 1.1.1k -- SYSTEM_LIBS /home/dingo/Devel/GIT/x86-64/staging_dir/target-i386_pentium4_musl/usr/lib/libz.so;dl;dl;/home/dingo/Devel/GIT/x86-64/staging_dir/target-i386_pentium4_musl/usr/lib/libssl.so;/home/dingo/Devel/GIT/x86-64/staging_dir/target-i386_pentium4_musl/usr/lib/libcrypto.so -- Dynamic column API support: ON -- SYSTEM processor: i386 CMake Error at cmake/ConnectorName.cmake:30 (ENDMACRO): Flow control statements are not properly nested. Call Stack (most recent call first): CMakeLists.txt:423 (INCLUDE) -- Configuring incomplete, errors occurred! See also "/home/dingo/Devel/GIT/x86-64/build_dir/target-i386_pentium4_musl/mariadb-connector-c-3.1.12-src/CMakeFiles/CMakeOutput.log". See also "/home/dingo/Devel/GIT/x86-64/build_dir/target-i386_pentium4_musl/mariadb-connector-c-3.1.12-src/CMakeFiles/CMakeError.log". make[3]: *** [Makefile:185: /home/dingo/Devel/GIT/x86-64/build_dir/target-i386_pentium4_musl/mariadb-connector-c-3.1.12-src/.configured_12dd982968132d80c8efb0592030f608] Error 1 make[3]: Leaving directory '/home/dingo/Devel/GIT/x86-64/feeds/packages/libs/libmariadb' -- Sent with Vivaldi Mail. Download Vivaldi for free at vivaldi.com ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [PATCH] package/comgt: Handle bind/unbind events
On 23/06/21 19:16, Arjun AK wrote:
On 22/06/21 2:07 am, Alberto Bursi wrote:
On 19/06/21 01:44, Arjun AK wrote:
On 08/05/21 5:38 am, Arjun AK wrote:
On 06/01/21 9:03 pm, Arjun AK wrote:
On 16/07/20 9:22 pm, Arjun AK wrote:
This script was expecting only add/remove events which has not
been the
case since Kernel 4.12 (which added bind/unbind). Bind events were
getting
treated as remove events which would cause hotplugged 3g modems to
not
work.
More info:
https://lkml.org/lkml/2018/12/23/128
https://github.com/systemd/systemd/issues/8221
Signed-off-by: Arjun AK
---
package/network/utils/comgt/files/3g.usb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/package/network/utils/comgt/files/3g.usb
b/package/network/utils/comgt/files/3g.usb
index 8f0d62ca83..9c7d07a0e6 100644
--- a/package/network/utils/comgt/files/3g.usb
+++ b/package/network/utils/comgt/files/3g.usb
@@ -23,6 +23,8 @@ find_3g_iface() {
fi
}
+[ "$ACTION" = add ] || [ "$ACTION" = remove ] || exit 0
+
case "$DEVICENAME" in
tty*)
[ -e "/dev/$DEVICENAME" ] || [ "$ACTION" = remove ] ||
exit 0
Has this been merged?
Can someone please merge this in?
Its been over a year now, can someone merge this one in?
-
Arjun
It does not seem there are many core developers able or interested in
maintaining these packages in core repository.
You might accomplish more if you send a PR where you move the whole
comgt (and uim package) to the community packages repo and become
maintainer.
It was done for some other packages in a similar situation, and a few
core developers have been active on this migration and might be
interested (Paul Spooren and Petr Štetiar
for example)
-Alberto
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
You mean to move the packages into
https://git.openwrt.org/feed/packages.git ?
-
Arjun
That is a mirror, the community packages feed where you must send PRs to
is on Github. Also bugs on packages and whatnot are handled by Github
issues tickets and not through OpenWrt bug report server.
This is the link:
https://github.com/openwrt/packages
You send an email on mailing list to drop the package and open a PR in
the packages repository to add it and become its maintainer.
You can look at the recent email from Paul Spooren called
[PATCH] dante: move to packages.git, and the PR he made in the packages
repo as an example.
-Alberto
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[PATCH 2/2] hostapd: remove unused mac_buff allocation
Signed-off-by: Martin Weinelt --- package/network/services/hostapd/src/src/ap/ubus.c | 1 - 1 file changed, 1 deletion(-) diff --git a/package/network/services/hostapd/src/src/ap/ubus.c b/package/network/services/hostapd/src/src/ap/ubus.c index 1b605bdf0a..b0e82d457b 100644 --- a/package/network/services/hostapd/src/src/ap/ubus.c +++ b/package/network/services/hostapd/src/src/ap/ubus.c @@ -408,7 +408,6 @@ hostapd_bss_get_status(struct ubus_context *ctx, struct ubus_object *obj, struct os_reltime now; char ssid[SSID_MAX_LEN + 1]; char phy_name[17]; - char mac_buf[20]; blob_buf_init(, 0); blobmsg_add_string(, "status", hostapd_state_text(hapd->iface->state)); -- 2.31.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[PATCH 1/2] hostapd: report bssid, ssid and channel over ubus
Imports a function from iw to convert frequencies to channel numbers.
Co-authored-by: David Bauer
Signed-off-by: Martin Weinelt
---
.../services/hostapd/src/src/ap/ubus.c| 34 +++
1 file changed, 34 insertions(+)
diff --git a/package/network/services/hostapd/src/src/ap/ubus.c
b/package/network/services/hostapd/src/src/ap/ubus.c
index 7cc2059fc1..1b605bdf0a 100644
--- a/package/network/services/hostapd/src/src/ap/ubus.c
+++ b/package/network/services/hostapd/src/src/ap/ubus.c
@@ -372,6 +372,32 @@ hostapd_bss_get_features(struct ubus_context *ctx, struct
ubus_object *obj,
return 0;
}
+/* Imported from iw/util.c
+ *
https://git.kernel.org/pub/scm/linux/kernel/git/jberg/iw.git/tree/util.c?id=4b25ae3537af48dbf9d0abf94132e5ba01b32c18#n200
+ */
+int ieee80211_frequency_to_channel(int freq)
+{
+ /* see 802.11-2007 17.3.8.3.2 and Annex J */
+ if (freq == 2484)
+ return 14;
+ /* see 802.11ax D6.1 27.3.23.2 and Annex E */
+ else if (freq == 5935)
+ return 2;
+ else if (freq < 2484)
+ return (freq - 2407) / 5;
+ else if (freq >= 4910 && freq <= 4980)
+ return (freq - 4000) / 5;
+ else if (freq < 5950)
+ return (freq - 5000) / 5;
+ else if (freq <= 45000) /* DMG band lower limit */
+ /* see 802.11ax D6.1 27.3.23.2 */
+ return (freq - 5950) / 5;
+ else if (freq >= 58320 && freq <= 70200)
+ return (freq - 56160) / 2160;
+ else
+ return 0;
+}
+
static int
hostapd_bss_get_status(struct ubus_context *ctx, struct ubus_object *obj,
struct ubus_request_data *req, const char *method,
@@ -380,12 +406,20 @@ hostapd_bss_get_status(struct ubus_context *ctx, struct
ubus_object *obj,
struct hostapd_data *hapd = container_of(obj, struct hostapd_data,
ubus.obj);
void *airtime_table, *dfs_table;
struct os_reltime now;
+ char ssid[SSID_MAX_LEN + 1];
char phy_name[17];
char mac_buf[20];
blob_buf_init(, 0);
blobmsg_add_string(, "status",
hostapd_state_text(hapd->iface->state));
+ blobmsg_printf(, "bssid", MACSTR, MAC2STR(hapd->conf->bssid));
+
+ memset(ssid, 0, SSID_MAX_LEN + 1);
+ memcpy(ssid, hapd->conf->ssid.ssid, hapd->conf->ssid.ssid_len);
+ blobmsg_add_string(, "ssid", ssid);
+
blobmsg_add_u32(, "freq", hapd->iface->freq);
+ blobmsg_add_u32(, "channel",
ieee80211_frequency_to_channel(hapd->iface->freq));
snprintf(phy_name, 17, "%s", hapd->iface->phy);
blobmsg_add_string(, "phy", phy_name);
--
2.31.1
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Move QOS-Scripts to packages feed?
Can we move qos-scripts to packages feed? https://github.com/openwrt/openwrt/tree/master/package/network/config/qos-scripts Bests, Nick ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: imx6 - gateworks target broken
On 25.06.21 11:44, Piotr Dymacz wrote: Hi Koen, On 25.06.2021 11:04, Koen Vandeputte wrote: Hi Piotr, It seems imx6 Gateworks Ventana target got broken. I suspect it's due to following commit: https://git.openwrt.org/?p=openwrt/openwrt.git;a=commit;h=8dba71dd33c8e35e7f363ffdb2ba42259ab43ce2 After this commit, the bootfile generated is this one: - 6x_bootscript-gateworks_ventana While the bootloader looks for this: Loading file '/6x_bootscript-ventana' to addr 0x1200... ** File not found /6x_bootscript-ventana ** Due to this, the fixup does not happen and wrong kernel params are provided causing a panic as the rootfs is not found. Any idea how to fix this one properly? Revert the naming to plain "ventana" again? Oh, I'm sorry for that! I see that the 'script' var value is embedded in env [1] so probably the only correct way is to adjust it back on our side. Let me fix that as I also plan to send couple of patches with imx6 to imx split. [1] https://source.denx.de/u-boot/u-boot/-/blob/master/include/configs/gw_ventana.h#L154 No worries :-) Thanks for picking it up. I'm currently using this patch to allow further testing: https://git.openwrt.org/?p=openwrt/staging/xback.git;a=commit;h=e7b2714651ab8bbe3ff8518e18578a4e97cd Regards, Koen ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: imx6 - gateworks target broken
Hi Koen, On 25.06.2021 11:04, Koen Vandeputte wrote: Hi Piotr, It seems imx6 Gateworks Ventana target got broken. I suspect it's due to following commit: https://git.openwrt.org/?p=openwrt/openwrt.git;a=commit;h=8dba71dd33c8e35e7f363ffdb2ba42259ab43ce2 After this commit, the bootfile generated is this one: - 6x_bootscript-gateworks_ventana While the bootloader looks for this: Loading file '/6x_bootscript-ventana' to addr 0x1200... ** File not found /6x_bootscript-ventana ** Due to this, the fixup does not happen and wrong kernel params are provided causing a panic as the rootfs is not found. Any idea how to fix this one properly? Revert the naming to plain "ventana" again? Oh, I'm sorry for that! I see that the 'script' var value is embedded in env [1] so probably the only correct way is to adjust it back on our side. Let me fix that as I also plan to send couple of patches with imx6 to imx split. [1] https://source.denx.de/u-boot/u-boot/-/blob/master/include/configs/gw_ventana.h#L154 -- Cheers, Piotr Thanks, Koen ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
imx6 - gateworks target broken
Hi Piotr, It seems imx6 Gateworks Ventana target got broken. I suspect it's due to following commit: https://git.openwrt.org/?p=openwrt/openwrt.git;a=commit;h=8dba71dd33c8e35e7f363ffdb2ba42259ab43ce2 After this commit, the bootfile generated is this one: - 6x_bootscript-gateworks_ventana While the bootloader looks for this: Loading file '/6x_bootscript-ventana' to addr 0x1200... ** File not found /6x_bootscript-ventana ** Due to this, the fixup does not happen and wrong kernel params are provided causing a panic as the rootfs is not found. Any idea how to fix this one properly? Revert the naming to plain "ventana" again? Thanks, Koen ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[PATCH 2/2 v2] dnsmasq: add config option for connmark DNS filtering
This adds uci support to configure connmark based DNS filtering.
Signed-off-by: Etan Kissling
(See
https://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2021q2/015151.html)
Signed-off-by: Etan Kissling
---
v2: Bundle with patch to update dnsmasq to 2.86test3.
package/network/services/dnsmasq/files/dnsmasq.init | 12
1 file changed, 12 insertions(+)
diff --git a/package/network/services/dnsmasq/files/dnsmasq.init
b/package/network/services/dnsmasq/files/dnsmasq.init
index 44e7d2d4f9..3e06218a43 100644
--- a/package/network/services/dnsmasq/files/dnsmasq.init
+++ b/package/network/services/dnsmasq/files/dnsmasq.init
@@ -172,6 +172,10 @@ append_ipset() {
xappend "--ipset=$1"
}
+append_connmark_allowlist() {
+ xappend "--connmark-allowlist=$1"
+}
+
append_interface() {
network_get_device ifname "$1" || ifname="$1"
xappend "--interface=$ifname"
@@ -913,6 +917,14 @@ dnsmasq_start()
config_list_foreach "$cfg" "rev_server" append_rev_server
config_list_foreach "$cfg" "address" append_address
config_list_foreach "$cfg" "ipset" append_ipset
+
+ local connmark_allowlist_enable
+ config_get connmark_allowlist_enable "$cfg" connmark_allowlist_enable 0
+ [ "$connmark_allowlist_enable" -gt 0 ] && {
+ append_parm "$cfg" "connmark_allowlist_enable"
"--connmark-allowlist-enable"
+ config_list_foreach "$cfg" "connmark_allowlist"
append_connmark_allowlist
+ }
+
[ -n "$BOOT" ] || {
config_list_foreach "$cfg" "interface" append_interface
config_list_foreach "$cfg" "notinterface" append_notinterface
--
2.30.1 (Apple Git-130)
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[PATCH 1/2 v2] dnsmasq: Update to version 2.86test3
Need this version to add config option for connmark DNS filtering. Summary of upstream CHANGELOG: * Handle DHCPREBIND requests in the DHCPv6 server code. * Fix bug which caused dnsmasq to lose track of processes forked. * Major rewrite of the DNS server and domain handling code. * Revise resource handling for number of concurrent DNS queries. * Improve efficiency of DNSSEC. * Connection track mark based DNS query filtering. Signed-off-by: Etan Kissling --- package/network/services/dnsmasq/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile index 90a81b5f65..53080cb95b 100644 --- a/package/network/services/dnsmasq/Makefile +++ b/package/network/services/dnsmasq/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq -PKG_UPSTREAM_VERSION:=2.85 +PKG_UPSTREAM_VERSION:=2.86test3 PKG_VERSION:=$(subst test,~~test,$(subst rc,~rc,$(PKG_UPSTREAM_VERSION))) PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_UPSTREAM_VERSION).tar.xz -PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq -PKG_HASH:=ad98d3803df687e5b938080f3d25c628fe41c878752d03fbc6199787fee312fa +PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq/test-releases +PKG_HASH:=0d0b465db89390e9f518f1239dec88b458c84489e7fd38586af6a5781f85e7db PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING -- 2.30.1 (Apple Git-130) ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
