lttng-tools: bump to version 2.5.0

libxml2 is now necessary

Signed-off-by: Jérôme Pouiller <jezz@sysmic.org>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/lttng-tools/Config.in b/package/lttng-tools/Config.in
index cde9baf1b72b4174c7abb78bead12254f65472c0..ea969a5fa678ed2ca5662288b3a998fccb8883b0 100644 (file)
--- a/package/lttng-tools/Config.in
+++ b/package/lttng-tools/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_LTTNG_TOOLS
        bool "lttng-tools"
        select BR2_PACKAGE_LIBURCU
+       select BR2_PACKAGE_LIBXML2
        select BR2_PACKAGE_POPT
        select BR2_PACKAGE_UTIL_LINUX
        select BR2_PACKAGE_UTIL_LINUX_LIBUUID

diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk
index 8d44600142b6f2085787c83b6637c901d453d7ac..62cc0380d708d39315f54d5cf112baee016d48ae 100644 (file)
--- a/package/lttng-tools/lttng-tools.mk
+++ b/package/lttng-tools/lttng-tools.mk
@@ -4,17 +4,18 @@
 #
 ################################################################################
 
-LTTNG_TOOLS_VERSION = 2.4.1
+LTTNG_TOOLS_VERSION = 2.5.0
 LTTNG_TOOLS_SITE    = http://lttng.org/files/lttng-tools
 LTTNG_TOOLS_SOURCE  = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2
 LTTNG_TOOLS_LICENSE = GPLv2+; LGPLv2.1+ for include/lttng/* and src/lib/lttng-ctl/*
 LTTNG_TOOLS_LICENSE_FILES = gpl-2.0.txt lgpl-2.1.txt LICENSE
+LTTNG_TOOLS_CONF_OPT += --with-xml-prefix=$(STAGING_DIR)/usr
 
 # The host-lttng-babeltrace technically isn't a required build
 # dependency. However, having the babeltrace utilities built for the
 # host is very useful, since those tools allow to convert the binary
 # trace format into an human readable format.
-LTTNG_TOOLS_DEPENDENCIES = liburcu popt host-lttng-babeltrace util-linux
+LTTNG_TOOLS_DEPENDENCIES = liburcu libxml2 popt host-lttng-babeltrace util-linux
 
 LTTNG_AUTORECONF = YES