* [Buildroot] [PATCH 2/4] package/lttng-libust: bump version to 2.12.0
2020-06-26 22:05 [Buildroot] [PATCH 1/4] package/liburcu: bump version to 0.12.1 Norbert Lange
@ 2020-06-26 22:06 ` Norbert Lange
2020-06-27 14:45 ` Thomas Petazzoni
2020-06-26 22:06 ` [Buildroot] [PATCH 3/4] package/lttng-tools: bump version to 2.12.1 Norbert Lange
` (2 subsequent siblings)
3 siblings, 1 reply; 9+ messages in thread
From: Norbert Lange @ 2020-06-26 22:06 UTC (permalink / raw)
To: buildroot
Also update hash file formatting (2 spaces).
Signed-off-by: Norbert Lange <nolange79@gmail.com>
---
package/lttng-libust/lttng-libust.hash | 6 +++---
package/lttng-libust/lttng-libust.mk | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/package/lttng-libust/lttng-libust.hash b/package/lttng-libust/lttng-libust.hash
index 85e1acc261..62a65897f4 100644
--- a/package/lttng-libust/lttng-libust.hash
+++ b/package/lttng-libust/lttng-libust.hash
@@ -1,5 +1,5 @@
-# From https://lttng.org/files/lttng-ust/lttng-ust-2.11.0.tar.bz2.sha256
-sha256 683280cfe5e12021e64c32cef9eeb0128f1f23dec32ba28adb5a2074be37c4d8 lttng-ust-2.11.0.tar.bz2
+# From https://lttng.org/files/lttng-ust/lttng-ust-2.12.0.tar.bz2.sha256
+sha256 1983edb525f3f27e3494088d8d5389b4c71af66bbfe63c6f1df2ad95aa44a528 lttng-ust-2.12.0.tar.bz2
# Hash for license file
-sha256 74125a84c2166300776980166e29de40d5f98d1a75e487f0bbc0c03b4cd2342e COPYING
+sha256 74125a84c2166300776980166e29de40d5f98d1a75e487f0bbc0c03b4cd2342e COPYING
diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk
index 0c2fdb57ef..8e6537690b 100644
--- a/package/lttng-libust/lttng-libust.mk
+++ b/package/lttng-libust/lttng-libust.mk
@@ -5,7 +5,7 @@
################################################################################
LTTNG_LIBUST_SITE = http://lttng.org/files/lttng-ust
-LTTNG_LIBUST_VERSION = 2.11.0
+LTTNG_LIBUST_VERSION = 2.12.0
LTTNG_LIBUST_SOURCE = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2
LTTNG_LIBUST_LICENSE = LGPL-2.1, MIT (system headers), GPL-2.0 (liblttng-ust-ctl/ustctl.c used by lttng-sessiond)
LTTNG_LIBUST_LICENSE_FILES = COPYING
--
2.27.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* [Buildroot] [PATCH 3/4] package/lttng-tools: bump version to 2.12.1
2020-06-26 22:05 [Buildroot] [PATCH 1/4] package/liburcu: bump version to 0.12.1 Norbert Lange
2020-06-26 22:06 ` [Buildroot] [PATCH 2/4] package/lttng-libust: bump version to 2.12.0 Norbert Lange
@ 2020-06-26 22:06 ` Norbert Lange
2020-06-27 14:45 ` Thomas Petazzoni
2020-06-26 22:06 ` [Buildroot] [PATCH 4/4] package/lttng-{libust, tools}: use proper systemd rundir Norbert Lange
2020-06-27 14:45 ` [Buildroot] [PATCH 1/4] package/liburcu: bump version to 0.12.1 Thomas Petazzoni
3 siblings, 1 reply; 9+ messages in thread
From: Norbert Lange @ 2020-06-26 22:06 UTC (permalink / raw)
To: buildroot
Also update hash file formatting (2 spaces).
License files got moved into a subfolder,
use those new paths.
Also the package is (L)GPL only, so remove the
"or higher".
Signed-off-by: Norbert Lange <nolange79@gmail.com>
---
package/lttng-tools/lttng-tools.hash | 14 +++++++++-----
package/lttng-tools/lttng-tools.mk | 6 +++---
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/package/lttng-tools/lttng-tools.hash b/package/lttng-tools/lttng-tools.hash
index f5f9fdbbdc..a27b419e75 100644
--- a/package/lttng-tools/lttng-tools.hash
+++ b/package/lttng-tools/lttng-tools.hash
@@ -1,6 +1,10 @@
-# From https://lttng.org/files/lttng-tools/lttng-tools-2.11.0.tar.bz2.sha256
-sha256 dce493c82db673c96049b5fad155a760fa449fab3d92467a69fcb0ddaf3f0fbc lttng-tools-2.11.0.tar.bz2
+# From https://lttng.org/files/lttng-tools/lttng-tools-2.12.1.tar.bz2.sha256
+sha256 0de7afc1f40a5acbede933cdfd6cf47b32ff84d02e170a1321f7fc86141585b8 lttng-tools-2.12.1.tar.bz2
+
# Locally computed
-sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 gpl-2.0.txt
-sha256 051be1f11b508ef7bb839994f6b58be19a827c56bd9bddfe36d77d3d4be55abe lgpl-2.1.txt
-sha256 f07515677547da5f3ee2396bdf491affc1accd5e4765a5378b6e1e98392fd5e7 LICENSE
+sha256 068e55c7dbe597400199aee75ac5e71bdb2ca88c4c9a4cfa8e1fbc61f933eda5 LICENSE
+sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd LICENSES/BSD-2-Clause
+sha256 7a83b1aeb460458db9a4bd521d7f237c45b1650f6e60ea5ffc71e49472454de3 LICENSES/BSD-3-Clause
+sha256 6841c85b94f9dab319356e3aaf9e969fcedad51d3aaadf665bf86f34f4186b62 LICENSES/GPL-2.0
+sha256 d72921266bc8452a8789f8a04a82755373990d00b7e0b0f1a8edb8f854e94d1c LICENSES/LGPL-2.1
+sha256 323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f LICENSES/MIT
diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk
index f85f6bcbce..b1b0a24a4f 100644
--- a/package/lttng-tools/lttng-tools.mk
+++ b/package/lttng-tools/lttng-tools.mk
@@ -4,12 +4,12 @@
#
################################################################################
-LTTNG_TOOLS_VERSION = 2.11.0
+LTTNG_TOOLS_VERSION = 2.12.1
LTTNG_TOOLS_SITE = https://lttng.org/files/lttng-tools
LTTNG_TOOLS_SOURCE = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2
LTTNG_TOOLS_INSTALL_STAGING = YES
-LTTNG_TOOLS_LICENSE = GPL-2.0+, LGPL-2.1+ (include/lttng/*, src/lib/lttng-ctl/*)
-LTTNG_TOOLS_LICENSE_FILES = gpl-2.0.txt lgpl-2.1.txt LICENSE
+LTTNG_TOOLS_LICENSE = GPL-2.0, LGPL-2.1 (include/lttng/*, src/lib/lttng-ctl/*)
+LTTNG_TOOLS_LICENSE_FILES = LICENSE $(addprefix LICENSES/,BSD-2-Clause BSD-3-Clause GPL-2.0 LGPL-2.1 MIT)
LTTNG_TOOLS_CONF_OPTS += --disable-man-pages
LTTNG_TOOLS_DEPENDENCIES = liburcu libxml2 popt util-linux
--
2.27.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* [Buildroot] [PATCH 4/4] package/lttng-{libust, tools}: use proper systemd rundir
2020-06-26 22:05 [Buildroot] [PATCH 1/4] package/liburcu: bump version to 0.12.1 Norbert Lange
2020-06-26 22:06 ` [Buildroot] [PATCH 2/4] package/lttng-libust: bump version to 2.12.0 Norbert Lange
2020-06-26 22:06 ` [Buildroot] [PATCH 3/4] package/lttng-tools: bump version to 2.12.1 Norbert Lange
@ 2020-06-26 22:06 ` Norbert Lange
2020-06-27 14:46 ` Thomas Petazzoni
2020-06-27 14:45 ` [Buildroot] [PATCH 1/4] package/liburcu: bump version to 0.12.1 Thomas Petazzoni
3 siblings, 1 reply; 9+ messages in thread
From: Norbert Lange @ 2020-06-26 22:06 UTC (permalink / raw)
To: buildroot
Set the rundir to /run/lttng, if systemd is the init system.
/var/run is "legacy" in systemd's view.
Perhaps a better way would be to define a variable
BR2_PACKAGE_RUNDIR to /var/run or /run depending on ini system.
(systemd will for example issue warnings for the dbus service,
using a socket in /var/run)
Signed-off-by: Norbert Lange <nolange79@gmail.com>
---
package/lttng-libust/lttng-libust.mk | 4 ++++
package/lttng-tools/lttng-tools.mk | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk
index 8e6537690b..f3c660c56f 100644
--- a/package/lttng-libust/lttng-libust.mk
+++ b/package/lttng-libust/lttng-libust.mk
@@ -13,6 +13,10 @@ LTTNG_LIBUST_INSTALL_STAGING = YES
LTTNG_LIBUST_DEPENDENCIES = liburcu util-linux
LTTNG_LIBUST_CONF_OPTS += --disable-man-pages --disable-examples
+ifeq ($(BR2_INIT_SYSTEMD),y)
+LTTNG_LIBUST_CONF_OPTS += --with-lttng-system-rundir=/run/lttng
+endif
+
ifeq ($(BR2_PACKAGE_PYTHON),y)
LTTNG_LIBUST_DEPENDENCIES += python
LTTNG_LIBUST_CONF_OPTS += --enable-python-agent
diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk
index b1b0a24a4f..0f3dc84ebd 100644
--- a/package/lttng-tools/lttng-tools.mk
+++ b/package/lttng-tools/lttng-tools.mk
@@ -13,6 +13,10 @@ LTTNG_TOOLS_LICENSE_FILES = LICENSE $(addprefix LICENSES/,BSD-2-Clause BSD-3-Cla
LTTNG_TOOLS_CONF_OPTS += --disable-man-pages
LTTNG_TOOLS_DEPENDENCIES = liburcu libxml2 popt util-linux
+ifeq ($(BR2_INIT_SYSTEMD),y)
+LTTNG_LIBUST_CONF_OPTS += --with-lttng-system-rundir=/run/lttng
+endif
+
ifeq ($(BR2_PACKAGE_LTTNG_LIBUST),y)
LTTNG_TOOLS_CONF_OPTS += --with-lttng-ust
LTTNG_TOOLS_DEPENDENCIES += lttng-libust
--
2.27.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* [Buildroot] [PATCH 4/4] package/lttng-{libust, tools}: use proper systemd rundir
2020-06-26 22:06 ` [Buildroot] [PATCH 4/4] package/lttng-{libust, tools}: use proper systemd rundir Norbert Lange
@ 2020-06-27 14:46 ` Thomas Petazzoni
2020-06-27 19:32 ` Norbert Lange
0 siblings, 1 reply; 9+ messages in thread
From: Thomas Petazzoni @ 2020-06-27 14:46 UTC (permalink / raw)
To: buildroot
On Sat, 27 Jun 2020 00:06:02 +0200
Norbert Lange <nolange79@gmail.com> wrote:
> Set the rundir to /run/lttng, if systemd is the init system.
> /var/run is "legacy" in systemd's view.
>
> Perhaps a better way would be to define a variable
> BR2_PACKAGE_RUNDIR to /var/run or /run depending on ini system.
> (systemd will for example issue warnings for the dbus service,
> using a socket in /var/run)
I've dropped this paragraph, since it doesn't really belong in the
commit message itself.
Is there a reason to still use /var/run in non-systemd systems ?
> ifeq ($(BR2_PACKAGE_PYTHON),y)
> LTTNG_LIBUST_DEPENDENCIES += python
> LTTNG_LIBUST_CONF_OPTS += --enable-python-agent
> diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk
> index b1b0a24a4f..0f3dc84ebd 100644
> --- a/package/lttng-tools/lttng-tools.mk
> +++ b/package/lttng-tools/lttng-tools.mk
> @@ -13,6 +13,10 @@ LTTNG_TOOLS_LICENSE_FILES = LICENSE $(addprefix LICENSES/,BSD-2-Clause BSD-3-Cla
> LTTNG_TOOLS_CONF_OPTS += --disable-man-pages
> LTTNG_TOOLS_DEPENDENCIES = liburcu libxml2 popt util-linux
>
> +ifeq ($(BR2_INIT_SYSTEMD),y)
> +LTTNG_LIBUST_CONF_OPTS += --with-lttng-system-rundir=/run/lttng
You're using LTTNG_LIBUST_CONF_OPTS, but it should have been
LTTNG_TOOLS_CONF_OPTS.
I fixed that when applying. Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 9+ messages in thread* [Buildroot] [PATCH 4/4] package/lttng-{libust, tools}: use proper systemd rundir
2020-06-27 14:46 ` Thomas Petazzoni
@ 2020-06-27 19:32 ` Norbert Lange
0 siblings, 0 replies; 9+ messages in thread
From: Norbert Lange @ 2020-06-27 19:32 UTC (permalink / raw)
To: buildroot
Thomas Petazzoni <thomas.petazzoni@bootlin.com> schrieb am Sa., 27. Juni
2020, 16:46:
> On Sat, 27 Jun 2020 00:06:02 +0200
> Norbert Lange <nolange79@gmail.com> wrote:
>
> > Set the rundir to /run/lttng, if systemd is the init system.
> > /var/run is "legacy" in systemd's view.
> >
> > Perhaps a better way would be to define a variable
> > BR2_PACKAGE_RUNDIR to /var/run or /run depending on ini system.
> > (systemd will for example issue warnings for the dbus service,
> > using a socket in /var/run)
>
> I've dropped this paragraph, since it doesn't really belong in the
> commit message itself.
>
> Is there a reason to still use /var/run in non-systemd systems ?
>
Not that i know of, it is still the default in packages, but I believe this
it paranoid compatibility for ancient systems. Not something you should
care about on new ones.
>
> > ifeq ($(BR2_PACKAGE_PYTHON),y)
> > LTTNG_LIBUST_DEPENDENCIES += python
> > LTTNG_LIBUST_CONF_OPTS += --enable-python-agent
> > diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/
> lttng-tools.mk
> > index b1b0a24a4f..0f3dc84ebd 100644
> > --- a/package/lttng-tools/lttng-tools.mk
> > +++ b/package/lttng-tools/lttng-tools.mk
> > @@ -13,6 +13,10 @@ LTTNG_TOOLS_LICENSE_FILES = LICENSE $(addprefix
> LICENSES/,BSD-2-Clause BSD-3-Cla
> > LTTNG_TOOLS_CONF_OPTS += --disable-man-pages
> > LTTNG_TOOLS_DEPENDENCIES = liburcu libxml2 popt util-linux
> >
> > +ifeq ($(BR2_INIT_SYSTEMD),y)
> > +LTTNG_LIBUST_CONF_OPTS += --with-lttng-system-rundir=/run/lttng
>
> You're using LTTNG_LIBUST_CONF_OPTS, but it should have been
> LTTNG_TOOLS_CONF_OPTS.
>
> I fixed that when applying. Thanks!
>
Ok, thanks
> Thomas
> --
> Thomas Petazzoni, CTO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20200627/f1f3c3f8/attachment.html>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 1/4] package/liburcu: bump version to 0.12.1
2020-06-26 22:05 [Buildroot] [PATCH 1/4] package/liburcu: bump version to 0.12.1 Norbert Lange
` (2 preceding siblings ...)
2020-06-26 22:06 ` [Buildroot] [PATCH 4/4] package/lttng-{libust, tools}: use proper systemd rundir Norbert Lange
@ 2020-06-27 14:45 ` Thomas Petazzoni
3 siblings, 0 replies; 9+ messages in thread
From: Thomas Petazzoni @ 2020-06-27 14:45 UTC (permalink / raw)
To: buildroot
On Sat, 27 Jun 2020 00:05:59 +0200
Norbert Lange <nolange79@gmail.com> wrote:
> Also update hash file formatting (2 spaces).
>
> Signed-off-by: Norbert Lange <nolange79@gmail.com>
> ---
> package/liburcu/liburcu.hash | 12 ++++++------
> package/liburcu/liburcu.mk | 2 +-
> 2 files changed, 7 insertions(+), 7 deletions(-)
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 9+ messages in thread