rasdaemon: Upgrade to 0.6.8
PATCH 1/5 rasdaemon: Upgrade to 0.6.8
Fix build on musl while here
Drop unneeded header include patch which is fixed upstream
Signed-off-by Khem Raj <[email protected]>
---
.../0001-Fix-system-header-includes.patch | 44 -------------------
...-version-of-strerror_r-on-non-glibc-.patch | 35 +++++++++++++++
...{rasdaemon_0.6.7.bb => rasdaemon_0.6.8.bb} | 8 +---
3 files changed, 37 insertions(+), 50 deletions(-)
delete mode 100644 meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/files/0001-Fix-system-header-includes.patch
create mode 100644 meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/files/0001-libtrace-Use-XSI-version-of-strerror_r-on-non-glibc-.patch
rename meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/{rasdaemon_0.6.7.bb => rasdaemon_0.6.8.bb} (92%)meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/files/0001-Fix-system-header-includes.patch deleted +0 -44
@@ -1,44 +0,0 @@ -From 18786db1ad03716267927d983c83275469a1478a Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Fri, 8 May 2020 12:27:19 -0700 -Subject: [PATCH] Fix system header includes - -Use poll.h instead of sys/poll.h -Fixes -warning: #warning redirecting incorrect #include <sys/poll.h> to <poll.h> [-Wcpp] - -Include limits.h for PATH_MAX - -Fixes -ras-events.c:359:16: error: 'PATH_MAX' undeclared (first use in this function) - 359 | char pipe_raw[PATH_MAX]; - | ^~~~~~~~ - -Signed-off-by: Khem Raj <[email protected]> ---- - ras-events.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/ras-events.c b/ras-events.c -index 511c93d..400e740 100644 ---- a/ras-events.c -+++ b/ras-events.c -@@ -18,13 +18,14 @@ - #include <dirent.h> - #include <errno.h> - #include <fcntl.h> -+#include <limits.h> -+#include <poll.h> - #include <stdio.h> - #include <stdlib.h> - #include <string.h> - #include <unistd.h> - #include <sys/stat.h> - #include <sys/types.h> --#include <sys/poll.h> - #include <signal.h> - #include <sys/signalfd.h> - #include "libtrace/kbuffer.h" --- -2.26.2 -
meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/files/0001-libtrace-Use-XSI-version-of-strerror_r-on-non-glibc-.patch new file +35 -0
@@ -0,0 +1,35 @@ +From e415152b51eacab8705b6b3274cc0d1a274772e0 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Tue, 30 Aug 2022 19:54:35 -0700 +Subject: [PATCH] libtrace: Use XSI version of strerror_r on non glibc systems + +The version used is glibc specific therefore make it so +and provide a fallback for non-glibc systems + +Upstream-Status: Submitted [https://github.com/mchehab/rasdaemon/pull/70] +Signed-off-by: Khem Raj <[email protected]> +--- + libtrace/event-parse.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/libtrace/event-parse.c b/libtrace/event-parse.c +index 6c705c3..6b651d5 100644 +--- a/libtrace/event-parse.c ++++ b/libtrace/event-parse.c +@@ -5071,7 +5071,13 @@ int pevent_strerror(struct pevent *pevent, enum pevent_errno errnum, + const char *msg; + + if (errnum >= 0) { ++#if defined(__GLIBC__) + msg = strerror_r(errnum, buf, buflen); ++#else ++ if (strerror_r(errnum, buf, buflen) != 0) ++ snprintf(buf, buflen, "unknown error %i", errnum); ++ msg = buf; ++#endif + if (msg != buf) { + size_t len = strlen(msg); + memcpy(buf, msg, min(buflen - 1, len)); +-- +2.37.3 +
meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.8.bb renamed from meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.7.bb +2 -6
@@ -4,11 +4,11 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d3070efe0afa3dc41608bd82c00bb0dc" SRC_URI = "git://github.com/mchehab/rasdaemon.git;branch=master;protocol=https \ - file://0001-Fix-system-header-includes.patch \ + file://0001-libtrace-Use-XSI-version-of-strerror_r-on-non-glibc-.patch \ file://rasdaemon.service \ file://init" -SRCREV = "aa96737648d867a3d73e4151d05b54bbab494605" +SRCREV = "c2255178a49f62c53009a456bc37dd5e37332f09" S = "${WORKDIR}/git"
@@ -32,10 +32,6 @@ PACKAGECONFIG[abrt-report] = "--enable-abrt-report,--disable-abrt-report" DEPENDS:append:libc-musl = " argp-standalone" LDFLAGS:append:libc-musl = " -largp" -do_configure:prepend () { - ( cd ${S}; autoreconf -vfi ) -} - do_install:append() { install -d ${D}${sysconfdir}/init.d install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/rasdaemon
Signature · 1 line
2.37.3
PATCH 2/5 psqlodbc: Upgrade to 13.02.0000
Forward port patches
Merged .inc into .bb for easing out devtool use
Signed-off-by Khem Raj <[email protected]>
---
...qlodbc-donot-use-the-hardcode-libdir.patch | 17 ++++---
.../psqlodbc-fix-for-ptest-support.patch | 51 ++++++-------------
...move-some-checks-for-cross-compiling.patch | 42 ++++++++++-----
.../psqlodbc/psqlodbc_09.05.0300.bb | 14 -----
.../{psqlodbc.inc => psqlodbc_13.02.0000.bb} | 16 +++++-
5 files changed, 68 insertions(+), 72 deletions(-)
delete mode 100644 meta-oe/recipes-dbs/psqlodbc/psqlodbc_09.05.0300.bb
rename meta-oe/recipes-dbs/psqlodbc/{psqlodbc.inc => psqlodbc_13.02.0000.bb} (77%)meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-donot-use-the-hardcode-libdir.patch +9 -8
@@ -1,26 +1,27 @@ -[PATCH] do not use the hardcode libdir +From 8f3ed8df4721991958a5becf75a69493d67e7514 Mon Sep 17 00:00:00 2001 +From: "Roy.Li" <[email protected]> +Date: Tue, 5 Sep 2017 10:24:10 +0800 +Subject: [PATCH] [PATCH] do not use the hardcode libdir Upstream-status: Pending Signed-off-by: Roy.Li <[email protected]> Signed-off-by: Jackie Huang <[email protected]> + --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 9b88d4c..df5ad7a 100644 +index 00b359e..ba50e6f 100644 --- a/configure.ac +++ b/configure.ac -@@ -140,7 +140,7 @@ if test "$with_libpq" != yes; then +@@ -114,7 +114,7 @@ if test "$with_libpq" != yes; then if test -d "$with_libpq"; then - PATH="$PATH:$with_libpq/bin" - CPPFLAGS="$CPPFLAGS -I$with_libpq/include" + PATH="$with_libpq/bin:$PATH" + CPPFLAGS="$CPPFLAGS -I$with_libpq/include -I$with_libpq/include/postgresql/internal" - LDFLAGS="$LDFLAGS -L$with_libpq/lib" + LDFLAGS="$LDFLAGS -L$with_libpq/${base_libdir}" else if test -x "$with_libpq"; then PG_CONFIG=$with_libpq --- -2.8.1 -
meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-fix-for-ptest-support.patch +16 -35
110 lines not on this page · raw message
meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-remove-some-checks-for-cross-compiling.patch +29 -13
103 lines not on this page · raw message
meta-oe/recipes-dbs/psqlodbc/psqlodbc_09.05.0300.bb deleted +0 -14
@@ -1,14 +0,0 @@ -require ${PN}.inc - -LICENSE = "LGPL-2.0-only" -LIC_FILES_CHKSUM = "file://license.txt;md5=6db3822fc7512e83087ba798da013692" - -SRC_URI = "http://ftp.postgresql.org/pub/odbc/versions/src/${BPN}-${PV}.tar.gz \ - file://psqlodbc-remove-some-checks-for-cross-compiling.patch \ - file://psqlodbc-donot-use-the-hardcode-libdir.patch \ - file://psqlodbc-fix-for-ptest-support.patch \ - file://run-ptest \ -" - -SRC_URI[md5sum] = "4c6e0b22187d7bb1c998ffac89e50f6b" -SRC_URI[sha256sum] = "9521f328bf28aaaf5c8488dc89792b614f9d6271742c0baf9bb41c97537764a8"
meta-oe/recipes-dbs/psqlodbc/psqlodbc_13.02.0000.bb renamed from meta-oe/recipes-dbs/psqlodbc/psqlodbc.inc +14 -2
@@ -16,6 +16,18 @@ DESCRIPTION = "\ SECTION = "libs" HOMEPAGE = "http://psqlodbc.projects.postgresql.org/" +LICENSE = "LGPL-2.0-only" +LIC_FILES_CHKSUM = "file://license.txt;md5=6db3822fc7512e83087ba798da013692" + +SRC_URI = "http://ftp.postgresql.org/pub/odbc/versions/src/${BPN}-${PV}.tar.gz \ + file://psqlodbc-remove-some-checks-for-cross-compiling.patch \ + file://psqlodbc-donot-use-the-hardcode-libdir.patch \ + file://psqlodbc-fix-for-ptest-support.patch \ + file://run-ptest \ +" + +SRC_URI[sha256sum] = "b39b7e5c41fd6475c551112fa724bf57c4a446175ec4188a90e2844cc1612585" + DEPENDS += "postgresql unixodbc" EXTRA_OECONF = "\
@@ -24,8 +36,7 @@ EXTRA_OECONF = "\ --with-unixodbc=yes \ --with-libpq=${STAGING_LIBDIR}/.. \ --enable-pthreads \ - --disable-unicode \ - LIBS="-lpthread" \ + LIBS='-lpthread' \ " inherit autotools pkgconfig ptest
@@ -48,3 +59,4 @@ FILES:${PN} += "${libdir}" # The tests need a local PostgreSQL server running RDEPENDS:${PN}-ptest = "postgresql" +
Signature · 1 line
2.37.3
PATCH 3/5 soci: Fix build with clang 15
In reply to Khem RajSigned-off-by Khem Raj <[email protected]>
--- ...Do-not-use-std-shuffle-with-clang-15.patch | 32 +++++++++++++++++++ meta-oe/recipes-dbs/soci/soci_4.0.3.bb | 4 ++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-dbs/soci/soci/0001-Do-not-use-std-shuffle-with-clang-15.patch
meta-oe/recipes-dbs/soci/soci/0001-Do-not-use-std-shuffle-with-clang-15.patch new file +32 -0
@@ -0,0 +1,32 @@ +From e5f72c656829402c6f70e7416039bc18f0c26485 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Tue, 30 Aug 2022 22:17:14 -0700 +Subject: [PATCH] Do not use std::shuffle with clang 15 + +This fails to compile although its preferred approach for c++11 and +newer + +See +https://github.com/SOCI/soci/issues/984 + +Upstream-Status: Inappropriate [Workaround] +Signed-off-by: Khem Raj <[email protected]> +--- + cmake/SociConfig.cmake | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/cmake/SociConfig.cmake b/cmake/SociConfig.cmake +index 492e1837..f24fd9a6 100644 +--- a/cmake/SociConfig.cmake ++++ b/cmake/SociConfig.cmake +@@ -94,6 +94,7 @@ else() + set(SOCI_CXX11 ON) + set(SOCI_CXX_VERSION_FLAGS "-std=c++11") + add_definitions(-DCATCH_CONFIG_CPP11_NO_IS_ENUM) ++ add_definitions(-DCATCH_CONFIG_CPP11_NO_SHUFFLE) + + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SOCI_GCC_CLANG_COMMON_FLAGS} ${SOCI_CXX_VERSION_FLAGS}") + +-- +2.37.3 +
meta-oe/recipes-dbs/soci/soci_4.0.3.bb +3 -1
@@ -5,7 +5,9 @@ LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" SECTION = "libs" DEPENDS = "boost" -SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BP}/${BP}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BP}/${BP}.tar.gz \ + file://0001-Do-not-use-std-shuffle-with-clang-15.patch \ + " SRC_URI[sha256sum] = "615e5f7e4b52007f3a3b4050a99aadf6346b56b5098eb08b3a650836083c6a33" TESTCONFIG = '-DSOCI_TEST_EMPTY_CONNSTR="dummy" -DSOCI_TEST_SQLITE3_CONNSTR="test.db" \
Signature · 1 line
2.37.3
PATCH 4/5 geany-plugins: Fix type error found with clang 15
In reply to Khem RajSigned-off-by Khem Raj <[email protected]>
--- ...e-Use-0-instead-of-NULL-for-gboolean.patch | 34 +++++++++++++++++++ .../geany/geany-plugins_1.38.bb | 1 + 2 files changed, 35 insertions(+) create mode 100644 meta-oe/recipes-devtools/geany/geany-plugins/0001-scope-Use-0-instead-of-NULL-for-gboolean.patch
meta-oe/recipes-devtools/geany/geany-plugins/0001-scope-Use-0-instead-of-NULL-for-gboolean.patch new file +34 -0
@@ -0,0 +1,34 @@ +From 9ee9388bc66e6cf68db96b2014dca2115f745dc9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Tue, 30 Aug 2022 22:33:46 -0700 +Subject: [PATCH] scope: Use 0 instead of NULL for gboolean + +Fixes warnings with clang 15+ + +scope/src/stack.c:168:11: error: incompatible pointer to integer conversion initializing 'gboolean' (aka 'int') with an expression of type 'void *' [-Wint-conversion] + gboolean entry = NULL; + ^ ~~~~ +1 error generated. + +Upstream-Status: Submitted [https://github.com/geany/geany-plugins/pull/1191] +Signed-off-by: Khem Raj <[email protected]> +--- + scope/src/stack.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scope/src/stack.c b/scope/src/stack.c +index b03909fe..041dd415 100644 +--- a/scope/src/stack.c ++++ b/scope/src/stack.c +@@ -165,7 +165,7 @@ void on_stack_follow(GArray *nodes) + gboolean stack_entry(void) + { + GtkTreeIter iter; +- gboolean entry = NULL; ++ gboolean entry = 0; + + if (gtk_tree_selection_get_selected(selection, NULL, &iter)) + { +-- +2.37.3 +
meta-oe/recipes-devtools/geany/geany-plugins_1.38.bb +1 -0
@@ -33,6 +33,7 @@ SRC_URI = " \ file://0001-Use-pkg-config-to-find-gpgme.patch \ file://0001-git-changebar-Adjust-structs-for-libgit2-1.4.x.patch \ file://0001-geany.m4-Do-not-tinker-with-pkg-config-paths.patch \ + file://0001-scope-Use-0-instead-of-NULL-for-gboolean.patch \ " SRC_URI[sha256sum] = "1c578a7ebb390aa8882f195acd3d8da3ceb73925d291b28dec90cd3e5fd20586"
Signature · 1 line
2.37.3
PATCH 5/5 nlohmann-fifo: Update to tip of trunk
In reply to Khem RajSigned-off-by Khem Raj <[email protected]>
--- meta-oe/recipes-devtools/nlohmann-fifo/nlohmann-fifo_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-devtools/nlohmann-fifo/nlohmann-fifo_git.bb +1 -1
@@ -8,7 +8,7 @@ SRC_URI = "git://github.com/nlohmann/fifo_map.git;branch=master;protocol=https" PV = "1.0.0+git${SRCPV}" -SRCREV = "0dfbf5dacbb15a32c43f912a7e66a54aae39d0f9" +SRCREV = "d732aaf9a315415ae8fd7eb11e3a4c1f80e42a48" UPSTREAM_CHECK_COMMITS = "1"
Signature · 1 line
2.37.3