summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZang Ruochen <zangrc.fnst@cn.fujitsu.com>2020-11-09 13:44:18 +0800
committerKhem Raj <raj.khem@gmail.com>2020-11-09 13:41:02 -0800
commit3866391da463fd20f2f180067067182b3b266f0c (patch)
treea8a5fa53f84768194a046497920fdbbd2a2ea183
parent034d7be384ac9faaf4ed7f2d20e27deb72c0f1a8 (diff)
downloadmeta-openembedded-3866391da463fd20f2f180067067182b3b266f0c.tar.gz
opensaf: upgrade 5.20.05 -> 5.20.08
0001-Add-configure-time-check-for-gettid-API.patch Removed since this is included in 5.20.08 Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-networking/recipes-daemons/opensaf/opensaf/0001-Add-configure-time-check-for-gettid-API.patch67
-rw-r--r--meta-networking/recipes-daemons/opensaf/opensaf_5.20.08.bb (renamed from meta-networking/recipes-daemons/opensaf/opensaf_5.20.05.bb)5
2 files changed, 2 insertions, 70 deletions
diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-Add-configure-time-check-for-gettid-API.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-Add-configure-time-check-for-gettid-API.patch
deleted file mode 100644
index 2b03b1800a..0000000000
--- a/meta-networking/recipes-daemons/opensaf/opensaf/0001-Add-configure-time-check-for-gettid-API.patch
+++ /dev/null
@@ -1,67 +0,0 @@
1From 91c7362834ccd88d1432b3e6c5c51748b72b10ad Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 27 Jul 2019 07:21:16 -0700
4Subject: [PATCH] Add configure time check for gettid API
5
6glibc 2.30 has added syscalls wrapper for gettid
7it should now be checked during configure if C library provides
8this API then do not define local function
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 configure.ac | 4 ++++
13 src/base/logtrace.cc | 3 +++
14 src/osaf/config.h.in | 3 +++
15 3 files changed, 10 insertions(+)
16
17diff --git a/configure.ac b/configure.ac
18index 22ab936..90f3da4 100644
19--- a/configure.ac
20+++ b/configure.ac
21@@ -480,6 +480,10 @@ fi
22
23 AC_SUBST([localstatedir])
24
25+#############################################
26+# Checks for functions.
27+#############################################
28+AC_CHECK_FUNCS([ gettid ])
29
30 #############################################
31 # Checks for programs.
32diff --git a/src/base/logtrace.cc b/src/base/logtrace.cc
33index 8908c1f..fe87e8d 100644
34--- a/src/base/logtrace.cc
35+++ b/src/base/logtrace.cc
36@@ -31,6 +31,7 @@
37 #include "base/logtrace_client.h"
38 #include "base/logtrace_buffer.h"
39 #include "base/ncsgl_defs.h"
40+#include "osaf/config.h"
41
42 namespace global {
43
44@@ -58,7 +59,9 @@ std::once_flag init_flag;
45 thread_local LogTraceBuffer gl_thread_buffer{gl_local_thread_trace,
46 global::thread_trace_buffer_size};
47
48+#ifndef HAVE_GETTID
49 static pid_t gettid() { return syscall(SYS_gettid); }
50+#endif
51
52 /**
53 * USR2 signal handler to enable/disable trace (toggle)
54diff --git a/src/osaf/config.h.in b/src/osaf/config.h.in
55index d1f6d1a..0a3f27d 100644
56--- a/src/osaf/config.h.in
57+++ b/src/osaf/config.h.in
58@@ -18,6 +18,9 @@
59 /* Define if experimental code is enabled */
60 #undef HAVE_EXPERIMENTAL
61
62+/* Define to 1 if you have the `gettid' function. */
63+#undef HAVE_GETTID
64+
65 /* SAHPI_INTERFACE_VERSION == A01 */
66 #undef HAVE_HPI_A01
67
diff --git a/meta-networking/recipes-daemons/opensaf/opensaf_5.20.05.bb b/meta-networking/recipes-daemons/opensaf/opensaf_5.20.08.bb
index bd972e3466..7c7051eff3 100644
--- a/meta-networking/recipes-daemons/opensaf/opensaf_5.20.05.bb
+++ b/meta-networking/recipes-daemons/opensaf/opensaf_5.20.08.bb
@@ -24,13 +24,12 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/releases/${BPN}-${PV}.tar.gz \
24 file://0001-configure-Disable-format-overflow-if-supported-by-gc.patch \ 24 file://0001-configure-Disable-format-overflow-if-supported-by-gc.patch \
25 file://0001-src-Add-missing-header-limits.h-for-_POSIX_HOST_NAME.patch \ 25 file://0001-src-Add-missing-header-limits.h-for-_POSIX_HOST_NAME.patch \
26 file://0001-immpbe_dump.cc-Use-sys-wait.h-instead-of-wait.h.patch \ 26 file://0001-immpbe_dump.cc-Use-sys-wait.h-instead-of-wait.h.patch \
27 file://0001-Add-configure-time-check-for-gettid-API.patch \
28 file://0001-create_empty_library-Use-CC-variable-intead-of-hardc.patch \ 27 file://0001-create_empty_library-Use-CC-variable-intead-of-hardc.patch \
29 file://0001-immom_python-convert-to-python3.patch \ 28 file://0001-immom_python-convert-to-python3.patch \
30 file://0001-Fix-build-with-fno-common.patch \ 29 file://0001-Fix-build-with-fno-common.patch \
31 " 30 "
32SRC_URI[md5sum] = "d56bacf4c234c134e60e9b25f6f26671" 31SRC_URI[md5sum] = "02cfe732d194339237da6adce8e54384"
33SRC_URI[sha256sum] = "2478e298c0bce3b2cfdeb20875022cc11d7d3b53ecd3255422d22eb64c04953b" 32SRC_URI[sha256sum] = "84268b90dc48a6675e5a77e2b20390a04bb59deb48a829102a9dbc4b9ac27483"
34 33
35UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/opensaf/files/releases" 34UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/opensaf/files/releases"
36 35