Skip to contentSkip to conversation

package/liburcu: bump version to 0.12.1

PATCH New Norbert Lange 2 participants 9 messages Jun 26, 2020 – Jun 27, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 package/liburcu: bump version to 0.12.1

Also update hash file formatting (2 spaces).

---
 package/liburcu/liburcu.hash | 12 ++++++------
 package/liburcu/liburcu.mk   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)
package/liburcu/liburcu.hash +6 -6
index 5c2f7e52a8..da7d12a76c 100644
@@ -1,8 +1,8 @@
-# http://www.lttng.org/files/urcu/userspace-rcu-0.11.1.tar.bz2.sha256
-sha256 92b9971bf3f1c443edd6c09e7bf5ff3b43531e778841f16377a812c8feeb3350  userspace-rcu-0.11.1.tar.bz2
+# http://www.lttng.org/files/urcu/userspace-rcu-0.12.1.tar.bz2.sha256
+sha256  bbfaead0345642b97e0de90f889dfbab4b2643a6a5e5c6bb59cd0d26fc0bcd0e  userspace-rcu-0.12.1.tar.bz2
 
 # Hash for license files
-sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89  lgpl-2.1.txt
-sha256 8ef8121eddd2fc0779d94331a1d0f1ead9c796343d845e564cd8c8c4ae3d6f6e  lgpl-relicensing.txt
-sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  gpl-2.0.txt
-sha256 e8c070cb093be4b2eaf938a5f1c11621163b2d9cfa2790460cf925d81e442fa7  LICENSE
+sha256  36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89  lgpl-2.1.txt
+sha256  8ef8121eddd2fc0779d94331a1d0f1ead9c796343d845e564cd8c8c4ae3d6f6e  lgpl-relicensing.txt
+sha256  ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  gpl-2.0.txt
+sha256  e8c070cb093be4b2eaf938a5f1c11621163b2d9cfa2790460cf925d81e442fa7  LICENSE
package/liburcu/liburcu.mk +1 -1
index 217e90a1b1..fa2ad0de83 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBURCU_VERSION = 0.11.1
+LIBURCU_VERSION = 0.12.1
 LIBURCU_SITE = http://lttng.org/files/urcu
 LIBURCU_SOURCE = userspace-rcu-$(LIBURCU_VERSION).tar.bz2
 LIBURCU_LICENSE = LGPL-2.1+ (library), MIT-like (few source files listed in LICENSE), GPL-2.0+ (test), GPL-3.0 (few *.m4 files)
Signature · 1 line
2.27.0
#1 lore raw

PATCH 2/4 package/lttng-libust: bump version to 2.12.0

Also update hash file formatting (2 spaces).

---
 package/lttng-libust/lttng-libust.hash | 6 +++---
 package/lttng-libust/lttng-libust.mk   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
package/lttng-libust/lttng-libust.hash +3 -3
index 85e1acc261..62a65897f4 100644
@@ -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
package/lttng-libust/lttng-libust.mk +1 -1
index 0c2fdb57ef..8e6537690b 100644
@@ -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
Signature · 1 line
2.27.0
#2 lore raw

PATCH 2/4 package/lttng-libust: bump version to 2.12.0

Quoted 7 lines · On Sat, 27 Jun 2020 00:06:00 +0200 Norbert Lange <[email protected]> wrote:

Also update hash file formatting (2 spaces).

---
 package/lttng-libust/lttng-libust.hash | 6 +++---
 package/lttng-libust/lttng-libust.mk   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH 3/4 package/lttng-tools: bump version to 2.12.1

In reply to Norbert Lange

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".

---
 package/lttng-tools/lttng-tools.hash | 14 +++++++++-----
 package/lttng-tools/lttng-tools.mk   |  6 +++---
 2 files changed, 12 insertions(+), 8 deletions(-)
package/lttng-tools/lttng-tools.hash +9 -5
index f5f9fdbbdc..a27b419e75 100644
@@ -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
package/lttng-tools/lttng-tools.mk +3 -3
index f85f6bcbce..b1b0a24a4f 100644
@@ -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
 
Signature · 1 line
2.27.0
#4 lore raw

PATCH 3/4 package/lttng-tools: bump version to 2.12.1

Quoted 5 lines · On Sat, 27 Jun 2020 00:06:01 +0200 Norbert Lange <[email protected]> wrote:

Also update hash file formatting (2 spaces).

License files got moved into a subfolder,
use those new paths.

Quoted 8 lines

Also the package is (L)GPL only, so remove the
"or higher".

---
 package/lttng-tools/lttng-tools.hash | 14 +++++++++-----
 package/lttng-tools/lttng-tools.mk   |  6 +++---
 2 files changed, 12 insertions(+), 8 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#5 lore raw

PATCH 4/4 package/lttng-{libust, tools}: use proper systemd rundir

In reply to Norbert Lange

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)

---
 package/lttng-libust/lttng-libust.mk | 4 ++++
 package/lttng-tools/lttng-tools.mk   | 4 ++++
 2 files changed, 8 insertions(+)
package/lttng-libust/lttng-libust.mk +4 -0
index 8e6537690b..f3c660c56f 100644
@@ -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
package/lttng-tools/lttng-tools.mk +4 -0
index b1b0a24a4f..0f3dc84ebd 100644
@@ -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
Signature · 1 line
2.27.0
#6 lore raw

PATCH 4/4 package/lttng-{libust, tools}: use proper systemd rundir

Quoted 7 lines · On Sat, 27 Jun 2020 00:06:02 +0200 Norbert Lange <[email protected]> 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 ?

package/lttng-tools/lttng-tools.mk LTTNG_TOOLS_LICENSE_FILES = LICENSE $(addprefix LICENSES/,BSD-2-Clause BSD-3-Cla · line 17

Quoted 13 lines

ifeq ($(BR2_PACKAGE_PYTHON),y)
LTTNG_LIBUST_DEPENDENCIES += python
LTTNG_LIBUST_CONF_OPTS += --enable-python-agent

package/lttng-tools/lttng-tools.mk +2 -0
index b1b0a24a4f..0f3dc84ebd 100644
@@ -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

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#7 lore raw

PATCH 4/4 package/lttng-{libust, tools}: use proper systemd rundir

Thomas Petazzoni <[email protected]> schrieb am Sa., 27. Juni 2020, 16:46:

Quoted 11 lines
Quoted 7 lines · On Sat, 27 Jun 2020 00:06:02 +0200 Norbert Lange <[email protected]> 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)

Quoted 5 lines

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.

Quoted 14 lines

package/lttng-tools/

Quoted 5 lines

ifeq ($(BR2_PACKAGE_PYTHON),y)
LTTNG_LIBUST_DEPENDENCIES += python
LTTNG_LIBUST_CONF_OPTS += --enable-python-agent

package/lttng-tools/ renamed from package/lttng-tools/lttng-tools.mk +0 -0

lttng-tools.mk

package/lttng-tools/lttng-tools.mk LTTNG_TOOLS_LICENSE_FILES = LICENSE $(addprefix

Quoted 4 lines

index b1b0a24a4f..0f3dc84ebd 100644

package/lttng-tools/lttng-tools.mk +0 -0
@@ -13,6 +13,10 @@ LTTNG_TOOLS_LICENSE_FILES = LICENSE $(addprefix

LICENSES/,BSD-2-Clause BSD-3-Cla

Quoted 3 lines
package/lttng-tools/lttng-tools.mk +0 -0
 LTTNG_TOOLS_CONF_OPTS += --disable-man-pages
 LTTNG_TOOLS_DEPENDENCIES = liburcu libxml2 popt util-linux
 
Quoted 8 lines

package/lttng-tools/lttng-tools.mk LTTNG_TOOLS_LICENSE_FILES = LICENSE $(addprefix · line 17

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

Quoted 6 lines

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>

#8 lore raw

PATCH 1/4 package/liburcu: bump version to 0.12.1

In reply to Norbert Lange
Quoted 7 lines · On Sat, 27 Jun 2020 00:05:59 +0200 Norbert Lange <[email protected]> wrote:

Also update hash file formatting (2 spaces).

---
 package/liburcu/liburcu.hash | 12 ++++++------
 package/liburcu/liburcu.mk   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com