summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-31 11:32:11 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-03 09:58:39 +0100
commite0acc0b00b594362e76f938da394c8abef4af9c2 (patch)
tree6a881d51951b534e8db60e95aee872743d4bc582
parent8f0ca9c0e301fc0ff5ddeffe5d9bde0d3c6acaed (diff)
downloadpoky-e0acc0b00b594362e76f938da394c8abef4af9c2.tar.gz
lttng-tools: Update 2.7.1 -> 2.8.1
Drop backported patch. Update ust configure option. Update location of xml m4 file. (From OE-Core rev: ea0375c5a38a761d296f5e20c95450c2df90fe39) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools/stop-using-SIGUNUSED.patch51
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools_git.bb11
2 files changed, 5 insertions, 57 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-tools/stop-using-SIGUNUSED.patch b/meta/recipes-kernel/lttng/lttng-tools/stop-using-SIGUNUSED.patch
deleted file mode 100644
index bd4f7d1d1b..0000000000
--- a/meta/recipes-kernel/lttng/lttng-tools/stop-using-SIGUNUSED.patch
+++ /dev/null
@@ -1,51 +0,0 @@
1From 1f54181c2df1fb92c3323a6dbf8273fb66b883b6 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Galarneau?=
3 <jeremie.galarneau@efficios.com>
4Date: Sat, 17 Oct 2015 19:41:47 -0400
5Subject: [PATCH] Port: Don't use SIGUNUSED which is not defined on Solaris
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9Organization: O.S. Systems Software LTDA.
10
11Upstream-Status: Backport [2.8.0]
12
13Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
14---
15 src/common/runas.c | 18 +++++-------------
16 1 file changed, 5 insertions(+), 13 deletions(-)
17
18diff --git a/src/common/runas.c b/src/common/runas.c
19index 57f7382..0825470 100644
20--- a/src/common/runas.c
21+++ b/src/common/runas.c
22@@ -530,21 +530,13 @@ int run_as_rmdir_recursive(const char *path, uid_t uid, gid_t gid)
23 static
24 int reset_sighandler(void)
25 {
26- int sig, ret = 0;
27+ int sig;
28
29- for (sig = SIGHUP; sig <= SIGUNUSED; sig++) {
30- /* Skip unblockable signals. */
31- if (sig == SIGKILL || sig == SIGSTOP) {
32- continue;
33- }
34- if (signal(sig, SIG_DFL) == SIG_ERR) {
35- PERROR("reset signal %d", sig);
36- ret = -1;
37- goto end;
38- }
39+ DBG("Resetting run_as worker signal handlers to default");
40+ for (sig = 1; sig <= 31; sig++) {
41+ (void) signal(sig, SIG_DFL);
42 }
43-end:
44- return ret;
45+ return 0;
46 }
47
48 static
49--
502.6.2
51
diff --git a/meta/recipes-kernel/lttng/lttng-tools_git.bb b/meta/recipes-kernel/lttng/lttng-tools_git.bb
index fe1e2a3167..e2f30325ff 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_git.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_git.bb
@@ -13,8 +13,8 @@ DEPENDS = "liburcu popt libxml2"
13RDEPENDS_${PN} = "libgcc" 13RDEPENDS_${PN} = "libgcc"
14RDEPENDS_${PN}-ptest += "make perl bash" 14RDEPENDS_${PN}-ptest += "make perl bash"
15 15
16SRCREV = "a90f2c1e10b759782653a81815625e9d1bbb75ca" 16SRCREV = "d11e0dba0df9024b8613c51e167a379b91e8b20b"
17PV = "2.7.1+git${SRCPV}" 17PV = "2.8.1+git${SRCPV}"
18 18
19PYTHON_OPTION = "am_cv_python_pyexecdir='${PYTHON_SITEPACKAGES_DIR}' \ 19PYTHON_OPTION = "am_cv_python_pyexecdir='${PYTHON_SITEPACKAGES_DIR}' \
20 am_cv_python_pythondir='${PYTHON_SITEPACKAGES_DIR}' \ 20 am_cv_python_pythondir='${PYTHON_SITEPACKAGES_DIR}' \
@@ -22,12 +22,11 @@ PYTHON_OPTION = "am_cv_python_pyexecdir='${PYTHON_SITEPACKAGES_DIR}' \
22" 22"
23PACKAGECONFIG ??= "lttng-ust" 23PACKAGECONFIG ??= "lttng-ust"
24PACKAGECONFIG[python] = "--enable-python-bindings ${PYTHON_OPTION},,python3 swig-native" 24PACKAGECONFIG[python] = "--enable-python-bindings ${PYTHON_OPTION},,python3 swig-native"
25PACKAGECONFIG[lttng-ust] = "--enable-lttng-ust, --disable-lttng-ust, lttng-ust" 25PACKAGECONFIG[lttng-ust] = "--with-lttng-ust, --without-lttng-ust, lttng-ust"
26PACKAGECONFIG[kmod] = "--enable-kmod, --disable-kmod, kmod" 26PACKAGECONFIG[kmod] = "--enable-kmod, --disable-kmod, kmod"
27PACKAGECONFIG_remove_libc-musl = "lttng-ust" 27PACKAGECONFIG_remove_libc-musl = "lttng-ust"
28 28
29SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.7 \ 29SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.8 \
30 file://stop-using-SIGUNUSED.patch \
31 file://runtest-2.4.0.patch \ 30 file://runtest-2.4.0.patch \
32 file://run-ptest" 31 file://run-ptest"
33 32
@@ -51,7 +50,7 @@ INSANE_SKIP_${PN}-dbg = "libexec"
51 50
52do_configure_prepend () { 51do_configure_prepend () {
53 # Delete a shipped m4 file that overrides our patched one 52 # Delete a shipped m4 file that overrides our patched one
54 rm -f ${S}/config/libxml.m4 53 rm -f ${S}/m4/libxml.m4
55} 54}
56 55
57do_install_ptest () { 56do_install_ptest () {