diff options
author | Zang Ruochen <zangrc.fnst@cn.fujitsu.com> | 2020-11-09 13:44:18 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-11-09 13:41:02 -0800 |
commit | 3866391da463fd20f2f180067067182b3b266f0c (patch) | |
tree | a8a5fa53f84768194a046497920fdbbd2a2ea183 /meta-networking/recipes-daemons | |
parent | 034d7be384ac9faaf4ed7f2d20e27deb72c0f1a8 (diff) | |
download | meta-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>
Diffstat (limited to 'meta-networking/recipes-daemons')
-rw-r--r-- | meta-networking/recipes-daemons/opensaf/opensaf/0001-Add-configure-time-check-for-gettid-API.patch | 67 | ||||
-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 @@ -From 91c7362834ccd88d1432b3e6c5c51748b72b10ad Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 27 Jul 2019 07:21:16 -0700 -Subject: [PATCH] Add configure time check for gettid API - -glibc 2.30 has added syscalls wrapper for gettid -it should now be checked during configure if C library provides -this API then do not define local function - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - configure.ac | 4 ++++ - src/base/logtrace.cc | 3 +++ - src/osaf/config.h.in | 3 +++ - 3 files changed, 10 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 22ab936..90f3da4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -480,6 +480,10 @@ fi - - AC_SUBST([localstatedir]) - -+############################################# -+# Checks for functions. -+############################################# -+AC_CHECK_FUNCS([ gettid ]) - - ############################################# - # Checks for programs. -diff --git a/src/base/logtrace.cc b/src/base/logtrace.cc -index 8908c1f..fe87e8d 100644 ---- a/src/base/logtrace.cc -+++ b/src/base/logtrace.cc -@@ -31,6 +31,7 @@ - #include "base/logtrace_client.h" - #include "base/logtrace_buffer.h" - #include "base/ncsgl_defs.h" -+#include "osaf/config.h" - - namespace global { - -@@ -58,7 +59,9 @@ std::once_flag init_flag; - thread_local LogTraceBuffer gl_thread_buffer{gl_local_thread_trace, - global::thread_trace_buffer_size}; - -+#ifndef HAVE_GETTID - static pid_t gettid() { return syscall(SYS_gettid); } -+#endif - - /** - * USR2 signal handler to enable/disable trace (toggle) -diff --git a/src/osaf/config.h.in b/src/osaf/config.h.in -index d1f6d1a..0a3f27d 100644 ---- a/src/osaf/config.h.in -+++ b/src/osaf/config.h.in -@@ -18,6 +18,9 @@ - /* Define if experimental code is enabled */ - #undef HAVE_EXPERIMENTAL - -+/* Define to 1 if you have the `gettid' function. */ -+#undef HAVE_GETTID -+ - /* SAHPI_INTERFACE_VERSION == A01 */ - #undef HAVE_HPI_A01 - 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 \ file://0001-configure-Disable-format-overflow-if-supported-by-gc.patch \ file://0001-src-Add-missing-header-limits.h-for-_POSIX_HOST_NAME.patch \ file://0001-immpbe_dump.cc-Use-sys-wait.h-instead-of-wait.h.patch \ - file://0001-Add-configure-time-check-for-gettid-API.patch \ file://0001-create_empty_library-Use-CC-variable-intead-of-hardc.patch \ file://0001-immom_python-convert-to-python3.patch \ file://0001-Fix-build-with-fno-common.patch \ " -SRC_URI[md5sum] = "d56bacf4c234c134e60e9b25f6f26671" -SRC_URI[sha256sum] = "2478e298c0bce3b2cfdeb20875022cc11d7d3b53ecd3255422d22eb64c04953b" +SRC_URI[md5sum] = "02cfe732d194339237da6adce8e54384" +SRC_URI[sha256sum] = "84268b90dc48a6675e5a77e2b20390a04bb59deb48a829102a9dbc4b9ac27483" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/opensaf/files/releases" |