diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-31 11:32:11 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-03 09:58:39 +0100 |
commit | e0acc0b00b594362e76f938da394c8abef4af9c2 (patch) | |
tree | 6a881d51951b534e8db60e95aee872743d4bc582 /meta/recipes-kernel/lttng/lttng-tools_git.bb | |
parent | 8f0ca9c0e301fc0ff5ddeffe5d9bde0d3c6acaed (diff) | |
download | poky-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>
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-tools_git.bb')
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-tools_git.bb | 11 |
1 files changed, 5 insertions, 6 deletions
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" | |||
13 | RDEPENDS_${PN} = "libgcc" | 13 | RDEPENDS_${PN} = "libgcc" |
14 | RDEPENDS_${PN}-ptest += "make perl bash" | 14 | RDEPENDS_${PN}-ptest += "make perl bash" |
15 | 15 | ||
16 | SRCREV = "a90f2c1e10b759782653a81815625e9d1bbb75ca" | 16 | SRCREV = "d11e0dba0df9024b8613c51e167a379b91e8b20b" |
17 | PV = "2.7.1+git${SRCPV}" | 17 | PV = "2.8.1+git${SRCPV}" |
18 | 18 | ||
19 | PYTHON_OPTION = "am_cv_python_pyexecdir='${PYTHON_SITEPACKAGES_DIR}' \ | 19 | PYTHON_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 | " |
23 | PACKAGECONFIG ??= "lttng-ust" | 23 | PACKAGECONFIG ??= "lttng-ust" |
24 | PACKAGECONFIG[python] = "--enable-python-bindings ${PYTHON_OPTION},,python3 swig-native" | 24 | PACKAGECONFIG[python] = "--enable-python-bindings ${PYTHON_OPTION},,python3 swig-native" |
25 | PACKAGECONFIG[lttng-ust] = "--enable-lttng-ust, --disable-lttng-ust, lttng-ust" | 25 | PACKAGECONFIG[lttng-ust] = "--with-lttng-ust, --without-lttng-ust, lttng-ust" |
26 | PACKAGECONFIG[kmod] = "--enable-kmod, --disable-kmod, kmod" | 26 | PACKAGECONFIG[kmod] = "--enable-kmod, --disable-kmod, kmod" |
27 | PACKAGECONFIG_remove_libc-musl = "lttng-ust" | 27 | PACKAGECONFIG_remove_libc-musl = "lttng-ust" |
28 | 28 | ||
29 | SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.7 \ | 29 | SRC_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 | ||
52 | do_configure_prepend () { | 51 | do_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 | ||
57 | do_install_ptest () { | 56 | do_install_ptest () { |