Message ID | 1425663357-22541-4-git-send-email-eeppeliteloop@gmail.com |
---|---|
State | Superseded |
Headers | show |
Dear Philippe Proulx, On Fri, 6 Mar 2015 12:35:53 -0500, Philippe Proulx wrote: > LTTNG_LIBUST_INSTALL_STAGING = YES > LTTNG_LIBUST_DEPENDENCIES = liburcu util-linux > > -ifeq ($(BR2_PACKAGE_PYTHON),y) > -LTTNG_LIBUST_DEPENDENCIES += python > -else ifeq ($(BR2_PACKAGE_PYTHON3),y) > -LTTNG_LIBUST_DEPENDENCIES += python3 > -else > -LTTNG_LIBUST_CONF_ENV = am_cv_pathless_PYTHON="none" > -endif Why? This sort of change should at least be described in the commit log, since it's clearly not a simple mechanical bump to 2.6.0. Thanks, Thomas
On Fri, Mar 6, 2015 at 5:24 PM, Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote: > Dear Philippe Proulx, > > On Fri, 6 Mar 2015 12:35:53 -0500, Philippe Proulx wrote: > > >> LTTNG_LIBUST_INSTALL_STAGING = YES >> LTTNG_LIBUST_DEPENDENCIES = liburcu util-linux >> >> -ifeq ($(BR2_PACKAGE_PYTHON),y) >> -LTTNG_LIBUST_DEPENDENCIES += python >> -else ifeq ($(BR2_PACKAGE_PYTHON3),y) >> -LTTNG_LIBUST_DEPENDENCIES += python3 >> -else >> -LTTNG_LIBUST_CONF_ENV = am_cv_pathless_PYTHON="none" >> -endif > > Why? This sort of change should at least be described in the commit > log, since it's clearly not a simple mechanical bump to 2.6.0. That's actually a mistake. I thought Python was required for tests, but I forgot about a small Python script that's packaged with LTTng-UST, called lttng-gen-tp, which helps create tracepoint providers (C files containing event definitions). I will resubmit without this. Phil > > Thanks, > > Thomas > -- > Thomas Petazzoni, CTO, Free Electrons > Embedded Linux, Kernel and Android engineering > http://free-electrons.com
diff --git a/package/lttng-libust/Config.in b/package/lttng-libust/Config.in index 4583380..0a6abb6 100644 --- a/package/lttng-libust/Config.in +++ b/package/lttng-libust/Config.in @@ -11,7 +11,7 @@ config BR2_PACKAGE_LTTNG_LIBUST depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_58854 # liburcu/gcc-4.8.x bug depends on BR2_TOOLCHAIN_HAS_THREADS help - Userspace tracing library for the Lttng tracing + Userspace tracing library for the LTTng 2.x tracing infrastructure. It allows userspace programs to create custom trace events that are integrated with all other events gathered by LTTng. diff --git a/package/lttng-libust/lttng-libust.hash b/package/lttng-libust/lttng-libust.hash index ac897f3..65db612 100644 --- a/package/lttng-libust/lttng-libust.hash +++ b/package/lttng-libust/lttng-libust.hash @@ -1,6 +1,2 @@ -# From http://lttng.org/files/lttng-ust/lttng-ust-2.6.0-rc1.tar.bz2.sha1 -sha1 8db1627f16f466589c7842822ea4ad2f9d406b02 lttng-ust-2.5.1.tar.bz2 -# From http://lttng.org/files/lttng-ust/lttng-ust-2.6.0-rc1.tar.bz2.md5 -md5 d551d601bdc1a9285e1cd6c5728fb803 lttng-ust-2.5.1.tar.bz2 -# Locally generated -sha256 fbd9e2d78641e5c659f1d51f8097c8279c155ff50f8e38a4c57f188ca4b84546 lttng-ust-2.5.1.tar.bz2 +# http://www.lttng.org/files/lttng-ust/lttng-ust-2.6.0.tar.bz2.sha1 +sha1 774fc2052781ba6fd789d422223c739d5f64482d lttng-ust-2.6.0.tar.bz2 diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk index e6f02ca..0a4f6bf 100644 --- a/package/lttng-libust/lttng-libust.mk +++ b/package/lttng-libust/lttng-libust.mk @@ -5,20 +5,12 @@ ################################################################################ LTTNG_LIBUST_SITE = http://lttng.org/files/lttng-ust -LTTNG_LIBUST_VERSION = 2.5.1 +LTTNG_LIBUST_VERSION = 2.6.0 LTTNG_LIBUST_SOURCE = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2 LTTNG_LIBUST_LICENSE = LGPLv2.1; MIT for system headers; GPLv2 for liblttng-ust-ctl/ustctl.c (used by lttng-sessiond) -LTTNG_LIBUST_LICENSE_FILES = COPYING +LTTNG_LIBUST_LICENSE_FILES = gpl-2.0.txt lgpl-2.1.txt mit-license.txt COPYING LICENSE LTTNG_LIBUST_INSTALL_STAGING = YES LTTNG_LIBUST_DEPENDENCIES = liburcu util-linux -ifeq ($(BR2_PACKAGE_PYTHON),y) -LTTNG_LIBUST_DEPENDENCIES += python -else ifeq ($(BR2_PACKAGE_PYTHON3),y) -LTTNG_LIBUST_DEPENDENCIES += python3 -else -LTTNG_LIBUST_CONF_ENV = am_cv_pathless_PYTHON="none" -endif - $(eval $(autotools-package))
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com> --- package/lttng-libust/Config.in | 2 +- package/lttng-libust/lttng-libust.hash | 8 ++------ package/lttng-libust/lttng-libust.mk | 12 ++---------- 3 files changed, 5 insertions(+), 17 deletions(-)