mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-27 07:57:27 +00:00
Code Issues Projects Releases Wiki Activity

libwebsockets: Update to latest on v4.2-stable

Browse Source 
Remove unused variable which is flagged by clang

License-Update: copy secondary license texts into LICENSE as a convenience

Add Apache-2.0 as well since lib/tls/mbedtls/wrapper is using it

[1] https://github.com/warmcat/libwebsockets/commit/a12d5ebed672a28c16484d983885474be606cc21#diff-c693279643b8cd5d248172d9c22cb7cf4ed163a3c98c8a3f69c2717edd3eacb7

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2021-06-04 18:27:21 -07:00
parent 0b15f80012
commit 109700fc61
2 changed files with 60 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-connectivity/libwebsockets/libwebsockets/0001-core-net-Remove-unused-variable.patch
+54
View File
@@ -0,0 +1,54 @@
From cfa40cc1c2df6c64fb53bb4a2a56eb09e3e1309c Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 4 Jun 2021 18:21:58 -0700
Subject: [PATCH] core-net: Remove unused variable
variable 'n' is being set but it is not used anywhere, latest clang is
able to detect this and flags it
Fixes
lib/core-net/route.c:41:6: error: variable 'n' set but not used [-Werror,-Wunused-but-set-variable]
| int n = 0;
| ^
Upstream-Status: Submitted [https://github.com/warmcat/libwebsockets/pull/2320]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
lib/core-net/route.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/lib/core-net/route.c b/lib/core-net/route.c
index efe08ba1..6be93d62 100644
--- a/lib/core-net/route.c
+++ b/lib/core-net/route.c
@@ -38,23 +38,22 @@ void
_lws_routing_entry_dump(lws_route_t *rou)
{
char sa[48], fin[192], *end = &fin[sizeof(fin)];
- int n = 0;
if (rou->dest.sa4.sin_family) {
lws_sa46_write_numeric_address(&rou->dest, sa, sizeof(sa));
- n += lws_snprintf(fin, lws_ptr_diff_size_t(end, fin),
+ lws_snprintf(fin, lws_ptr_diff_size_t(end, fin),
"dst: %s/%d, ", sa, rou->dest_len);
}
if (rou->src.sa4.sin_family) {
lws_sa46_write_numeric_address(&rou->src, sa, sizeof(sa));
- n += lws_snprintf(fin, lws_ptr_diff_size_t(end, fin),
+ lws_snprintf(fin, lws_ptr_diff_size_t(end, fin),
"src: %s/%d, ", sa, rou->src_len);
}
if (rou->gateway.sa4.sin_family) {
lws_sa46_write_numeric_address(&rou->gateway, sa, sizeof(sa));
- n += lws_snprintf(fin, lws_ptr_diff_size_t(end, fin),
+ lws_snprintf(fin, lws_ptr_diff_size_t(end, fin),
"gw: %s, ", sa);
}
--
2.31.1
meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.2.0.bb
+6 -4
View File
@@ -1,13 +1,15 @@
SUMMARY = "Canonical libwebsockets.org websocket library" SUMMARY = "Canonical libwebsockets.org websocket library"
HOMEPAGE = "https://libwebsockets.org/" HOMEPAGE = "https://libwebsockets.org/"
LICENSE = "MIT & Zlib & BSD-3-Clause" LICENSE = "MIT & Zlib & BSD-3-Clause & Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=8c47b078124308a4e1354e8d59f606b7" LIC_FILES_CHKSUM = "file://LICENSE;md5=c8bea43a2eb5d713c338819a0be07797"
DEPENDS = "zlib" DEPENDS = "zlib"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
SRCREV = "1367c11e1ee44d9e19daa50e1d015365bae17354" SRCREV = "4b6a7982b6833c8ccac1f35caaf9e8ccc605ff9a"
SRC_URI = "git://github.com/warmcat/libwebsockets.git;protocol=https;branch=v4.2-stable" SRC_URI = "git://github.com/warmcat/libwebsockets.git;protocol=https;branch=v4.2-stable \
file://0001-core-net-Remove-unused-variable.patch \
"
UPSTREAM_CHECK_URI = "https://github.com/warmcat/${BPN}/releases" UPSTREAM_CHECK_URI = "https://github.com/warmcat/${BPN}/releases"
UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"