Skip to contentSkip to conversation

General LTTng packages maintenance

PATCH New Philippe Proulx 3 participants 19 messages Mar 6, 2015 – Mar 7, 2015

lore
Share & tools
lore

Philippe Proulx

author
#0 lore raw

cover General LTTng packages maintenance

This patchset updates the Buildroot packages related to the LTTng project (see <http://lttng.org/>); mostly a bump to the latest stable release version of the toolkit (2.6.0).

Some packages are renamed to keep them more consistent with the official project names.

Philippe Proulx (7):
liburcu: bump to version 0.8.6
lttng-tools: bump to version 2.6.0
lttng-libust: bump to version 2.6.0
lttng-modules: bump to version 2.6.0
lttng-babeltrace: update Config.in's help
lttng-libust: rename package to lttng-ust
lttng-babeltrace: rename package to babeltrace

 package/Config.in                                  |  4 +--
 .../0001-no-posix-fallocate-in-uclibc.patch        |  0
 package/{lttng-babeltrace => babeltrace}/Config.in | 21 +++++++------
 .../babeltrace.hash}                               |  0
 package/babeltrace/babeltrace.mk                   | 16 ++++++++++
 package/liburcu/liburcu.hash                       |  2 ++
 package/liburcu/liburcu.mk                         |  2 +-
 package/lttng-babeltrace/lttng-babeltrace.mk       | 16 ----------
 package/lttng-libust/lttng-libust.hash             |  6 ----
 package/lttng-libust/lttng-libust.mk               | 24 ---------------
 package/lttng-modules/Config.in                    | 34 ++++++++++++++++------
 package/lttng-modules/lttng-modules.hash           |  8 ++---
 package/lttng-modules/lttng-modules.mk             |  2 +-
 package/lttng-tools/Config.in                      |  6 ++--
 package/lttng-tools/lttng-tools.hash               |  2 +-
 package/lttng-tools/lttng-tools.mk                 | 10 +++----
 package/{lttng-libust => lttng-ust}/Config.in      | 10 +++----
 package/lttng-ust/lttng-ust.hash                   |  2 ++
 package/lttng-ust/lttng-ust.mk                     | 16 ++++++++++
 19 files changed, 93 insertions(+), 88 deletions(-)
 rename package/{lttng-babeltrace => babeltrace}/0001-no-posix-fallocate-in-uclibc.patch (100%)
 rename package/{lttng-babeltrace => babeltrace}/Config.in (57%)
 rename package/{lttng-babeltrace/lttng-babeltrace.hash => babeltrace/babeltrace.hash} (100%)
 create mode 100644 package/babeltrace/babeltrace.mk
 create mode 100644 package/liburcu/liburcu.hash
 delete mode 100644 package/lttng-babeltrace/lttng-babeltrace.mk
 delete mode 100644 package/lttng-libust/lttng-libust.hash
 delete mode 100644 package/lttng-libust/lttng-libust.mk
 rename package/{lttng-libust => lttng-ust}/Config.in (78%)
 create mode 100644 package/lttng-ust/lttng-ust.hash
 create mode 100644 package/lttng-ust/lttng-ust.mk

--
2.2.1

author
#1 lore raw

PATCH 1/7 liburcu: bump to version 0.8.6

Signed-off-by Philippe Proulx <[email protected]>
---
 package/liburcu/liburcu.hash | 2 ++
 package/liburcu/liburcu.mk   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 package/liburcu/liburcu.hash
package/liburcu/liburcu.hash new file +2 -0
new file mode 100644
index 0000000..a39daf2
@@ -0,0 +1,2 @@
+# http://www.lttng.org/files/urcu/userspace-rcu-0.8.6.tar.bz2.sha1
+sha1  f10e9bf812557cd0c2a35a277e04010ec278d25d  userspace-rcu-0.8.6.tar.bz2
package/liburcu/liburcu.mk +1 -1
index c48f659..1582d07 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBURCU_VERSION = 0.8.4
+LIBURCU_VERSION = 0.8.6
 LIBURCU_SITE = http://lttng.org/files/urcu
 LIBURCU_SOURCE = userspace-rcu-$(LIBURCU_VERSION).tar.bz2
 LIBURCU_LICENSE = LGPLv2.1+ for the library; MIT-like license for few source files listed in LICENSE; GPLv2+ for test; GPLv3 for few *.m4 files
Signature · 1 line
2.2.1
Applied
#2 lore raw

PATCH 1/7 liburcu: bump to version 0.8.6

Dear Philippe Proulx,

Quoted 6 lines · Philippe Proulx
Signed-off-by Philippe Proulx <[email protected]>
---
 package/liburcu/liburcu.hash | 2 ++
 package/liburcu/liburcu.mk   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 package/liburcu/liburcu.hash

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#3 lore raw

PATCH 2/7 lttng-tools: bump to version 2.6.0

In reply to Philippe Proulx
Signed-off-by Philippe Proulx <[email protected]>
---
 package/lttng-tools/Config.in        | 2 +-
 package/lttng-tools/lttng-tools.hash | 2 +-
 package/lttng-tools/lttng-tools.mk   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
package/lttng-tools/Config.in +1 -1
index ea969a5..a960b21 100644
@@ -13,7 +13,7 @@ config BR2_PACKAGE_LTTNG_TOOLS
 	depends on BR2_USE_WCHAR # util-linux
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
-	  Userspace utilities for the LTTng 2.0 tracing
+	  Userspace utilities for the LTTng 2.x tracing
 	  infrastructure.
 
 	  Those utilities are required on the target system to start
package/lttng-tools/lttng-tools.hash +1 -1
index fc2640e..a356911 100644
@@ -1,2 +1,2 @@
 # Locally generated
-sha256  1f52d342fb5b56a6675748f0b8e8557ec7c4e90732c3d8f5732bd10b920b233d  lttng-tools-2.5.2.tar.bz2
+sha256  128166445126d76da7d9f42a56dec12716732a1ed697a6cfdf40c9e135384f32  lttng-tools-2.6.0.tar.bz2
package/lttng-tools/lttng-tools.mk +1 -1
index 44b6880..e218a95 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LTTNG_TOOLS_VERSION = 2.5.2
+LTTNG_TOOLS_VERSION = 2.6.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/*
Signature · 1 line
2.2.1
Applied
#4 lore raw

PATCH 2/7 lttng-tools: bump to version 2.6.0

Dear Philippe Proulx,

Quoted 6 lines · Philippe Proulx
Signed-off-by Philippe Proulx <[email protected]>
---
 package/lttng-tools/Config.in        | 2 +-
 package/lttng-tools/lttng-tools.hash | 2 +-
 package/lttng-tools/lttng-tools.mk   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#5 lore raw

PATCH 3/7 lttng-libust: bump to version 2.6.0

In reply to Philippe Proulx
Signed-off-by Philippe Proulx <[email protected]>
---
 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(-)
package/lttng-libust/Config.in +1 -1
index 4583380..0a6abb6 100644
@@ -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.
package/lttng-libust/lttng-libust.hash +2 -6
index ac897f3..65db612 100644
@@ -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
package/lttng-libust/lttng-libust.mk +2 -10
index e6f02ca..0a4f6bf 100644
@@ -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))
Signature · 1 line
2.2.1
#6 lore raw

PATCH 3/7 lttng-libust: bump to version 2.6.0

Dear Philippe Proulx,

package/lttng-libust/lttng-libust.mk line 22

Quoted 10 lines · Philippe Proulx

LTTNG_LIBUST_INSTALL_STAGING = YES
LTTNG_LIBUST_DEPENDENCIES = liburcu util-linux

package/lttng-libust/lttng-libust.mk +0 -7
-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

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#7 lore raw

PATCH 3/7 lttng-libust: bump to version 2.6.0

Quoted 8 lines · Thomas Petazzoni

Dear Philippe Proulx,

Quoted 3 lines · Philippe Proulx

LTTNG_LIBUST_INSTALL_STAGING = YES
LTTNG_LIBUST_DEPENDENCIES = liburcu util-linux

Quoted 10 lines

package/lttng-libust/lttng-libust.mk line 22

Quoted 7 lines
package/lttng-libust/lttng-libust.mk +0 -7
-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

Quoted 8 lines

Thanks,

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

author
#8 lore raw

PATCH 4/7 lttng-modules: bump to version 2.6.0

In reply to Philippe Proulx
Signed-off-by Philippe Proulx <[email protected]>
---
 package/lttng-modules/Config.in          | 34 +++++++++++++++++++++++---------
 package/lttng-modules/lttng-modules.hash |  8 ++------
 package/lttng-modules/lttng-modules.mk   |  2 +-
 3 files changed, 28 insertions(+), 16 deletions(-)
package/lttng-modules/Config.in +25 -9
index 8cfa874..e8ba9ba 100644
@@ -2,18 +2,34 @@ config BR2_PACKAGE_LTTNG_MODULES
 	bool "lttng-modules"
 	depends on BR2_LINUX_KERNEL
 	help
-	  Kernel modules for the LTTng 2.0 kernel tracing
+	  Linux kernel modules for the LTTng 2.x kernel tracing
 	  infrastructure.
 
-	  Your kernel must have CONFIG_TRACEPOINTS enabled for this
-	  package to build something useful. You may also want to have
-	  CONFIG_PERF_EVENTS to access perf event counters from
-	  ltt-ng. Note that system call tracing is only available on
-	  architectures that support CONFIG_HAVE_SYSCALL_TRACEPOINTS.
+	  Make sure your target kernel has the following config
+	  options enabled:
 
-	  The packaged version is compatible with kernel 2.6.38,
-	  2.6.39, 3.0 and 3.1.0. See
-	  http://lttng.org/files/bundles/20111214/README.compatible.kernels.txt
+	    * CONFIG_MODULES: loadable module support
+	    * CONFIG_KALLSYMS: this is necessary until the few
+	      required missing symbols are exported to GPL
+	      modules from mainline
+	    * CONFIG_HIGH_RES_TIMERS: needed for LTTng 2.x
+	      clock source
+	    * CONFIG_TRACEPOINTS: kernel tracepoint instrumentation
+	      (enabled as a side-effect of any of the
+	      perf/ftrace/blktrace instrumentation features)
+
+	  The following kernel configuration options will
+	  affect the features available from LTTng:
+
+	    * CONFIG_HAVE_SYSCALL_TRACEPOINTS: system call tracing
+	    * CONFIG_PERF_EVENTS: performance counters
+	    * CONFIG_EVENT_TRACING: needed to allow block layer tracing
+	    * CONFIG_KPROBES: dynamic probes
+	    * CONFIG_KRETPROBES: dynamic function entry/return probes
+	    * CONFIG_KALLSYMS_ALL: state dump of mapping between block
+	      device number and name
+
+	  The packaged version is compatible with Linux 2.6.38 to 3.16.
 
 	  http://lttng.org
package/lttng-modules/lttng-modules.hash +2 -6
index 25dba0c..918b4cf 100644
@@ -1,6 +1,2 @@
-# From http://lttng.org/files/lttng-modules/lttng-modules-2.5.1.tar.bz2.sha1
-sha1   75d9662ed3f8d7c53833663a5d89fe31c015b3ca  lttng-modules-2.5.1.tar.bz2
-# From http://lttng.org/files/lttng-modules/lttng-modules-2.5.1.tar.bz2.md5
-md5    2d99bb7311ba92e82e3b675f0b8dee7d  lttng-modules-2.5.1.tar.bz2
-# Locally generated
-sha256 962238175f0959ac71b97fdde144a3f76a84f63aea6b3645f94da88512bcccdb  lttng-modules-2.5.1.tar.bz2
+# http://www.lttng.org/files/lttng-modules/lttng-modules-2.6.0.tar.bz2.sha1
+sha1  6402ec848e2a75250e04be35f0c49332bf37a388  lttng-modules-2.6.0.tar.bz2
package/lttng-modules/lttng-modules.mk +1 -1
index 02ec202..6833ad2 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LTTNG_MODULES_VERSION = 2.5.1
+LTTNG_MODULES_VERSION = 2.6.0
 LTTNG_MODULES_SITE = http://lttng.org/files/lttng-modules
 LTTNG_MODULES_SOURCE = lttng-modules-$(LTTNG_MODULES_VERSION).tar.bz2
 LTTNG_MODULES_LICENSE = LGPLv2.1/GPLv2 for kernel modules; MIT for lib/bitfield.h and lib/prio_heap/*
Signature · 1 line
2.2.1
Applied
#9 lore raw

PATCH 4/7 lttng-modules: bump to version 2.6.0

Dear Philippe Proulx,

Quoted 6 lines · Philippe Proulx
Signed-off-by Philippe Proulx <[email protected]>
---
 package/lttng-modules/Config.in          | 34 +++++++++++++++++++++++---------
 package/lttng-modules/lttng-modules.hash |  8 ++------
 package/lttng-modules/lttng-modules.mk   |  2 +-
 3 files changed, 28 insertions(+), 16 deletions(-)

Applied, but I have one comment below.

package/lttng-modules/Config.in config BR2_PACKAGE_LTTNG_MODULES · line 19

Quoted 12 lines
package/lttng-modules/Config.in +9 -3
-	  The packaged version is compatible with kernel 2.6.38,
-	  2.6.39, 3.0 and 3.1.0. See
-	  http://lttng.org/files/bundles/20111214/README.compatible.kernels.txt
+	    * CONFIG_MODULES: loadable module support
+	    * CONFIG_KALLSYMS: this is necessary until the few
+	      required missing symbols are exported to GPL
+	      modules from mainline
+	    * CONFIG_HIGH_RES_TIMERS: needed for LTTng 2.x
+	      clock source
+	    * CONFIG_TRACEPOINTS: kernel tracepoint instrumentation
+	      (enabled as a side-effect of any of the
+	      perf/ftrace/blktrace instrumentation features)

If this is actually needed for lttng-modules to build, then what about adding some logic in linux/linux.mk to make sure those options are enabled ?

We already have some logic in linux/linux.mk to enable options for ktap, so why not for lttng-modules ?

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#10 lore raw

PATCH 4/7 lttng-modules: bump to version 2.6.0

Quoted 25 lines · Thomas Petazzoni

Dear Philippe Proulx,

Quoted 6 lines · Philippe Proulx
Signed-off-by Philippe Proulx <[email protected]>
---
 package/lttng-modules/Config.in          | 34 +++++++++++++++++++++++---------
 package/lttng-modules/lttng-modules.hash |  8 ++------
 package/lttng-modules/lttng-modules.mk   |  2 +-
 3 files changed, 28 insertions(+), 16 deletions(-)

Applied, but I have one comment below.

package/lttng-modules/Config.in config BR2_PACKAGE_LTTNG_MODULES · line 19

Quoted 12 lines
package/lttng-modules/Config.in +9 -3
-       The packaged version is compatible with kernel 2.6.38,
-       2.6.39, 3.0 and 3.1.0. See
-       http://lttng.org/files/bundles/20111214/README.compatible.kernels.txt
+         * CONFIG_MODULES: loadable module support
+         * CONFIG_KALLSYMS: this is necessary until the few
+           required missing symbols are exported to GPL
+           modules from mainline
+         * CONFIG_HIGH_RES_TIMERS: needed for LTTng 2.x
+           clock source
+         * CONFIG_TRACEPOINTS: kernel tracepoint instrumentation
+           (enabled as a side-effect of any of the
+           perf/ftrace/blktrace instrumentation features)
Quoted 6 lines

If this is actually needed for lttng-modules to build, then what about adding some logic in linux/linux.mk to make sure those options are enabled ?

We already have some logic in linux/linux.mk to enable options for ktap, so why not for lttng-modules ?

Because, until today, I didn't know about the special cases in linux/linux.mk, so thanks for the tip.

Will submit a patch for this later.

Phil

Quoted 8 lines

Thanks,

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

author
#11 lore raw

PATCH 5/7 lttng-babeltrace: update Config.in's help

In reply to Philippe Proulx
Signed-off-by Philippe Proulx <[email protected]>
---
 package/lttng-babeltrace/Config.in | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
package/lttng-babeltrace/Config.in +9 -6
index 3fe1b3a..c5eb5e0 100644
@@ -9,12 +9,15 @@ config BR2_PACKAGE_LTTNG_BABELTRACE
 	depends on BR2_LARGEFILE # util-linux
 	depends on BR2_UCLIBC_VERSION_SNAPSHOT || BR2_TOOLCHAIN_USES_GLIBC # posix_fallocate
 	help
-	  Babeltrace is part of the LTTng 2.x project.
+	  The Babeltrace project provides trace read and write libraries,
+	  as well as a trace converter application. Plugins can be created
+	  for any trace format to allow its conversion to/from another
+	  trace format.
 
-	  This project provides trace read and write libraries, as
-	  well as a trace converter. A plugin can be created for any
-	  trace format to allow its conversion to/from another trace
-	  format.
+	  Babeltrace is the reference implementation of the Common
+	  Trace Format (see <http://diamon.org/docs/ctf/>). Babeltrace
+	  can decode and display LTTng traces, since the latter
+	  are written using the CTF format.
 
 	  Having this tool on the target is not mandatory. You can
 	  transfer the binary trace output from the target to your

@@ -23,7 +26,7 @@ config BR2_PACKAGE_LTTNG_BABELTRACE
 	  $(O)/host/usr/bin/babeltrace as a dependency of the
 	  lttng-tools package.
 
-	  http://lttng.org
+	  http://www.efficios.com/babeltrace
 
 comment "lttng-babeltrace needs a uclibc snapshot or (e)glib toolchain w/ wchar, threads, largefile"
 	depends on BR2_USE_MMU
Signature · 1 line
2.2.1
Applied
#12 lore raw

PATCH 5/7 lttng-babeltrace: update Config.in's help

Dear Philippe Proulx,

Quoted 4 lines · Philippe Proulx
Signed-off-by Philippe Proulx <[email protected]>
---
 package/lttng-babeltrace/Config.in | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

Applied, but I had to rewrap the text to a shorter length to match the Buildroot "standards".

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#13 lore raw

PATCH 6/7 lttng-libust: rename package to lttng-ust

In reply to Philippe Proulx

LTTng-UST is the official project name, although it contains various shared libraries.

Signed-off-by Philippe Proulx <[email protected]>
---
 package/Config.in                                        |  2 +-
 package/lttng-libust/lttng-libust.mk                     | 16 ----------------
 package/lttng-tools/Config.in                            |  2 +-
 package/lttng-tools/lttng-tools.mk                       |  4 ++--
 package/{lttng-libust => lttng-ust}/Config.in            |  8 ++++----
 .../lttng-libust.hash => lttng-ust/lttng-ust.hash}       |  0
 package/lttng-ust/lttng-ust.mk                           | 16 ++++++++++++++++
 7 files changed, 24 insertions(+), 24 deletions(-)
 delete mode 100644 package/lttng-libust/lttng-libust.mk
 rename package/{lttng-libust => lttng-ust}/Config.in (82%)
 rename package/{lttng-libust/lttng-libust.hash => lttng-ust/lttng-ust.hash} (100%)
 create mode 100644 package/lttng-ust/lttng-ust.mk
package/Config.in +1 -1
index 584887b..ffc8260 100644
@@ -977,7 +977,7 @@ menu "Other"
 	source "package/libuv/Config.in"
 	source "package/lightning/Config.in"
 	source "package/linux-pam/Config.in"
-	source "package/lttng-libust/Config.in"
+	source "package/lttng-ust/Config.in"
 	source "package/mpc/Config.in"
 	source "package/mpdecimal/Config.in"
 	source "package/mpfr/Config.in"
package/lttng-libust/lttng-libust.mk deleted +0 -16
deleted file mode 100644
index 0a4f6bf..0000000
@@ -1,16 +0,0 @@
-################################################################################
-#
-# lttng-libust
-#
-################################################################################
-
-LTTNG_LIBUST_SITE = http://lttng.org/files/lttng-ust
-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 = gpl-2.0.txt lgpl-2.1.txt mit-license.txt COPYING LICENSE
-
-LTTNG_LIBUST_INSTALL_STAGING = YES
-LTTNG_LIBUST_DEPENDENCIES = liburcu util-linux
-
-$(eval $(autotools-package))
package/lttng-tools/Config.in +1 -1
index a960b21..2d3bbf1 100644
@@ -26,7 +26,7 @@ config BR2_PACKAGE_LTTNG_TOOLS
 	  interesting.
 
 	  If userspace tracing is desired, you need to enable
-	  lttng-libust.
+	  lttng-ust.
 
 	  http://lttng.org
package/lttng-tools/lttng-tools.mk +2 -2
index e218a95..675e8eb 100644
@@ -19,9 +19,9 @@ LTTNG_TOOLS_DEPENDENCIES = liburcu libxml2 popt host-lttng-babeltrace util-linux
 
 LTTNG_AUTORECONF = YES
 
-ifeq ($(BR2_PACKAGE_LTTNG_LIBUST),y)
+ifeq ($(BR2_PACKAGE_LTTNG_UST),y)
 LTTNG_TOOLS_CONF_OPTS += --enable-lttng-ust
-LTTNG_TOOLS_DEPENDENCIES += lttng-libust
+LTTNG_TOOLS_DEPENDENCIES += lttng-ust
 else
 LTTNG_TOOLS_CONF_OPTS += --disable-lttng-ust
 endif
package/lttng-ust/Config.in renamed from package/lttng-libust/Config.in +4 -4
similarity index 82%
rename from package/lttng-libust/Config.in
rename to package/lttng-ust/Config.in
index 0a6abb6..7526433 100644
@@ -1,5 +1,5 @@
-config BR2_PACKAGE_LTTNG_LIBUST
-	bool "lttng-libust"
+config BR2_PACKAGE_LTTNG_UST
+	bool "lttng-ust"
 	select BR2_PACKAGE_LIBURCU
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_LIBUUID

@@ -18,10 +18,10 @@ config BR2_PACKAGE_LTTNG_LIBUST
 
 	  http://lttng.org
 
-comment "lttng-libust needs a toolchain w/ wchar, largefile, threads"
+comment "lttng-ust needs a toolchain w/ wchar, largefile, threads"
 	depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_powerpc || BR2_x86_64
 	depends on !BR2_USE_WCHAR || !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
 	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_58854 # liburcu/gcc-4.8.x bug
 
-comment "lttng-libust needs a toolchain not affected by GCC bug 58854"
+comment "lttng-ust needs a toolchain not affected by GCC bug 58854"
 	depends on BR2_TOOLCHAIN_HAS_GCC_BUG_58854
package/lttng-ust/lttng-ust.hash renamed from package/lttng-libust/lttng-libust.hash +0 -0
similarity index 100%
rename from package/lttng-libust/lttng-libust.hash
rename to package/lttng-ust/lttng-ust.hash
package/lttng-ust/lttng-ust.mk new file +16 -0
new file mode 100644
index 0000000..78fb050
@@ -0,0 +1,16 @@
+################################################################################
+#
+# lttng-ust
+#
+################################################################################
+
+LTTNG_UST_SITE = http://lttng.org/files/lttng-ust
+LTTNG_UST_VERSION = 2.6.0
+LTTNG_UST_SOURCE = lttng-ust-$(LTTNG_UST_VERSION).tar.bz2
+LTTNG_UST_LICENSE = LGPLv2.1; MIT for system headers; GPLv2 for liblttng-ust-ctl/ustctl.c (used by lttng-sessiond)
+LTTNG_UST_LICENSE_FILES = gpl-2.0.txt lgpl-2.1.txt mit-license.txt COPYING LICENSE
+
+LTTNG_UST_INSTALL_STAGING = YES
+LTTNG_UST_DEPENDENCIES = liburcu util-linux
+
+$(eval $(autotools-package))
Signature · 1 line
2.2.1
author
#14 lore raw

PATCH 7/7 lttng-babeltrace: rename package to babeltrace

In reply to Philippe Proulx

Although Babeltrace is closely related to the LTTng project because it can decode LTTng's trace format (CTF), Babeltrace aims at being an independent framework for converting traces from one format to another, whatever the tracer is.

Signed-off-by Philippe Proulx <[email protected]>
---
 package/Config.in                                        |  2 +-
 .../0001-no-posix-fallocate-in-uclibc.patch              |  0
 package/{lttng-babeltrace => babeltrace}/Config.in       |  6 +++---
 .../lttng-babeltrace.hash => babeltrace/babeltrace.hash} |  0
 package/babeltrace/babeltrace.mk                         | 16 ++++++++++++++++
 package/lttng-babeltrace/lttng-babeltrace.mk             | 16 ----------------
 package/lttng-tools/Config.in                            |  2 +-
 package/lttng-tools/lttng-tools.mk                       |  4 ++--
 8 files changed, 23 insertions(+), 23 deletions(-)
 rename package/{lttng-babeltrace => babeltrace}/0001-no-posix-fallocate-in-uclibc.patch (100%)
 rename package/{lttng-babeltrace => babeltrace}/Config.in (89%)
 rename package/{lttng-babeltrace/lttng-babeltrace.hash => babeltrace/babeltrace.hash} (100%)
 create mode 100644 package/babeltrace/babeltrace.mk
 delete mode 100644 package/lttng-babeltrace/lttng-babeltrace.mk
package/Config.in +1 -1
index ffc8260..1956430 100644
@@ -77,7 +77,7 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 endif
 	source "package/ltp-testsuite/Config.in"
 	source "package/ltrace/Config.in"
-	source "package/lttng-babeltrace/Config.in"
+	source "package/babeltrace/Config.in"
 	source "package/lttng-modules/Config.in"
 	source "package/lttng-tools/Config.in"
 	source "package/mcelog/Config.in"
package/babeltrace/0001-no-posix-fallocate-in-uclibc.patch renamed from package/lttng-babeltrace/0001-no-posix-fallocate-in-uclibc.patch +0 -0
similarity index 100%
rename from package/lttng-babeltrace/0001-no-posix-fallocate-in-uclibc.patch
rename to package/babeltrace/0001-no-posix-fallocate-in-uclibc.patch
package/babeltrace/Config.in renamed from package/lttng-babeltrace/Config.in +3 -3
similarity index 89%
rename from package/lttng-babeltrace/Config.in
rename to package/babeltrace/Config.in
index c5eb5e0..7fbc677 100644
@@ -1,5 +1,5 @@
-config BR2_PACKAGE_LTTNG_BABELTRACE
-	bool "lttng-babeltrace"
+config BR2_PACKAGE_BABELTRACE
+	bool "babeltrace"
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
 	select BR2_PACKAGE_LIBGLIB2

@@ -28,7 +28,7 @@ config BR2_PACKAGE_LTTNG_BABELTRACE
 
 	  http://www.efficios.com/babeltrace
 
-comment "lttng-babeltrace needs a uclibc snapshot or (e)glib toolchain w/ wchar, threads, largefile"
+comment "babeltrace needs a uclibc snapshot or (e)glib toolchain w/ wchar, threads, largefile"
 	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS \
 		|| !(BR2_UCLIBC_VERSION_SNAPSHOT || BR2_TOOLCHAIN_USES_GLIBC)
package/babeltrace/babeltrace.hash renamed from package/lttng-babeltrace/lttng-babeltrace.hash +0 -0
similarity index 100%
rename from package/lttng-babeltrace/lttng-babeltrace.hash
rename to package/babeltrace/babeltrace.hash
package/babeltrace/babeltrace.mk new file +16 -0
new file mode 100644
index 0000000..7b36df5
@@ -0,0 +1,16 @@
+################################################################################
+#
+# babeltrace
+#
+################################################################################
+
+BABELTRACE_SITE = http://lttng.org/files/babeltrace
+BABELTRACE_VERSION = 1.2.4
+BABELTRACE_SOURCE = babeltrace-$(BABELTRACE_VERSION).tar.bz2
+BABELTRACE_LICENSE = MIT; LGPLv2.1 for include/babeltrace/list.h; GPLv2 for test code
+BABELTRACE_LICENSE_FILES = mit-license.txt gpl-2.0.txt LICENSE
+
+BABELTRACE_DEPENDENCIES = popt util-linux libglib2
+
+$(eval $(autotools-package))
+$(eval $(host-autotools-package))
package/lttng-babeltrace/lttng-babeltrace.mk deleted +0 -16
deleted file mode 100644
index dacb15a..0000000
@@ -1,16 +0,0 @@
-################################################################################
-#
-# lttng-babeltrace
-#
-################################################################################
-
-LTTNG_BABELTRACE_SITE = http://lttng.org/files/babeltrace
-LTTNG_BABELTRACE_VERSION = 1.2.4
-LTTNG_BABELTRACE_SOURCE = babeltrace-$(LTTNG_BABELTRACE_VERSION).tar.bz2
-LTTNG_BABELTRACE_LICENSE = MIT; LGPLv2.1 for include/babeltrace/list.h; GPLv2 for test code
-LTTNG_BABELTRACE_LICENSE_FILES = mit-license.txt gpl-2.0.txt LICENSE
-
-LTTNG_BABELTRACE_DEPENDENCIES = popt util-linux libglib2
-
-$(eval $(autotools-package))
-$(eval $(host-autotools-package))
package/lttng-tools/Config.in +1 -1
index 2d3bbf1..6d15719 100644
@@ -21,7 +21,7 @@ config BR2_PACKAGE_LTTNG_TOOLS
 	  on the host machine using the babeltrace utility. This
 	  utility is automatically built by Buildroot in
 	  $(O)/host/usr/bin/babeltrace, as a dependency of
-	  lttng-tools. However, there is also a lttng-babeltrace
+	  lttng-tools. However, there is also the babeltrace
 	  package for the target, if babeltrace on the target is
 	  interesting.
package/lttng-tools/lttng-tools.mk +2 -2
index 675e8eb..c27d669 100644
@@ -11,11 +11,11 @@ LTTNG_TOOLS_LICENSE = GPLv2+; LGPLv2.1+ for include/lttng/* and src/lib/lttng-ct
 LTTNG_TOOLS_LICENSE_FILES = gpl-2.0.txt lgpl-2.1.txt LICENSE
 LTTNG_TOOLS_CONF_OPTS += --with-xml-prefix=$(STAGING_DIR)/usr
 
-# The host-lttng-babeltrace technically isn't a required build
+# The host-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 libxml2 popt host-lttng-babeltrace util-linux
+LTTNG_TOOLS_DEPENDENCIES = liburcu libxml2 popt host-babeltrace util-linux
 
 LTTNG_AUTORECONF = YES
Signature · 1 line
2.2.1
#15 lore raw

cover General LTTng packages maintenance

In reply to Philippe Proulx

Dear Philippe Proulx,

Quoted 2 lines · Philippe Proulx

lttng-libust: rename package to lttng-ust
lttng-babeltrace: rename package to babeltrace

To be honest, I am not sure about those ones. Renaming packages causes backward compatibility problems (that should be handled by adding the relevant entries in Config.in.legacy, which your patches is not doing), so renaming just for the sake of renaming, I'm not sure.

Since they lack the Config.in.legacy handling, I'll mark your patches as Changes Requested in our patch tracking system. When you'll resubmit them, I'll try to gather the opinion of other Buildroot developers to see what they think.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#16 lore raw

cover General LTTng packages maintenance

Quoted 11 lines · Thomas Petazzoni

Dear Philippe Proulx,

Quoted 2 lines · Philippe Proulx

lttng-libust: rename package to lttng-ust
lttng-babeltrace: rename package to babeltrace

To be honest, I am not sure about those ones. Renaming packages causes backward compatibility problems (that should be handled by adding the relevant entries in Config.in.legacy, which your patches is not doing), so renaming just for the sake of renaming, I'm not sure.

For lttng-libust, I really think it's silly to rename it. Nobody will be
bothered by it.

Babeltrace on the other hand is more defendable. Are there any other packages
that we carry that produces traces that can be read by babeltrace?

Note also that there always has been pushback from Peter against gratuitous
renaming.

Quoted 5 lines

Since they lack the Config.in.legacy handling, I'll mark your patches as Changes Requested in our patch tracking system. When you'll resubmit them, I'll try to gather the opinion of other Buildroot developers to see what they think.

Not only legacy handling, but also alphabetical ordering in package/Config.in.

Regards,
Arnout

Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
#17 lore raw

cover General LTTng packages maintenance

Dear Arnout Vandecappelle,

Quoted 5 lines · Arnout Vandecappelle

For lttng-libust, I really think it's silly to rename it. Nobody will be
bothered by it.

Babeltrace on the other hand is more defendable. Are there any other packages
that we carry that produces traces that can be read by babeltrace?

Not that I am aware of, but Philippe might have some more details about this.

Quoted 2 lines

Note also that there always has been pushback from Peter against gratuitous
renaming.

Yes, which is why I decided to not apply those patches for the moment.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#18 lore raw

cover General LTTng packages maintenance

Quoted 10 lines · Thomas Petazzoni

Dear Arnout Vandecappelle,

Quoted 5 lines · Arnout Vandecappelle

For lttng-libust, I really think it's silly to rename it. Nobody will be
bothered by it.

Babeltrace on the other hand is more defendable. Are there any other packages
that we carry that produces traces that can be read by babeltrace?

Quoted 7 lines

Not that I am aware of, but Philippe might have some more details about this.

Quoted 2 lines

Note also that there always has been pushback from Peter against gratuitous
renaming.

Yes, which is why I decided to not apply those patches for the moment.

I have no strong opinion on this, guys! I renamed those only for them to be more consistent with the upstream project names.

I don't think any application other than LTTng in Buildroot produces traces which can be decoded by Babeltrace, but Babeltrace is still an independent project, reading CTF traces for the moment, also an independent format.

Phil

Quoted 6 lines

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