From e7f3b224d9583cc639f89ac4b85a1fd63fe5f3f5 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 6 Aug 2022 21:38:59 -0700 Subject: kronosnet: Upgrade to 1.24 Remove upstreamed patches Signed-off-by: Khem Raj --- ...net-tests-Correct-include-path-for-poll.h.patch | 29 ------------------- .../recipes-extended/kronosnet/kronosnet_1.22.bb | 33 ---------------------- .../recipes-extended/kronosnet/kronosnet_1.24.bb | 32 +++++++++++++++++++++ 3 files changed, 32 insertions(+), 62 deletions(-) delete mode 100644 meta-networking/recipes-extended/kronosnet/kronosnet/0001-libknet-tests-Correct-include-path-for-poll.h.patch delete mode 100644 meta-networking/recipes-extended/kronosnet/kronosnet_1.22.bb create mode 100644 meta-networking/recipes-extended/kronosnet/kronosnet_1.24.bb diff --git a/meta-networking/recipes-extended/kronosnet/kronosnet/0001-libknet-tests-Correct-include-path-for-poll.h.patch b/meta-networking/recipes-extended/kronosnet/kronosnet/0001-libknet-tests-Correct-include-path-for-poll.h.patch deleted file mode 100644 index 0d261fd4ef..0000000000 --- a/meta-networking/recipes-extended/kronosnet/kronosnet/0001-libknet-tests-Correct-include-path-for-poll.h.patch +++ /dev/null @@ -1,29 +0,0 @@ -From cae68083fda5d4ca832ff3cc8a533454df2efe23 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 12 Oct 2021 20:35:53 -0700 -Subject: [PATCH] libknet/tests: Correct include path for poll.h - -Fixes -/usr/include/sys/poll.h:1:2: error: redirec -ting incorrect #include to [-Werror,-W#warnings] -| #warning redirecting incorrect #include to - -Upstream-Status: Submitted [https://github.com/kronosnet/kronosnet/pull/363] -Signed-off-by: Khem Raj ---- - libknet/tests/test-common.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libknet/tests/test-common.c b/libknet/tests/test-common.c -index 86b76b0..8f8b6ca 100644 ---- a/libknet/tests/test-common.c -+++ b/libknet/tests/test-common.c -@@ -20,7 +20,7 @@ - #include - #include - #include --#include -+#include - - #include "libknet.h" - #include "test-common.h" diff --git a/meta-networking/recipes-extended/kronosnet/kronosnet_1.22.bb b/meta-networking/recipes-extended/kronosnet/kronosnet_1.22.bb deleted file mode 100644 index 0b0bc29452..0000000000 --- a/meta-networking/recipes-extended/kronosnet/kronosnet_1.22.bb +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright (C) 2020 Khem Raj -# Released under the MIT license (see COPYING.MIT for the terms) - -SUMMARY = "Kronosnet, often referred to as knet, is a network abstraction layer \ - designed for High Availability use cases, where redundancy, security, \ - fault tolerance and fast fail-over are the core requirements of your application." -HOMEPAGE = "https://kronosnet.org/" -LICENSE = "GPL-2.0-or-later & LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://COPYING.applications;md5=751419260aa954499f7abaabaa882bbe \ - file://COPYING.libraries;md5=2d5025d4aa3495befef8f17206a5b0a1" -SECTION = "libs" -DEPENDS = "doxygen-native libqb-native libxml2-native bzip2 libqb libxml2 libnl lksctp-tools lz4 lzo openssl nss xz zlib zstd" - -SRCREV = "0123ecebce0ad6aba3cdb320027192e15fd71e23" -SRC_URI = "git://github.com/kronosnet/kronosnet;protocol=https;branch=stable1 \ - file://0001-libknet-tests-Correct-include-path-for-poll.h.patch \ - file://0001-links.c-Fix-build-with-gcc-12.patch \ - " - -UPSTREAM_CHECK_URI = "https://github.com/kronosnet/kronosnet/releases" - -inherit autotools pkgconfig - -S = "${WORKDIR}/git" - -# libknet/transport_udp.c:326:48: error: comparison of integers of different signs: 'unsigned long' and 'int' [-Werror,-Wsign-compare] -# for (cmsg = CMSG_FIRSTHDR(&msg);cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) { -# ^~~~~~~~~~~~~~~~~~~~~~~ -CFLAGS:append:toolchain-clang = " -Wno-sign-compare" - -PACKAGECONFIG[man] = "enable_man="yes", --disable-man, " - -PACKAGECONFIG:remove = "man" diff --git a/meta-networking/recipes-extended/kronosnet/kronosnet_1.24.bb b/meta-networking/recipes-extended/kronosnet/kronosnet_1.24.bb new file mode 100644 index 0000000000..cbd5e7a0fd --- /dev/null +++ b/meta-networking/recipes-extended/kronosnet/kronosnet_1.24.bb @@ -0,0 +1,32 @@ +# Copyright (C) 2020 Khem Raj +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "Kronosnet, often referred to as knet, is a network abstraction layer \ + designed for High Availability use cases, where redundancy, security, \ + fault tolerance and fast fail-over are the core requirements of your application." +HOMEPAGE = "https://kronosnet.org/" +LICENSE = "GPL-2.0-or-later & LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING.applications;md5=751419260aa954499f7abaabaa882bbe \ + file://COPYING.libraries;md5=2d5025d4aa3495befef8f17206a5b0a1" +SECTION = "libs" +DEPENDS = "doxygen-native libqb-native libxml2-native bzip2 libqb libxml2 libnl lksctp-tools lz4 lzo openssl nss xz zlib zstd" + +SRCREV = "f8f80fd7f9b85f2626d2c6452612962ad8efca9e" +SRC_URI = "git://github.com/kronosnet/kronosnet;protocol=https;branch=stable1 \ + file://0001-links.c-Fix-build-with-gcc-12.patch \ + " + +UPSTREAM_CHECK_URI = "https://github.com/kronosnet/kronosnet/releases" + +inherit autotools pkgconfig + +S = "${WORKDIR}/git" + +# libknet/transport_udp.c:326:48: error: comparison of integers of different signs: 'unsigned long' and 'int' [-Werror,-Wsign-compare] +# for (cmsg = CMSG_FIRSTHDR(&msg);cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) { +# ^~~~~~~~~~~~~~~~~~~~~~~ +CFLAGS:append:toolchain-clang = " -Wno-sign-compare" + +PACKAGECONFIG[man] = "enable_man="yes", --disable-man, " + +PACKAGECONFIG:remove = "man" -- cgit v1.2.3-54-g00ecf