Bump sdbus-c++ version to v0.8.3
PATCH 1/4 Bump sdbus-c++ version to v0.8.3
From: Stanislav Angelovic <[email protected]>
---
...1-Try-to-first-find-googletest-in-the-system-before-do.patch | 0
.../sdbus-c++/{sdbus-c++-0.8.1 => sdbus-c++-0.8.3}/run-ptest | 0
.../{sdbus-c++-tools_0.8.1.bb => sdbus-c++-tools_0.8.3.bb} | 2 +-
.../sdbus-c++/{sdbus-c++_0.8.1.bb => sdbus-c++_0.8.3.bb} | 2 +-
4 files changed, 2 insertions(+), 2 deletions(-)
rename meta-oe/recipes-core/sdbus-c++/{sdbus-c++-0.8.1 => sdbus-c++-0.8.3}/0001-Try-to-first-find-googletest-in-the-system-before-do.patch (100%)
rename meta-oe/recipes-core/sdbus-c++/{sdbus-c++-0.8.1 => sdbus-c++-0.8.3}/run-ptest (100%)
rename meta-oe/recipes-core/sdbus-c++/{sdbus-c++-tools_0.8.1.bb => sdbus-c++-tools_0.8.3.bb} (88%)
rename meta-oe/recipes-core/sdbus-c++/{sdbus-c++_0.8.1.bb => sdbus-c++_0.8.3.bb} (96%)meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.3/0001-Try-to-first-find-googletest-in-the-system-before-do.patch renamed from meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.1/0001-Try-to-first-find-googletest-in-the-system-before-do.patch +0 -0
meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.3/run-ptest renamed from meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.1/run-ptest +0 -0
meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools_0.8.3.bb renamed from meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools_0.8.1.bb +1 -1
@@ -8,7 +8,7 @@ inherit cmake DEPENDS += "expat" -SRCREV = "3a4f343fb924650e7639660efa5f143961162044" +SRCREV = "6e8e5aadb674cccea5bdd55141db5dad887fbacd" SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master;subpath=tools" S = "${WORKDIR}/tools"
meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.8.3.bb renamed from meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.8.1.bb +1 -1
@@ -16,7 +16,7 @@ PACKAGECONFIG[with-tests] = "-DBUILD_TESTS=ON -DTESTS_INSTALL_PATH=${libdir}/${B DEPENDS += "expat" -SRCREV = "3a4f343fb924650e7639660efa5f143961162044" +SRCREV = "6e8e5aadb674cccea5bdd55141db5dad887fbacd" SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master \ file://0001-Try-to-first-find-googletest-in-the-system-before-do.patch \
Signature · 1 line
2.34.1
PATCH 2/4 sdbus-c++-libsystemd: Fix reallocarray check in meson
From: Khem Raj <[email protected]>
--- .../0001-meson-Fix-reallocarray-check.patch | 25 +++++++++++++++++++ .../sdbus-c++/sdbus-c++-libsystemd_243.bb | 1 + 2 files changed, 26 insertions(+) create mode 100644 meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0001-meson-Fix-reallocarray-check.patch
meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0001-meson-Fix-reallocarray-check.patch new file +25 -0
@@ -0,0 +1,25 @@ +From 1ebf1a1df17afd8b89f84b1928a89069035bf20b Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sat, 12 Dec 2020 16:15:57 -0800 +Subject: [PATCH] meson: Fix reallocarray check + +reallocarray() is defined in stdlib.h, so that would be right header to +check for its presense. + +Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/17951] +Signed-off-by: Khem Raj <[email protected]> +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/meson.build ++++ b/meson.build +@@ -501,7 +501,7 @@ foreach ident : [ + #include <sys/stat.h> + #include <unistd.h>'''], + ['explicit_bzero' , '''#include <string.h>'''], +- ['reallocarray', '''#include <malloc.h>'''], ++ ['reallocarray', '''#include <stdlib.h>'''], + ['set_mempolicy', '''#include <stdlib.h> + #include <unistd.h>'''], + ['get_mempolicy', '''#include <stdlib.h>
meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb +1 -0
@@ -41,6 +41,7 @@ SRC_URI_MUSL = "\ file://0002-src-login-brightness.c-include-sys-wait.h.patch \ file://0003-src-basic-copy.c-include-signal.h.patch \ file://0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch \ + file://0001-meson-Fix-reallocarray-check.patch \ " PACKAGECONFIG ??= "gshadow idn"
Signature · 1 line
2.34.1
PATCH 3/4 sdbus-c++-libsystemd: Avoid hard dependency on rsync
In reply to Marek VasutFrom: Khem Raj <[email protected]>
--- ...d25119a495009ea62f79e5daec34cc464628.patch | 53 +++++++++++++++++++ .../sdbus-c++/sdbus-c++-libsystemd_243.bb | 7 +-- 2 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/7c5fd25119a495009ea62f79e5daec34cc464628.patch
meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/7c5fd25119a495009ea62f79e5daec34cc464628.patch new file +53 -0
@@ -0,0 +1,53 @@ +From 7c5fd25119a495009ea62f79e5daec34cc464628 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <[email protected]> +Date: Mon, 12 Apr 2021 14:03:32 +0200 +Subject: [PATCH] meson: do not fail if rsync is not installed with meson + 0.57.2 + +https://github.com/mesonbuild/meson/issues/8641 + +Our CI started to fail. Even if the change is reverted in meson, +we need a quick workaround here. + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <[email protected]> +--- + man/meson.build | 25 ++++++++++++++----------- + 1 file changed, 14 insertions(+), 11 deletions(-) + +diff --git a/man/meson.build b/man/meson.build +index 3cae8446cda..f9c4b83dc81 100644 +--- a/man/meson.build ++++ b/man/meson.build +@@ -184,17 +184,20 @@ html = custom_target( + depends : html_pages, + command : ['echo']) + +-run_target( +- 'doc-sync', +- depends : man_pages + html_pages, +- command : ['rsync', '-rlv', +- '--delete-excluded', +- '--include=man', +- '--include=*.html', +- '--exclude=*', +- '--omit-dir-times', +- meson.current_build_dir(), +- get_option('www-target')]) ++rsync = find_program('rsync', required : false) ++if rsync.found() ++ run_target( ++ 'doc-sync', ++ depends : man_pages + html_pages, ++ command : [rsync, '-rlv', ++ '--delete-excluded', ++ '--include=man', ++ '--include=*.html', ++ '--exclude=*', ++ '--omit-dir-times', ++ meson.current_build_dir(), ++ get_option('www-target')]) ++endif + + ############################################################ +
meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb +4 -3
@@ -12,9 +12,10 @@ DEPENDS += "gperf-native gettext-native util-linux libcap" SRCREV = "efb536d0cbe2e58f80e501d19999928c75e08f6a" SRCBRANCH = "v243-stable" -SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH}" - -SRC_URI += "file://static-libsystemd-pkgconfig.patch" +SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH} \ + file://static-libsystemd-pkgconfig.patch \ + file://7c5fd25119a495009ea62f79e5daec34cc464628.patch \ + " # patches needed by musl SRC_URI_append_libc-musl = " ${SRC_URI_MUSL}"
Signature · 1 line
2.34.1
PATCH 4/4 sdbus-c++-libsystemd: Fix build with kernel 5.15+
In reply to Marek VasutFrom: Khem Raj <[email protected]>
Backport a patch from upstream systemd
--- ...-linux-Sync-if_arp.h-with-Linux-5.14.patch | 29 +++++++++++++++++++ .../sdbus-c++/sdbus-c++-libsystemd_243.bb | 1 + 2 files changed, 30 insertions(+) create mode 100644 meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0001-basic-linux-Sync-if_arp.h-with-Linux-5.14.patch
meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0001-basic-linux-Sync-if_arp.h-with-Linux-5.14.patch new file +29 -0
@@ -0,0 +1,29 @@ +From 4411a9a3ebff98b6fcf5967c75faa458d219df96 Mon Sep 17 00:00:00 2001 +From: Chris Packham <[email protected]> +Date: Fri, 10 Sep 2021 09:51:36 +1200 +Subject: [PATCH] basic/linux: Sync if_arp.h with Linux 5.14 + +ARPHRD_MCTP was added in 5.14. Sync if_arp.h to pick up the definition + +Fixes #20694 +Upstream-Status: Backport [https://github.com/cpackham-atlnz/systemd/commit/67cd626399b0d02882ee00716c8bd31ba764c862] +Signed-off-by: Khem Raj <[email protected]> +--- + src/basic/linux/if_arp.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/basic/linux/if_arp.h b/src/basic/linux/if_arp.h +index c3cc5a9e5e..4783af9fe5 100644 +--- a/src/basic/linux/if_arp.h ++++ b/src/basic/linux/if_arp.h +@@ -54,6 +54,7 @@ + #define ARPHRD_X25 271 /* CCITT X.25 */ + #define ARPHRD_HWX25 272 /* Boards with X.25 in firmware */ + #define ARPHRD_CAN 280 /* Controller Area Network */ ++#define ARPHRD_MCTP 290 + #define ARPHRD_PPP 512 + #define ARPHRD_CISCO 513 /* Cisco HDLC */ + #define ARPHRD_HDLC ARPHRD_CISCO +-- +2.33.1 +
meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb +1 -0
@@ -15,6 +15,7 @@ SRCBRANCH = "v243-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH} \ file://static-libsystemd-pkgconfig.patch \ file://7c5fd25119a495009ea62f79e5daec34cc464628.patch \ + file://0001-basic-linux-Sync-if_arp.h-with-Linux-5.14.patch \ " # patches needed by musl
Signature · 1 line
2.34.1
Quoted 5 lines · Marek Vasut
From: Stanislav Angelovic <[email protected]>
Signed-off-by Khem Raj <[email protected]>(cherry picked from commit b6213e4dd595d7dd2dbd67c1cad09e958ffd9c2f)Signed-off-by Marek Vasut <[email protected]>
Please sell me on the idea of why I should update this? Bug fix only, this version is a stable or LTS version.
- armin
Quoted 60 lines
--- ...1-Try-to-first-find-googletest-in-the-system-before-do.patch | 0 .../sdbus-c++/{sdbus-c++-0.8.1 => sdbus-c++-0.8.3}/run-ptest | 0 .../{sdbus-c++-tools_0.8.1.bb => sdbus-c++-tools_0.8.3.bb} | 2 +- .../sdbus-c++/{sdbus-c++_0.8.1.bb => sdbus-c++_0.8.3.bb} | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename meta-oe/recipes-core/sdbus-c++/{sdbus-c++-0.8.1 => sdbus-c++-0.8.3}/0001-Try-to-first-find-googletest-in-the-system-before-do.patch (100%) rename meta-oe/recipes-core/sdbus-c++/{sdbus-c++-0.8.1 => sdbus-c++-0.8.3}/run-ptest (100%) rename meta-oe/recipes-core/sdbus-c++/{sdbus-c++-tools_0.8.1.bb => sdbus-c++-tools_0.8.3.bb} (88%) rename meta-oe/recipes-core/sdbus-c++/{sdbus-c++_0.8.1.bb => sdbus-c++_0.8.3.bb} (96%)meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.3/0001-Try-to-first-find-googletest-in-the-system-before-do.patch renamed from meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.1/0001-Try-to-first-find-googletest-in-the-system-before-do.patch +0
-0meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.3/run-ptest renamed from meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.1/run-ptest +0
-0meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools_0.8.3.bb renamed from meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools_0.8.1.bb +1
-1@@ -8,7 +8,7 @@ inherit cmake DEPENDS += "expat" -SRCREV = "3a4f343fb924650e7639660efa5f143961162044" +SRCREV = "6e8e5aadb674cccea5bdd55141db5dad887fbacd" SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master;subpath=tools" S = "${WORKDIR}/tools"meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.8.3.bb renamed from meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.8.1.bb +1
-2@@ -16,7 +16,7 @@ PACKAGECONFIG[with-tests] = "-DBUILD_TESTS=ON -DTESTS_INSTALL_PATH=${libdir}/${B DEPENDS += "expat" -SRCREV = "3a4f343fb924650e7639660efa5f143961162044" +SRCREV = "6e8e5aadb674cccea5bdd55141db5dad887fbacd" SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master \ file://0001-Try-to-first-find-googletest-in-the-system-before-do.patch \ -=-=-=-=-=-=-=-=-=-=-=-Links: You receive all messages sent to this group.
View/Reply Online (#94746): https://lists.openembedded.org/g/openembedded-devel/message/94746
Mute This Topic: https://lists.openembedded.org/mt/88351111/3616698
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Quoted 5 lines · Marek Vasut
From: Stanislav Angelovic <[email protected]>
Signed-off-by Khem Raj <[email protected]>(cherry picked from commit b6213e4dd595d7dd2dbd67c1cad09e958ffd9c2f)Signed-off-by Marek Vasut <[email protected]>
It seems I was not CCed on your question, please include me next time you expect to get an answer.
"
Please sell me on the idea of why I should update this? Bug fix only, this version is a stable or LTS version.
"
It fixes the following race:
https://github.com/Kistler-Group/sdbus-cpp/issues/92
And a bunch of other fixes:
6e8e5aa Bump up to v0.8.3
3b735bf Introduce CI workflow based on GitHub Actions (#114)
2f7b35c Fix unused variable warnings for release builds
d5867e1 Fix unused variable warning for release builds
250aa2b Add additional messages to CMake build for optional parts
e63357b Remove non-virtual-dtor warnings by making classes final
2c6be03 Update CMake configuration flag names
138a437 Fix #112: Address a few inconsistencies and make code more idiomatic cc8d88c Fix GetObjectPath() in integration tests
bded067 Fix #43: Clean up integration tests
c1c4512 Fix build with gcc8.3
175c43e Bump revision up to v0.8.2
c137dfa Fix potential data race in Proxy's condition variable
a0dadcc Fix integration tests after getObjectPath() introduction failed them 0d01044 Fix build with clang 9.0.1 and libcxx
ae8849e Implement #104: add getObjectPath() for classes (#105)
fb35a9a Fix integration test cases failing in specific situations
6cbd49d Install proper public sd-bus headers in internal libsystemd build fb0a70a Fix #101: sanitize names of namespaces/methods/signals/properties/arguments (#102) 9af20af Fixed integration tests for libsystemd older than 242
63bbb07 Fixup for 00d0837d985dcec32cd8446e8a4f701e5370083f
00d0837 Introduce support for cancellable async calls
e91bedd Fix #92: CallData race condition in Proxy::callMethod
dc66efb Fix #93: Get signals working for multiple proxies.
a23aadb Fix required CMake version to v3.13
ae57c67 sdbus-c++-xml2cpp: fixed file existence condition
21820f7 Update using-sdbus-c++.md