[Buildroot] [PATCH 1/1] package/lttng-libust: fix legal-info

[Buildroot] [PATCH 1/1] package/lttng-libust: fix legal-info

[Fabrice Fontaine]

COPYING has been removed since version 2.13.0 and
https://github.com/lttng/lttng-ust/commit/c0c0989ab70574e09b2f7e8b48c2da6af664a849
resulting in the following build failure since bump to version 2.13.1 in
commit 733bf73e3ff86dd80e68e22c0ccc2f43e4a3d475:

ERROR: COPYING has wrong sha256 hash:
ERROR: expected: 74125a84c2166300776980166e29de40d5f98d1a75e487f0bbc0c03b4cd2342e
ERROR: got     :

So use the new license files, add BSD-3-Clause (which was added in
version 2.13.0 and
https://github.com/lttng/lttng-ust/commit/d8621b3ea82b7fc1937b0eefb2b1316b2ce361a5)
and don't add BSD-2-Clause and GPL-3.0+ as tests are disabled

Fixes:
 - http://autobuild.buildroot.org/results/470d6401f2a97f4ac91b2d8cfb1af90b638320a9

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/lttng-libust/lttng-libust.hash | 8 ++++++--
 package/lttng-libust/lttng-libust.mk   | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/package/lttng-libust/lttng-libust.hash b/package/lttng-libust/lttng-libust.hash
index 23839e42cc..42f2b372dc 100644
--- a/package/lttng-libust/lttng-libust.hash
+++ b/package/lttng-libust/lttng-libust.hash
@@ -1,5 +1,9 @@
 # From https://lttng.org/files/lttng-ust/lttng-ust-2.13.2.tar.bz2.sha256
 sha256  5667bf0269e1e62e2d9cb974c456ff86e0401bd7aa3bfc8d5fdb97233249eddc  lttng-ust-2.13.1.tar.bz2
 
-# Hash for license file
-sha256  74125a84c2166300776980166e29de40d5f98d1a75e487f0bbc0c03b4cd2342e  COPYING
+# Hash for license files
+sha256  5b52242fd2045d62dd664c8358137b46c1e08efdba674c91cbfc06585efe1ce7  LICENSE
+sha256  f206ce02ddf94d03120b58381064702729a0e6cbb03cafc84dc0e434ce5689fa  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-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk
index e3e1cdebf2..690d18fe3d 100644
--- a/package/lttng-libust/lttng-libust.mk
+++ b/package/lttng-libust/lttng-libust.mk
@@ -7,8 +7,8 @@
 LTTNG_LIBUST_SITE = http://lttng.org/files/lttng-ust
 LTTNG_LIBUST_VERSION = 2.13.1
 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
+LTTNG_LIBUST_LICENSE = LGPL-2.1, MIT (system headers), GPL-2.0 (liblttng-ust-ctl/ustctl.c used by lttng-sessiond), BSD-3-Clause (snprintf)
+LTTNG_LIBUST_LICENSE_FILES = LICENSE LICENSES/BSD-3-Clause LICENSES/GPL-2.0 LICENSES/LGPL-2.1 LICENSES/MIT
 LTTNG_LIBUST_INSTALL_STAGING = YES
 LTTNG_LIBUST_DEPENDENCIES = liburcu util-linux
 LTTNG_LIBUST_CONF_OPTS = \
-- 
2.33.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/lttng-libust: fix legal-info

[Thomas Petazzoni]

On Sat, 25 Dec 2021 19:33:38 +0100
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> COPYING has been removed since version 2.13.0 and
> https://github.com/lttng/lttng-ust/commit/c0c0989ab70574e09b2f7e8b48c2da6af664a849
> resulting in the following build failure since bump to version 2.13.1 in
> commit 733bf73e3ff86dd80e68e22c0ccc2f43e4a3d475:
> 
> ERROR: COPYING has wrong sha256 hash:
> ERROR: expected: 74125a84c2166300776980166e29de40d5f98d1a75e487f0bbc0c03b4cd2342e
> ERROR: got     :
> 
> So use the new license files, add BSD-3-Clause (which was added in
> version 2.13.0 and
> https://github.com/lttng/lttng-ust/commit/d8621b3ea82b7fc1937b0eefb2b1316b2ce361a5)
> and don't add BSD-2-Clause and GPL-3.0+ as tests are disabled
> 
> Fixes:
>  - http://autobuild.buildroot.org/results/470d6401f2a97f4ac91b2d8cfb1af90b638320a9
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/lttng-libust/lttng-libust.hash | 8 ++++++--
>  package/lttng-libust/lttng-libust.mk   | 4 ++--
>  2 files changed, 8 insertions(+), 4 deletions(-)

Applied to master, thanks. I should have been more careful when merging
the version bump, I guess. Thanks for fixing!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot