[Buildroot] [PATCH v2] lttng-libust: bump to version 2.6.0

[Buildroot] [PATCH v2] lttng-libust: bump to version 2.6.0

[Philippe Proulx]

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
---
Changes v1 -> v2:
  - keep Python check for lttng-gen-ust script

 package/lttng-libust/Config.in         | 2 +-
 package/lttng-libust/lttng-libust.hash | 8 ++------
 package/lttng-libust/lttng-libust.mk   | 4 ++--
 3 files changed, 5 insertions(+), 9 deletions(-)

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..5c8505f 100644
--- a/package/lttng-libust/lttng-libust.mk
+++ b/package/lttng-libust/lttng-libust.mk
@@ -5,10 +5,10 @@
 ################################################################################

 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
--
2.2.1

[Buildroot] [PATCH v2] lttng-libust: bump to version 2.6.0

[Thomas Petazzoni]

Dear Philippe Proulx,

On Fri,  6 Mar 2015 19:48:13 -0500, Philippe Proulx wrote:

> -LTTNG_LIBUST_LICENSE_FILES = COPYING
> +LTTNG_LIBUST_LICENSE_FILES = gpl-2.0.txt lgpl-2.1.txt mit-license.txt COPYING LICENSE

Did you actually test this change by running "make legal-info" ? I had
a look at the lttng-libust tarball, and there are no files named
gpl-2.0.txt and so on, only a 'COPYING' file. So I believe this
variable shouldn't be changed.

I've applied your patch after fixing this.

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH v2] lttng-libust: bump to version 2.6.0

[Philippe Proulx]

On Sat, Mar 7, 2015 at 5:08 AM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Dear Philippe Proulx,
>
> On Fri,  6 Mar 2015 19:48:13 -0500, Philippe Proulx wrote:
>
>> -LTTNG_LIBUST_LICENSE_FILES = COPYING
>> +LTTNG_LIBUST_LICENSE_FILES = gpl-2.0.txt lgpl-2.1.txt mit-license.txt COPYING LICENSE
>
> Did you actually test this change by running "make legal-info" ? I had
> a look at the lttng-libust tarball, and there are no files named
> gpl-2.0.txt and so on, only a 'COPYING' file. So I believe this
> variable shouldn't be changed.

Err, sorry. I looked at the Git tree for license files, but it looks
like they're not packaged.

Phil

>
> I've applied your patch after fixing this.
>
> Thanks,
>
> Thomas
> --
> Thomas Petazzoni, CTO, Free Electrons
> Embedded Linux, Kernel and Android engineering
> http://free-electrons.com