From e0acc0b00b594362e76f938da394c8abef4af9c2 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 31 Aug 2016 11:32:11 +0100 Subject: 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 --- meta/recipes-kernel/lttng/lttng-tools_git.bb | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'meta/recipes-kernel/lttng/lttng-tools_git.bb') 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 () { -- cgit v1.2.3-54-g00ecf