Thanks, applied as 69585c897d15d677bcadeec4adc2b899222458aa. Michael
[sent from post-receive hook] On Tue, 06 Oct 2026 09:01:21 +0200, Sven Püschel <[email protected]> wrote: > The meson patch is now upstreamed and therefore removed. > > The license folder also contains the LGPL-2.1 license. > This is mainly used for the library (which we don't install). > But as trace-cmd also uses LGPL-2.1 header files and it's compilation > fails without them (tested with the list.h header), > add the LGPL-2.1 license (with the newer LGPL-2.1-only naming). > > Signed-off-by: Sven Püschel <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > 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 > deleted file mode 100644 > index 225b9c9f804f..000000000000 > --- > a/patches/trace-cmd-v3.3.1/0001-trace-cmd-meson-add-options-for-doc-and-utest-build.patch > +++ /dev/null > @@ -1,47 +0,0 @@ > -From: Lucas Stach <[email protected]> > -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 <[email protected]> > ---- > - 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 > deleted file mode 100644 > index f1269bcee145..000000000000 > --- a/patches/trace-cmd-v3.3.1/series > +++ /dev/null > @@ -1,4 +0,0 @@ > -# 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.make b/rules/trace-cmd.make > index dcebed969b20..d2e1ec0e6b3e 100644 > --- a/rules/trace-cmd.make > +++ b/rules/trace-cmd.make > @@ -14,14 +14,20 @@ PACKAGES-$(PTXCONF_TRACE_CMD) += trace-cmd > # > # Paths and names > # > -TRACE_CMD_VERSION := 3.3.1 > -TRACE_CMD_SHA256 := > 2efe103389367e93c764c4a788880ba51018a65dec21b0411965a5f06a6338c1 > +TRACE_CMD_VERSION := 3.4 > +TRACE_CMD_SHA256 := > 604085ab395cc2cb84397dc3d209ea0d0b15ae506f8ea91ff45c86e5a050213c > 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) > TRACE_CMD_SOURCE := $(SRCDIR)/$(TRACE_CMD).$(TRACE_CMD_SUFFIX) > TRACE_CMD_DIR := $(BUILDDIR)/$(TRACE_CMD) > -TRACE_CMD_LICENSE := GPL-2.0-only > +TRACE_CMD_LICENSE := LGPL-2.1-only AND GPL-2.0-only > +TRACE_CMD_LICENSE_FILES := \ > + file://COPYING;md5=873f48a813bded3de6ebc54e6880c4ac \ > + file://LICENSES/GPL-2.0;md5=e6a75371ba4d16749254a51215d13f97 \ > + file://LICENSES/LGPL-2.1;md5=b370887980db5dd40659b50909238dbd \ > + > file://tracecmd/trace-cmd.c;startline=1;endline=5;md5=2d40f2034a6256f8c0626afae63d082e > \ > + > file://tracecmd/include/list.h;startline=1;endline=5;md5=59c09346cdcb6e83d9dcb190e3ea6e87 > > # > ---------------------------------------------------------------------------- > # Prepare
