* [ptxdist] [PATCH 1/3] libtraceevent: version bump 1.8.2 -> 1.8.4
@ 2024-12-10 10:56 Lucas Stach
2024-12-10 10:56 ` [ptxdist] [PATCH 2/3] libtracefs: new package Lucas Stach
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Lucas Stach @ 2024-12-10 10:56 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
rules/libtraceevent.make | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/rules/libtraceevent.make b/rules/libtraceevent.make
index 7acc9c9652c4..c78469068f58 100644
--- a/rules/libtraceevent.make
+++ b/rules/libtraceevent.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBTRACEEVENT) += libtraceevent
#
# Paths and names
#
-LIBTRACEEVENT_VERSION := 1.8.2
-LIBTRACEEVENT_MD5 := 671645965e835ef4236b96851fb889c9
+LIBTRACEEVENT_VERSION := 1.8.4
+LIBTRACEEVENT_MD5 := 2efaa25168e20ad5501393a25ed1cd01
LIBTRACEEVENT := libtraceevent-$(LIBTRACEEVENT_VERSION)
LIBTRACEEVENT_SUFFIX := tar.xz
LIBTRACEEVENT_URL := https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git;tag=libtraceevent-$(LIBTRACEEVENT_VERSION)
@@ -60,7 +60,7 @@ $(STATEDIR)/libtraceevent.targetinstall:
@$(call install_lib, libtraceevent, 0, 0, 0644, libtraceevent)
@for plugin in cfg80211 function futex hrtimer jbd2 kmem kvm mac80211 sched_switch scsi tlb xen; do \
- $(call install_lib, libtraceevent, 0, 0, 0644, libtraceevent/plugins/plugin_$${plugin}); \
+ $(call install_lib, libtraceevent, 0, 0, 0644, traceevent/plugins/plugin_$${plugin}); \
done
@$(call install_finish, libtraceevent)
--
2.39.5
^ permalink raw reply [flat|nested] 9+ messages in thread* [ptxdist] [PATCH 2/3] libtracefs: new package 2024-12-10 10:56 [ptxdist] [PATCH 1/3] libtraceevent: version bump 1.8.2 -> 1.8.4 Lucas Stach @ 2024-12-10 10:56 ` Lucas Stach 2025-01-08 10:09 ` Roland Hieber 2025-01-10 7:44 ` [ptxdist] [APPLIED] " Michael Olbrich 2024-12-10 10:56 ` [ptxdist] [PATCH 3/3] trace-cmd: version bump 2.9.7 -> 3.3.1 Lucas Stach 2025-01-10 7:44 ` [ptxdist] [APPLIED] libtraceevent: version bump 1.8.2 -> 1.8.4 Michael Olbrich 2 siblings, 2 replies; 9+ messages in thread From: Lucas Stach @ 2024-12-10 10:56 UTC (permalink / raw) To: ptxdist Linux kernel trace filesystem library, which has been split out from trace-cmd and kernelshark. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> --- rules/libtracefs.in | 9 +++++++ rules/libtracefs.make | 59 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 rules/libtracefs.in create mode 100644 rules/libtracefs.make diff --git a/rules/libtracefs.in b/rules/libtracefs.in new file mode 100644 index 000000000000..0f1793a5ee96 --- /dev/null +++ b/rules/libtracefs.in @@ -0,0 +1,9 @@ +## SECTION=system_libraries + +config LIBTRACEFS + tristate + select HOST_MESON + select LIBTRACEEVENT + prompt "libtracefs" + help + Linux kernel trace filesystem library diff --git a/rules/libtracefs.make b/rules/libtracefs.make new file mode 100644 index 000000000000..12f0c6e7972c --- /dev/null +++ b/rules/libtracefs.make @@ -0,0 +1,59 @@ +# -*-makefile-*- +# +# Copyright (C) 2024 by Lucas Stach <l.stach@pengutronix.de> +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_LIBTRACEFS) += libtracefs + +# +# Paths and names +# +LIBTRACEFS_VERSION := 1.8.1 +LIBTRACEFS_MD5 := d16612bef28cb49e898558fe362496cc +LIBTRACEFS := libtracefs-$(LIBTRACEFS_VERSION) +LIBTRACEFS_SUFFIX := tar.xz +LIBTRACEFS_URL := https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git;tag=libtracefs-$(LIBTRACEFS_VERSION) +LIBTRACEFS_SOURCE := $(SRCDIR)/$(LIBTRACEFS).$(LIBTRACEFS_SUFFIX) +LIBTRACEFS_DIR := $(BUILDDIR)/$(LIBTRACEFS) +LIBTRACEFS_LICENSE := LGPL-2.1 + GPL-2.0 + +# ---------------------------------------------------------------------------- +# Prepare +# ---------------------------------------------------------------------------- + +# +# meson +# +LIBTRACEFS_CONF_TOOL := meson +LIBTRACEFS_CONF_OPT := \ + $(CROSS_MESON_USR) \ + -Ddoc=false \ + -Dsamples=false \ + -Dutest=false + +# ---------------------------------------------------------------------------- +# Target-Install +# ---------------------------------------------------------------------------- + +$(STATEDIR)/libtracefs.targetinstall: + @$(call targetinfo) + + @$(call install_init, libtracefs) + @$(call install_fixup, libtracefs,PRIORITY,optional) + @$(call install_fixup, libtracefs,SECTION,base) + @$(call install_fixup, libtracefs,AUTHOR,"Lucas Stach <l.stach@pengutronix.de>") + @$(call install_fixup, libtracefs,DESCRIPTION,missing) + + @$(call install_lib, libtracefs, 0, 0, 0644, libtracefs) + + @$(call install_finish, libtracefs) + + @$(call touch) + +# vim: syntax=make -- 2.39.5 ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [ptxdist] [PATCH 2/3] libtracefs: new package 2024-12-10 10:56 ` [ptxdist] [PATCH 2/3] libtracefs: new package Lucas Stach @ 2025-01-08 10:09 ` Roland Hieber 2025-01-10 8:32 ` Michael Olbrich 2025-01-10 7:44 ` [ptxdist] [APPLIED] " Michael Olbrich 1 sibling, 1 reply; 9+ messages in thread From: Roland Hieber @ 2025-01-08 10:09 UTC (permalink / raw) To: ptxdist On Tue, Dec 10, 2024 at 11:56:28AM +0100, Lucas Stach wrote: > Linux kernel trace filesystem library, which has been > split out from trace-cmd and kernelshark. > > Signed-off-by: Lucas Stach <l.stach@pengutronix.de> > --- > rules/libtracefs.in | 9 +++++++ > rules/libtracefs.make | 59 +++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 68 insertions(+) > create mode 100644 rules/libtracefs.in > create mode 100644 rules/libtracefs.make > > diff --git a/rules/libtracefs.in b/rules/libtracefs.in > new file mode 100644 > index 000000000000..0f1793a5ee96 > --- /dev/null > +++ b/rules/libtracefs.in > @@ -0,0 +1,9 @@ > +## SECTION=system_libraries > + > +config LIBTRACEFS > + tristate > + select HOST_MESON > + select LIBTRACEEVENT > + prompt "libtracefs" > + help > + Linux kernel trace filesystem library > diff --git a/rules/libtracefs.make b/rules/libtracefs.make > new file mode 100644 > index 000000000000..12f0c6e7972c > --- /dev/null > +++ b/rules/libtracefs.make > @@ -0,0 +1,59 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2024 by Lucas Stach <l.stach@pengutronix.de> > +# > +# For further information about the PTXdist project and license conditions > +# see the README file. > +# > + > +# > +# We provide this package > +# > +PACKAGES-$(PTXCONF_LIBTRACEFS) += libtracefs > + > +# > +# Paths and names > +# > +LIBTRACEFS_VERSION := 1.8.1 > +LIBTRACEFS_MD5 := d16612bef28cb49e898558fe362496cc > +LIBTRACEFS := libtracefs-$(LIBTRACEFS_VERSION) > +LIBTRACEFS_SUFFIX := tar.xz > +LIBTRACEFS_URL := https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git;tag=libtracefs-$(LIBTRACEFS_VERSION) > +LIBTRACEFS_SOURCE := $(SRCDIR)/$(LIBTRACEFS).$(LIBTRACEFS_SUFFIX) > +LIBTRACEFS_DIR := $(BUILDDIR)/$(LIBTRACEFS) > +LIBTRACEFS_LICENSE := LGPL-2.1 + GPL-2.0 Correct SPDX syntax is AND instead of +. Also you need to choose between -or-later and -only versions for both licenses. And fill LIBTRACEFS_LICENSE_FILES. - Roland > + > +# ---------------------------------------------------------------------------- > +# Prepare > +# ---------------------------------------------------------------------------- > + > +# > +# meson > +# > +LIBTRACEFS_CONF_TOOL := meson > +LIBTRACEFS_CONF_OPT := \ > + $(CROSS_MESON_USR) \ > + -Ddoc=false \ > + -Dsamples=false \ > + -Dutest=false > + > +# ---------------------------------------------------------------------------- > +# Target-Install > +# ---------------------------------------------------------------------------- > + > +$(STATEDIR)/libtracefs.targetinstall: > + @$(call targetinfo) > + > + @$(call install_init, libtracefs) > + @$(call install_fixup, libtracefs,PRIORITY,optional) > + @$(call install_fixup, libtracefs,SECTION,base) > + @$(call install_fixup, libtracefs,AUTHOR,"Lucas Stach <l.stach@pengutronix.de>") > + @$(call install_fixup, libtracefs,DESCRIPTION,missing) > + > + @$(call install_lib, libtracefs, 0, 0, 0644, libtracefs) > + > + @$(call install_finish, libtracefs) > + > + @$(call touch) > + > +# vim: syntax=make > -- > 2.39.5 > > > -- Roland Hieber, Pengutronix e.K. | rhi@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [ptxdist] [PATCH 2/3] libtracefs: new package 2025-01-08 10:09 ` Roland Hieber @ 2025-01-10 8:32 ` Michael Olbrich 2025-01-10 10:34 ` Roland Hieber 0 siblings, 1 reply; 9+ messages in thread From: Michael Olbrich @ 2025-01-10 8:32 UTC (permalink / raw) To: Roland Hieber; +Cc: ptxdist On Wed, Jan 08, 2025 at 11:09:52AM +0100, Roland Hieber wrote: > On Tue, Dec 10, 2024 at 11:56:28AM +0100, Lucas Stach wrote: > > Linux kernel trace filesystem library, which has been > > split out from trace-cmd and kernelshark. > > > > Signed-off-by: Lucas Stach <l.stach@pengutronix.de> > > --- > > rules/libtracefs.in | 9 +++++++ > > rules/libtracefs.make | 59 +++++++++++++++++++++++++++++++++++++++++++ > > 2 files changed, 68 insertions(+) > > create mode 100644 rules/libtracefs.in > > create mode 100644 rules/libtracefs.make > > > > diff --git a/rules/libtracefs.in b/rules/libtracefs.in > > new file mode 100644 > > index 000000000000..0f1793a5ee96 > > --- /dev/null > > +++ b/rules/libtracefs.in > > @@ -0,0 +1,9 @@ > > +## SECTION=system_libraries > > + > > +config LIBTRACEFS > > + tristate > > + select HOST_MESON > > + select LIBTRACEEVENT > > + prompt "libtracefs" > > + help > > + Linux kernel trace filesystem library > > diff --git a/rules/libtracefs.make b/rules/libtracefs.make > > new file mode 100644 > > index 000000000000..12f0c6e7972c > > --- /dev/null > > +++ b/rules/libtracefs.make > > @@ -0,0 +1,59 @@ > > +# -*-makefile-*- > > +# > > +# Copyright (C) 2024 by Lucas Stach <l.stach@pengutronix.de> > > +# > > +# For further information about the PTXdist project and license conditions > > +# see the README file. > > +# > > + > > +# > > +# We provide this package > > +# > > +PACKAGES-$(PTXCONF_LIBTRACEFS) += libtracefs > > + > > +# > > +# Paths and names > > +# > > +LIBTRACEFS_VERSION := 1.8.1 > > +LIBTRACEFS_MD5 := d16612bef28cb49e898558fe362496cc > > +LIBTRACEFS := libtracefs-$(LIBTRACEFS_VERSION) > > +LIBTRACEFS_SUFFIX := tar.xz > > +LIBTRACEFS_URL := https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git;tag=libtracefs-$(LIBTRACEFS_VERSION) > > +LIBTRACEFS_SOURCE := $(SRCDIR)/$(LIBTRACEFS).$(LIBTRACEFS_SUFFIX) > > +LIBTRACEFS_DIR := $(BUILDDIR)/$(LIBTRACEFS) > > +LIBTRACEFS_LICENSE := LGPL-2.1 + GPL-2.0 > > Correct SPDX syntax is AND instead of +. Also you need to choose between > -or-later and -only versions for both licenses. And fill > LIBTRACEFS_LICENSE_FILES. Right, I missed that when I applied the patch. The SPDX identifiers here are the old syntax, so "LGPL-2.1-only AND GPL-2.0-only" is correct. I'll fix it. Michael > - Roland > > > + > > +# ---------------------------------------------------------------------------- > > +# Prepare > > +# ---------------------------------------------------------------------------- > > + > > +# > > +# meson > > +# > > +LIBTRACEFS_CONF_TOOL := meson > > +LIBTRACEFS_CONF_OPT := \ > > + $(CROSS_MESON_USR) \ > > + -Ddoc=false \ > > + -Dsamples=false \ > > + -Dutest=false > > + > > +# ---------------------------------------------------------------------------- > > +# Target-Install > > +# ---------------------------------------------------------------------------- > > + > > +$(STATEDIR)/libtracefs.targetinstall: > > + @$(call targetinfo) > > + > > + @$(call install_init, libtracefs) > > + @$(call install_fixup, libtracefs,PRIORITY,optional) > > + @$(call install_fixup, libtracefs,SECTION,base) > > + @$(call install_fixup, libtracefs,AUTHOR,"Lucas Stach <l.stach@pengutronix.de>") > > + @$(call install_fixup, libtracefs,DESCRIPTION,missing) > > + > > + @$(call install_lib, libtracefs, 0, 0, 0644, libtracefs) > > + > > + @$(call install_finish, libtracefs) > > + > > + @$(call touch) > > + > > +# vim: syntax=make > > -- > > 2.39.5 > > > > > > > > -- > Roland Hieber, Pengutronix e.K. | rhi@pengutronix.de | > Steuerwalder Str. 21 | https://www.pengutronix.de/ | > 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [ptxdist] [PATCH 2/3] libtracefs: new package 2025-01-10 8:32 ` Michael Olbrich @ 2025-01-10 10:34 ` Roland Hieber 0 siblings, 0 replies; 9+ messages in thread From: Roland Hieber @ 2025-01-10 10:34 UTC (permalink / raw) To: ptxdist On Fri, Jan 10, 2025 at 09:32:42AM +0100, Michael Olbrich wrote: > On Wed, Jan 08, 2025 at 11:09:52AM +0100, Roland Hieber wrote: > > On Tue, Dec 10, 2024 at 11:56:28AM +0100, Lucas Stach wrote: > > > Linux kernel trace filesystem library, which has been > > > split out from trace-cmd and kernelshark. > > > > > > Signed-off-by: Lucas Stach <l.stach@pengutronix.de> > > > --- > > > rules/libtracefs.in | 9 +++++++ > > > rules/libtracefs.make | 59 +++++++++++++++++++++++++++++++++++++++++++ > > > 2 files changed, 68 insertions(+) > > > create mode 100644 rules/libtracefs.in > > > create mode 100644 rules/libtracefs.make > > > > > > diff --git a/rules/libtracefs.in b/rules/libtracefs.in > > > new file mode 100644 > > > index 000000000000..0f1793a5ee96 > > > --- /dev/null > > > +++ b/rules/libtracefs.in > > > @@ -0,0 +1,9 @@ > > > +## SECTION=system_libraries > > > + > > > +config LIBTRACEFS > > > + tristate > > > + select HOST_MESON > > > + select LIBTRACEEVENT > > > + prompt "libtracefs" > > > + help > > > + Linux kernel trace filesystem library > > > diff --git a/rules/libtracefs.make b/rules/libtracefs.make > > > new file mode 100644 > > > index 000000000000..12f0c6e7972c > > > --- /dev/null > > > +++ b/rules/libtracefs.make > > > @@ -0,0 +1,59 @@ > > > +# -*-makefile-*- > > > +# > > > +# Copyright (C) 2024 by Lucas Stach <l.stach@pengutronix.de> > > > +# > > > +# For further information about the PTXdist project and license conditions > > > +# see the README file. > > > +# > > > + > > > +# > > > +# We provide this package > > > +# > > > +PACKAGES-$(PTXCONF_LIBTRACEFS) += libtracefs > > > + > > > +# > > > +# Paths and names > > > +# > > > +LIBTRACEFS_VERSION := 1.8.1 > > > +LIBTRACEFS_MD5 := d16612bef28cb49e898558fe362496cc > > > +LIBTRACEFS := libtracefs-$(LIBTRACEFS_VERSION) > > > +LIBTRACEFS_SUFFIX := tar.xz > > > +LIBTRACEFS_URL := https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git;tag=libtracefs-$(LIBTRACEFS_VERSION) > > > +LIBTRACEFS_SOURCE := $(SRCDIR)/$(LIBTRACEFS).$(LIBTRACEFS_SUFFIX) > > > +LIBTRACEFS_DIR := $(BUILDDIR)/$(LIBTRACEFS) > > > +LIBTRACEFS_LICENSE := LGPL-2.1 + GPL-2.0 > > > > Correct SPDX syntax is AND instead of +. Also you need to choose between > > -or-later and -only versions for both licenses. And fill > > LIBTRACEFS_LICENSE_FILES. > > Right, I missed that when I applied the patch. The SPDX identifiers here > are the old syntax, so "LGPL-2.1-only AND GPL-2.0-only" is correct. I'll > fix it. The GPL-2.0 is only used in build scripts, so we can disregard that. I'll send a separate patch. - Roland -- Roland Hieber, Pengutronix e.K. | rhi@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [ptxdist] [APPLIED] libtracefs: new package 2024-12-10 10:56 ` [ptxdist] [PATCH 2/3] libtracefs: new package Lucas Stach 2025-01-08 10:09 ` Roland Hieber @ 2025-01-10 7:44 ` Michael Olbrich 1 sibling, 0 replies; 9+ messages in thread From: Michael Olbrich @ 2025-01-10 7:44 UTC (permalink / raw) To: ptxdist; +Cc: Lucas Stach Thanks, applied as c5deb7c35e934544e8243c7f61b2173dd6e2b4bc. Michael [sent from post-receive hook] On Fri, 10 Jan 2025 08:44:57 +0100, Lucas Stach <l.stach@pengutronix.de> wrote: > Linux kernel trace filesystem library, which has been > split out from trace-cmd and kernelshark. > > Signed-off-by: Lucas Stach <l.stach@pengutronix.de> > Message-Id: <20241210105629.428090-2-l.stach@pengutronix.de> > Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> > > diff --git a/rules/libtracefs.in b/rules/libtracefs.in > new file mode 100644 > index 000000000000..0f1793a5ee96 > --- /dev/null > +++ b/rules/libtracefs.in > @@ -0,0 +1,9 @@ > +## SECTION=system_libraries > + > +config LIBTRACEFS > + tristate > + select HOST_MESON > + select LIBTRACEEVENT > + prompt "libtracefs" > + help > + Linux kernel trace filesystem library > diff --git a/rules/libtracefs.make b/rules/libtracefs.make > new file mode 100644 > index 000000000000..12f0c6e7972c > --- /dev/null > +++ b/rules/libtracefs.make > @@ -0,0 +1,59 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2024 by Lucas Stach <l.stach@pengutronix.de> > +# > +# For further information about the PTXdist project and license conditions > +# see the README file. > +# > + > +# > +# We provide this package > +# > +PACKAGES-$(PTXCONF_LIBTRACEFS) += libtracefs > + > +# > +# Paths and names > +# > +LIBTRACEFS_VERSION := 1.8.1 > +LIBTRACEFS_MD5 := d16612bef28cb49e898558fe362496cc > +LIBTRACEFS := libtracefs-$(LIBTRACEFS_VERSION) > +LIBTRACEFS_SUFFIX := tar.xz > +LIBTRACEFS_URL := https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git;tag=libtracefs-$(LIBTRACEFS_VERSION) > +LIBTRACEFS_SOURCE := $(SRCDIR)/$(LIBTRACEFS).$(LIBTRACEFS_SUFFIX) > +LIBTRACEFS_DIR := $(BUILDDIR)/$(LIBTRACEFS) > +LIBTRACEFS_LICENSE := LGPL-2.1 + GPL-2.0 > + > +# ---------------------------------------------------------------------------- > +# Prepare > +# ---------------------------------------------------------------------------- > + > +# > +# meson > +# > +LIBTRACEFS_CONF_TOOL := meson > +LIBTRACEFS_CONF_OPT := \ > + $(CROSS_MESON_USR) \ > + -Ddoc=false \ > + -Dsamples=false \ > + -Dutest=false > + > +# ---------------------------------------------------------------------------- > +# Target-Install > +# ---------------------------------------------------------------------------- > + > +$(STATEDIR)/libtracefs.targetinstall: > + @$(call targetinfo) > + > + @$(call install_init, libtracefs) > + @$(call install_fixup, libtracefs,PRIORITY,optional) > + @$(call install_fixup, libtracefs,SECTION,base) > + @$(call install_fixup, libtracefs,AUTHOR,"Lucas Stach <l.stach@pengutronix.de>") > + @$(call install_fixup, libtracefs,DESCRIPTION,missing) > + > + @$(call install_lib, libtracefs, 0, 0, 0644, libtracefs) > + > + @$(call install_finish, libtracefs) > + > + @$(call touch) > + > +# vim: syntax=make ^ permalink raw reply [flat|nested] 9+ messages in thread
* [ptxdist] [PATCH 3/3] trace-cmd: version bump 2.9.7 -> 3.3.1 2024-12-10 10:56 [ptxdist] [PATCH 1/3] libtraceevent: version bump 1.8.2 -> 1.8.4 Lucas Stach 2024-12-10 10:56 ` [ptxdist] [PATCH 2/3] libtracefs: new package Lucas Stach @ 2024-12-10 10:56 ` Lucas Stach 2025-01-10 7:44 ` [ptxdist] [APPLIED] " Michael Olbrich 2025-01-10 7:44 ` [ptxdist] [APPLIED] libtraceevent: version bump 1.8.2 -> 1.8.4 Michael Olbrich 2 siblings, 1 reply; 9+ messages in thread From: Lucas Stach @ 2024-12-10 10:56 UTC (permalink / raw) To: ptxdist Plugins are now provided by the separate libtraceevent. ZSTD is the preferred trace compression format. Build system switched over to meson. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> --- ...-add-options-for-doc-and-utest-build.patch | 47 +++++++++++++++++++ patches/trace-cmd-v3.3.1/series | 4 ++ rules/trace-cmd.in | 4 ++ rules/trace-cmd.make | 39 ++++----------- 4 files changed, 65 insertions(+), 29 deletions(-) create mode 100644 patches/trace-cmd-v3.3.1/0001-trace-cmd-meson-add-options-for-doc-and-utest-build.patch create mode 100644 patches/trace-cmd-v3.3.1/series diff --git a/patches/trace-cmd-v3.3.1/0001-trace-cmd-meson-add-options-for-doc-and-utest-build.patch b/patches/trace-cmd-v3.3.1/0001-trace-cmd-meson-add-options-for-doc-and-utest-build.patch new file mode 100644 index 000000000000..225b9c9f804f --- /dev/null +++ b/patches/trace-cmd-v3.3.1/0001-trace-cmd-meson-add-options-for-doc-and-utest-build.patch @@ -0,0 +1,47 @@ +From: Lucas Stach <l.stach@pengutronix.de> +Date: Tue, 10 Dec 2024 11:45:33 +0100 +Subject: [PATCH] trace-cmd meson: add options for doc and utest build + +In some cases building documentation or utest is not desired. +Add meson options to allow skipping those build targets. + +Signed-off-by: Lucas Stach <l.stach@pengutronix.de> +--- + meson.build | 5 ++++- + meson_options.txt | 4 ++++ + 2 files changed, 8 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 4773f4a941b1..237d9b400ea5 100644 +--- a/meson.build ++++ b/meson.build +@@ -140,9 +140,11 @@ subdir('lib/trace-cmd') + # trace-cmd + subdir('tracecmd') + subdir('python') +-if cunit_dep.found() ++if get_option('utest') and cunit_dep.found() + subdir('utest') + endif ++ ++if get_option('doc') + subdir('Documentation/trace-cmd') + + custom_target( +@@ -150,3 +152,4 @@ custom_target( + output: 'docs', + depends: [html, man], + command: ['echo']) ++endif +diff --git a/meson_options.txt b/meson_options.txt +index 2d5d7457bed5..37d72ff29d87 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -21,3 +21,7 @@ option('docbook-suppress-sp', type : 'boolean', value : false, + description : 'docbook suppress sp') + option('python', type : 'combo', choices : ['auto', 'true', 'false'], + description : 'Generate trac-cmd Python bindings') ++option('doc', type : 'boolean', value: true, ++ description : 'produce documentation') ++option('utest', type : 'boolean', value: true, ++ description : 'build utest') diff --git a/patches/trace-cmd-v3.3.1/series b/patches/trace-cmd-v3.3.1/series new file mode 100644 index 000000000000..f1269bcee145 --- /dev/null +++ b/patches/trace-cmd-v3.3.1/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-trace-cmd-meson-add-options-for-doc-and-utest-build.patch +# 926286b131781d169c103dd559e50a8e - git-ptx-patches magic diff --git a/rules/trace-cmd.in b/rules/trace-cmd.in index 5c1d37a8f2b6..891c1fd4068f 100644 --- a/rules/trace-cmd.in +++ b/rules/trace-cmd.in @@ -3,8 +3,12 @@ config TRACE_CMD tristate prompt "trace-cmd" + select HOST_MESON select LIBC_DL select GCCLIBS_GCC_S + select LIBTRACEEVENT + select LIBTRACEFS + select ZSTD help The trace-cmd command interacts with the Ftrace tracer that is built inside the Linux kernel. It interfaces with the diff --git a/rules/trace-cmd.make b/rules/trace-cmd.make index a46b8dc44ce6..4453ec4bdb97 100644 --- a/rules/trace-cmd.make +++ b/rules/trace-cmd.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_TRACE_CMD) += trace-cmd # # Paths and names # -TRACE_CMD_VERSION := 2.9.7 -TRACE_CMD_MD5 := 003988f6dd7cac3bf1da04af03d50b5b +TRACE_CMD_VERSION := 3.3.1 +TRACE_CMD_MD5 := 1164436073ca46527588c401856d94bd TRACE_CMD := trace-cmd-v$(TRACE_CMD_VERSION) TRACE_CMD_SUFFIX := tar.gz TRACE_CMD_URL := https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/$(TRACE_CMD).$(TRACE_CMD_SUFFIX) @@ -27,35 +27,20 @@ TRACE_CMD_LICENSE := GPL-2.0-only # Prepare # ---------------------------------------------------------------------------- -TRACE_CMD_CONF_TOOL := NO +TRACE_CMD_CONF_TOOL := meson -TRACE_CMD_MAKE_ENV := \ - $(CROSS_ENV) \ - CROSS_COMPILE=$(COMPILER_PREFIX) \ - NO_PYTHON=1 \ - prefix=/usr \ - libdir_relative=lib +TRACE_CMD_CONF_OPT := \ + $(CROSS_MESON_USR) \ + -Ddoc=false \ + -Dptrace=false \ + -Dpython=false \ + -Dutest=false \ + -Dvsock=false # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- -TRACE_CMD_PLUGINS := \ - blk \ - cfg80211 \ - futex \ - function \ - hrtimer \ - jbd2 \ - kmem \ - kvm \ - mac80211 \ - sched_switch \ - scsi \ - tlb \ - xen - - $(STATEDIR)/trace-cmd.targetinstall: @$(call targetinfo) @@ -67,10 +52,6 @@ $(STATEDIR)/trace-cmd.targetinstall: @$(call install_copy, trace-cmd, 0, 0, 0755, -, /usr/bin/trace-cmd) - @$(foreach plugin, $(TRACE_CMD_PLUGINS), \ - $(call install_lib, trace-cmd, 0, 0, 0644, \ - traceevent/plugins/plugin_$(plugin))$(ptx/nl)) - @$(call install_finish, trace-cmd) @$(call touch) -- 2.39.5 ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [ptxdist] [APPLIED] trace-cmd: version bump 2.9.7 -> 3.3.1 2024-12-10 10:56 ` [ptxdist] [PATCH 3/3] trace-cmd: version bump 2.9.7 -> 3.3.1 Lucas Stach @ 2025-01-10 7:44 ` Michael Olbrich 0 siblings, 0 replies; 9+ messages in thread From: Michael Olbrich @ 2025-01-10 7:44 UTC (permalink / raw) To: ptxdist; +Cc: Lucas Stach Thanks, applied as e639df4979e7e0ecafa661a90835f35edaa8fe26. Michael [sent from post-receive hook] On Fri, 10 Jan 2025 08:44:58 +0100, Lucas Stach <l.stach@pengutronix.de> wrote: > Plugins are now provided by the separate libtraceevent. > ZSTD is the preferred trace compression format. > Build system switched over to meson. > > Signed-off-by: Lucas Stach <l.stach@pengutronix.de> > Message-Id: <20241210105629.428090-3-l.stach@pengutronix.de> > Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> > > diff --git a/patches/trace-cmd-v3.3.1/0001-trace-cmd-meson-add-options-for-doc-and-utest-build.patch b/patches/trace-cmd-v3.3.1/0001-trace-cmd-meson-add-options-for-doc-and-utest-build.patch > new file mode 100644 > index 000000000000..225b9c9f804f > --- /dev/null > +++ b/patches/trace-cmd-v3.3.1/0001-trace-cmd-meson-add-options-for-doc-and-utest-build.patch > @@ -0,0 +1,47 @@ > +From: Lucas Stach <l.stach@pengutronix.de> > +Date: Tue, 10 Dec 2024 11:45:33 +0100 > +Subject: [PATCH] trace-cmd meson: add options for doc and utest build > + > +In some cases building documentation or utest is not desired. > +Add meson options to allow skipping those build targets. > + > +Signed-off-by: Lucas Stach <l.stach@pengutronix.de> > +--- > + meson.build | 5 ++++- > + meson_options.txt | 4 ++++ > + 2 files changed, 8 insertions(+), 1 deletion(-) > + > +diff --git a/meson.build b/meson.build > +index 4773f4a941b1..237d9b400ea5 100644 > +--- a/meson.build > ++++ b/meson.build > +@@ -140,9 +140,11 @@ subdir('lib/trace-cmd') > + # trace-cmd > + subdir('tracecmd') > + subdir('python') > +-if cunit_dep.found() > ++if get_option('utest') and cunit_dep.found() > + subdir('utest') > + endif > ++ > ++if get_option('doc') > + subdir('Documentation/trace-cmd') > + > + custom_target( > +@@ -150,3 +152,4 @@ custom_target( > + output: 'docs', > + depends: [html, man], > + command: ['echo']) > ++endif > +diff --git a/meson_options.txt b/meson_options.txt > +index 2d5d7457bed5..37d72ff29d87 100644 > +--- a/meson_options.txt > ++++ b/meson_options.txt > +@@ -21,3 +21,7 @@ option('docbook-suppress-sp', type : 'boolean', value : false, > + description : 'docbook suppress sp') > + option('python', type : 'combo', choices : ['auto', 'true', 'false'], > + description : 'Generate trac-cmd Python bindings') > ++option('doc', type : 'boolean', value: true, > ++ description : 'produce documentation') > ++option('utest', type : 'boolean', value: true, > ++ description : 'build utest') > diff --git a/patches/trace-cmd-v3.3.1/series b/patches/trace-cmd-v3.3.1/series > new file mode 100644 > index 000000000000..f1269bcee145 > --- /dev/null > +++ b/patches/trace-cmd-v3.3.1/series > @@ -0,0 +1,4 @@ > +# generated by git-ptx-patches > +#tag:base --start-number 1 > +0001-trace-cmd-meson-add-options-for-doc-and-utest-build.patch > +# 926286b131781d169c103dd559e50a8e - git-ptx-patches magic > diff --git a/rules/trace-cmd.in b/rules/trace-cmd.in > index 5c1d37a8f2b6..891c1fd4068f 100644 > --- a/rules/trace-cmd.in > +++ b/rules/trace-cmd.in > @@ -3,8 +3,12 @@ > config TRACE_CMD > tristate > prompt "trace-cmd" > + select HOST_MESON > select LIBC_DL > select GCCLIBS_GCC_S > + select LIBTRACEEVENT > + select LIBTRACEFS > + select ZSTD > help > The trace-cmd command interacts with the Ftrace tracer that > is built inside the Linux kernel. It interfaces with the > diff --git a/rules/trace-cmd.make b/rules/trace-cmd.make > index a46b8dc44ce6..4453ec4bdb97 100644 > --- a/rules/trace-cmd.make > +++ b/rules/trace-cmd.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_TRACE_CMD) += trace-cmd > # > # Paths and names > # > -TRACE_CMD_VERSION := 2.9.7 > -TRACE_CMD_MD5 := 003988f6dd7cac3bf1da04af03d50b5b > +TRACE_CMD_VERSION := 3.3.1 > +TRACE_CMD_MD5 := 1164436073ca46527588c401856d94bd > TRACE_CMD := trace-cmd-v$(TRACE_CMD_VERSION) > TRACE_CMD_SUFFIX := tar.gz > TRACE_CMD_URL := https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/$(TRACE_CMD).$(TRACE_CMD_SUFFIX) > @@ -27,35 +27,20 @@ TRACE_CMD_LICENSE := GPL-2.0-only > # Prepare > # ---------------------------------------------------------------------------- > > -TRACE_CMD_CONF_TOOL := NO > +TRACE_CMD_CONF_TOOL := meson > > -TRACE_CMD_MAKE_ENV := \ > - $(CROSS_ENV) \ > - CROSS_COMPILE=$(COMPILER_PREFIX) \ > - NO_PYTHON=1 \ > - prefix=/usr \ > - libdir_relative=lib > +TRACE_CMD_CONF_OPT := \ > + $(CROSS_MESON_USR) \ > + -Ddoc=false \ > + -Dptrace=false \ > + -Dpython=false \ > + -Dutest=false \ > + -Dvsock=false > > # ---------------------------------------------------------------------------- > # Target-Install > # ---------------------------------------------------------------------------- > > -TRACE_CMD_PLUGINS := \ > - blk \ > - cfg80211 \ > - futex \ > - function \ > - hrtimer \ > - jbd2 \ > - kmem \ > - kvm \ > - mac80211 \ > - sched_switch \ > - scsi \ > - tlb \ > - xen > - > - > $(STATEDIR)/trace-cmd.targetinstall: > @$(call targetinfo) > > @@ -67,10 +52,6 @@ $(STATEDIR)/trace-cmd.targetinstall: > > @$(call install_copy, trace-cmd, 0, 0, 0755, -, /usr/bin/trace-cmd) > > - @$(foreach plugin, $(TRACE_CMD_PLUGINS), \ > - $(call install_lib, trace-cmd, 0, 0, 0644, \ > - traceevent/plugins/plugin_$(plugin))$(ptx/nl)) > - > @$(call install_finish, trace-cmd) > > @$(call touch) ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [ptxdist] [APPLIED] libtraceevent: version bump 1.8.2 -> 1.8.4 2024-12-10 10:56 [ptxdist] [PATCH 1/3] libtraceevent: version bump 1.8.2 -> 1.8.4 Lucas Stach 2024-12-10 10:56 ` [ptxdist] [PATCH 2/3] libtracefs: new package Lucas Stach 2024-12-10 10:56 ` [ptxdist] [PATCH 3/3] trace-cmd: version bump 2.9.7 -> 3.3.1 Lucas Stach @ 2025-01-10 7:44 ` Michael Olbrich 2 siblings, 0 replies; 9+ messages in thread From: Michael Olbrich @ 2025-01-10 7:44 UTC (permalink / raw) To: ptxdist; +Cc: Lucas Stach Thanks, applied as b2fe6545432b71dbecae360c4576c39f63327934. Michael [sent from post-receive hook] On Fri, 10 Jan 2025 08:44:56 +0100, Lucas Stach <l.stach@pengutronix.de> wrote: > Signed-off-by: Lucas Stach <l.stach@pengutronix.de> > Message-Id: <20241210105629.428090-1-l.stach@pengutronix.de> > Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> > > diff --git a/rules/libtraceevent.make b/rules/libtraceevent.make > index 7acc9c9652c4..c78469068f58 100644 > --- a/rules/libtraceevent.make > +++ b/rules/libtraceevent.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBTRACEEVENT) += libtraceevent > # > # Paths and names > # > -LIBTRACEEVENT_VERSION := 1.8.2 > -LIBTRACEEVENT_MD5 := 671645965e835ef4236b96851fb889c9 > +LIBTRACEEVENT_VERSION := 1.8.4 > +LIBTRACEEVENT_MD5 := 2efaa25168e20ad5501393a25ed1cd01 > LIBTRACEEVENT := libtraceevent-$(LIBTRACEEVENT_VERSION) > LIBTRACEEVENT_SUFFIX := tar.xz > LIBTRACEEVENT_URL := https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git;tag=libtraceevent-$(LIBTRACEEVENT_VERSION) > @@ -60,7 +60,7 @@ $(STATEDIR)/libtraceevent.targetinstall: > @$(call install_lib, libtraceevent, 0, 0, 0644, libtraceevent) > > @for plugin in cfg80211 function futex hrtimer jbd2 kmem kvm mac80211 sched_switch scsi tlb xen; do \ > - $(call install_lib, libtraceevent, 0, 0, 0644, libtraceevent/plugins/plugin_$${plugin}); \ > + $(call install_lib, libtraceevent, 0, 0, 0644, traceevent/plugins/plugin_$${plugin}); \ > done > > @$(call install_finish, libtraceevent) ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2025-01-10 10:35 UTC | newest] Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2024-12-10 10:56 [ptxdist] [PATCH 1/3] libtraceevent: version bump 1.8.2 -> 1.8.4 Lucas Stach 2024-12-10 10:56 ` [ptxdist] [PATCH 2/3] libtracefs: new package Lucas Stach 2025-01-08 10:09 ` Roland Hieber 2025-01-10 8:32 ` Michael Olbrich 2025-01-10 10:34 ` Roland Hieber 2025-01-10 7:44 ` [ptxdist] [APPLIED] " Michael Olbrich 2024-12-10 10:56 ` [ptxdist] [PATCH 3/3] trace-cmd: version bump 2.9.7 -> 3.3.1 Lucas Stach 2025-01-10 7:44 ` [ptxdist] [APPLIED] " Michael Olbrich 2025-01-10 7:44 ` [ptxdist] [APPLIED] libtraceevent: version bump 1.8.2 -> 1.8.4 Michael Olbrich
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox