diff options
| -rw-r--r-- | meta/recipes-kernel/lttng/lttng-tools/stop-using-SIGUNUSED.patch | 51 | ||||
| -rw-r--r-- | meta/recipes-kernel/lttng/lttng-tools_git.bb | 11 |
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 @@ -From 1f54181c2df1fb92c3323a6dbf8273fb66b883b6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Galarneau?= - <jeremie.galarneau@efficios.com> -Date: Sat, 17 Oct 2015 19:41:47 -0400 -Subject: [PATCH] Port: Don't use SIGUNUSED which is not defined on Solaris -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Organization: O.S. Systems Software LTDA. - -Upstream-Status: Backport [2.8.0] - -Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com> ---- - src/common/runas.c | 18 +++++------------- - 1 file changed, 5 insertions(+), 13 deletions(-) - -diff --git a/src/common/runas.c b/src/common/runas.c -index 57f7382..0825470 100644 ---- a/src/common/runas.c -+++ b/src/common/runas.c -@@ -530,21 +530,13 @@ int run_as_rmdir_recursive(const char *path, uid_t uid, gid_t gid) - static - int reset_sighandler(void) - { -- int sig, ret = 0; -+ int sig; - -- for (sig = SIGHUP; sig <= SIGUNUSED; sig++) { -- /* Skip unblockable signals. */ -- if (sig == SIGKILL || sig == SIGSTOP) { -- continue; -- } -- if (signal(sig, SIG_DFL) == SIG_ERR) { -- PERROR("reset signal %d", sig); -- ret = -1; -- goto end; -- } -+ DBG("Resetting run_as worker signal handlers to default"); -+ for (sig = 1; sig <= 31; sig++) { -+ (void) signal(sig, SIG_DFL); - } --end: -- return ret; -+ return 0; - } - - static --- -2.6.2 - 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" RDEPENDS_${PN} = "libgcc" RDEPENDS_${PN}-ptest += "make perl bash" -SRCREV = "a90f2c1e10b759782653a81815625e9d1bbb75ca" -PV = "2.7.1+git${SRCPV}" +SRCREV = "d11e0dba0df9024b8613c51e167a379b91e8b20b" +PV = "2.8.1+git${SRCPV}" PYTHON_OPTION = "am_cv_python_pyexecdir='${PYTHON_SITEPACKAGES_DIR}' \ am_cv_python_pythondir='${PYTHON_SITEPACKAGES_DIR}' \ @@ -22,12 +22,11 @@ PYTHON_OPTION = "am_cv_python_pyexecdir='${PYTHON_SITEPACKAGES_DIR}' \ " PACKAGECONFIG ??= "lttng-ust" PACKAGECONFIG[python] = "--enable-python-bindings ${PYTHON_OPTION},,python3 swig-native" -PACKAGECONFIG[lttng-ust] = "--enable-lttng-ust, --disable-lttng-ust, lttng-ust" +PACKAGECONFIG[lttng-ust] = "--with-lttng-ust, --without-lttng-ust, lttng-ust" PACKAGECONFIG[kmod] = "--enable-kmod, --disable-kmod, kmod" PACKAGECONFIG_remove_libc-musl = "lttng-ust" -SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.7 \ - file://stop-using-SIGUNUSED.patch \ +SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.8 \ file://runtest-2.4.0.patch \ file://run-ptest" @@ -51,7 +50,7 @@ INSANE_SKIP_${PN}-dbg = "libexec" do_configure_prepend () { # Delete a shipped m4 file that overrides our patched one - rm -f ${S}/config/libxml.m4 + rm -f ${S}/m4/libxml.m4 } do_install_ptest () { |