Re: [Buildroot] [PATCH v2 1/3] package/libtracefs: bump to version 1.8.0

From: "Yann E. MORIN" <yann.morin.1998@free.fr>
To: Giulio Benetti <giulio.benetti@benettiengineering.com>
Cc: Pierre Floury <pierre.floury@gmail.com>,
	Maxime Chevallier <maxime.chevallier@bootlin.com>,
	buildroot@buildroot.org
Subject: Re: [Buildroot] [PATCH v2 1/3] package/libtracefs: bump to version 1.8.0
Date: Wed, 10 Jan 2024 23:05:10 +0100	[thread overview]
Message-ID: <ZZ8UlugEjZxp2w9O@landeda> (raw)
In-Reply-To: <20240110211223.791548-1-giulio.benetti@benettiengineering.com>

Giulio, All,

On 2024-01-10 22:12 +0100, Giulio Benetti spake thusly:
> Let's drop local patch thas has been upstreamed but another one to fix
> linking failure due to meson and Makefile unalignment. Also, now libtracefs
> samples require pthread, but we don't want samples to be built to save
> target size and reduce dependencies counot, so let's disable it by setting
> meson samples variable to false in LIBTRACEFS_CONF_OPTS.
> 
> Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
> ---
[--SNIP--]
> diff --git a/package/libtracefs/0001-libtracefs-meson-build-tracefs-mmap-by-default.patch b/package/libtracefs/0001-libtracefs-meson-build-tracefs-mmap-by-default.patch
> new file mode 100644
> index 0000000000..caa8b1a05e
> --- /dev/null
> +++ b/package/libtracefs/0001-libtracefs-meson-build-tracefs-mmap-by-default.patch
> @@ -0,0 +1,30 @@
> +From 2ff02ff91b5dc81b7cc253f88c9fce15664daeba Mon Sep 17 00:00:00 2001
> +From: Giulio Benetti <giulio.benetti@benettiengineering.com>
> +Date: Wed, 10 Jan 2024 21:38:51 +0100
> +Subject: [PATCH] libtracefs meson: build tracefs-mmap by default
> +
> +Accordingly to Makefile let's add tracefs-mmap.c to build, this is needed
> +for linking by other object files.
> +
> +Upstream: https://patchwork.kernel.org/project/linux-trace-devel/patch/20240110203925.266999-1-giulio.benetti@benettiengineering.com/

It has been applied now, so I made a p[roper backport.

Applied to master, thanks.

Regards,
Yann E. MORIN.

> +Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
> +---
> + src/meson.build | 1 +
> + 1 file changed, 1 insertion(+)
> +
> +diff --git a/src/meson.build b/src/meson.build
> +index 5b76554..f7a98b9 100644
> +--- a/src/meson.build
> ++++ b/src/meson.build
> +@@ -11,6 +11,7 @@ sources= [
> +    'tracefs-instance.c',
> +    'tracefs-kprobes.c',
> +    'tracefs-marker.c',
> ++   'tracefs-mmap.c',
> +    'tracefs-record.c',
> +    'tracefs-sqlhist.c',
> +    'tracefs-tools.c',
> +-- 
> +2.34.1
> +
> diff --git a/package/libtracefs/libtracefs.hash b/package/libtracefs/libtracefs.hash
> index 040467af08..ebc562eb40 100644
> --- a/package/libtracefs/libtracefs.hash
> +++ b/package/libtracefs/libtracefs.hash
> @@ -1,4 +1,4 @@
>  # Locally computed
> -sha256  411fcbf3434ecbaefa6c2b1bf092266293a672e2d7ee46fdd6b402753cb8bd16  libtracefs-1.7.0.tar.gz
> +sha256  f92475d5c4cb509983697fb359ee615bef4f08ed8bdc9c690f6118ba68886de0  libtracefs-1.8.0.tar.gz
>  sha256  f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79  LICENSES/GPL-2.0
>  sha256  0b9a4febcdee6de55872501d5c1a8f5d8b0d1650cd4d5351995ceb22e889f8ca  LICENSES/LGPL-2.1
> diff --git a/package/libtracefs/libtracefs.mk b/package/libtracefs/libtracefs.mk
> index 1e6e19a234..ed45fcbc50 100644
> --- a/package/libtracefs/libtracefs.mk
> +++ b/package/libtracefs/libtracefs.mk
> @@ -4,7 +4,7 @@
>  #
>  ################################################################################
>  
> -LIBTRACEFS_VERSION = 1.7.0
> +LIBTRACEFS_VERSION = 1.8.0
>  LIBTRACEFS_SITE = https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot
>  LIBTRACEFS_INSTALL_STAGING = YES
>  LIBTRACEFS_LICENSE = GPL-2.0, LGPL-2.1
> @@ -13,6 +13,7 @@ LIBTRACEFS_LICENSE_FILES = LICENSES/GPL-2.0 LICENSES/LGPL-2.1
>  LIBTRACEFS_DEPENDENCIES = host-bison host-flex host-pkgconf libtraceevent
>  
>  LIBTRACEFS_CONF_OPTS = \
> -	-Ddoc=false
> +	-Ddoc=false \
> +	-Dsamples=false
>  
>  $(eval $(meson-package))
> -- 
> 2.34.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot