From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 06 Oct 2026 09:01:45 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1xDzBJ-00AOtH-1d for lore@lore.pengutronix.de; Tue, 06 Oct 2026 09:01:45 +0200 Received: from [127.0.0.1] (helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1xDzBI-0000tK-3f; Tue, 06 Oct 2026 09:01:44 +0200 Received: from mx1.white.stw.pengutronix.de ([185.203.200.13]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1xDzAv-0000Lb-7k for ptxdist@pengutronix.de; Tue, 06 Oct 2026 09:01:21 +0200 Received: from dude05.red.stw.pengutronix.de (dude05.red.stw.4.pengutronix.de [10.17.1.19]) (Authenticated sender: relay-from-dude05.red.stw.pengutronix.de) by mx1.white.stw.pengutronix.de (Postfix) with ESMTPSA id 2F2C22012A4; Tue, 06 Oct 2026 09:01:21 +0200 (CEST) ARC-Seal: i=1; s=20260414; d=pengutronix.de; t=1791270081; a=rsa-sha256; cv=none; b=bpyz79Kq22Bo95D+M1RGTWJgan6kxrjMS60UfAavmX+5LY7cLzrcxOe+PoxZJZuvcP1wZv c/kRmrLK/H8gZ+sscdpW9llPwCZ4U3BJyptsRLALhljqTJbG6yR05E520lftOsimKGqQAm X8BMoOd6OW6i6abiBu4wRhwOYS9kbIaBQT2HcaReHaXaAXJPWbD7GT2ZeVPcb2OxyX/gZC kM2G02KVzDtWr9QyUukFwJOh7Kkmfncnf9eq8/sKgqd+TwsvwuuW9vky3eIGncgeFhJNR5 x1iP0pvexTHKBxvvTX6zpQK61G6WQsLluZ5FEI8spNUEw5A0aWo/Ajb6q+xMYw== ARC-Authentication-Results: i=1; ORIGINATING; auth=pass smtp.auth=relay-from-dude05.red.stw.pengutronix.de smtp.mailfrom=mol@pengutronix.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=pengutronix.de; s=20260414; t=1791270081; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=n0TKoLkGvhwCB5IZies+m06cmvIBdAOx+eeaXeSsHSQ=; b=TAjgZqkPlv0hU6w1N+06WjqRRJbWvD7ZGRuSLCW5ssbzIAAcxpNRzIdlsZrlCwBeM0itcZ DRNoWmsLq/PsUj4Ff8O6AUf1xkpJrC3hOPw+4dFRKHSm1ETfpfiCXcUbZBozFuaYIaYGmI mdBOYpP1Jd7V1CilDhiIdDN0GKuwdzMumDgVd7Na9ZSXbGS0bunxkz70yof+Nh6WTrqLbK sD6NgwahTbr/b+LqW3A/PyutaDCpw/rACcG1s6QrtCDK7GFXvKPfmHcTFZ5HyBic5H2aRg nFIlR9o6iluIRmDpm0P+j3tgyCzn1GDiG6AqVzUW9PTjOPSkIdRZRX9mf0Co9g== Received: by dude05.red.stw.pengutronix.de (Postfix, from userid 1014) id 20565742505; Tue, 06 Oct 2026 09:01:21 +0200 (CEST) From: Michael Olbrich To: ptxdist@pengutronix.de Date: Tue, 6 Oct 2026 09:01:21 +0200 Message-ID: <20261006070121.2792089-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260922121340.2438019-2-s.pueschel@pengutronix.de> References: <20260922121340.2438019-2-s.pueschel@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-3.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU autolearn=ham autolearn_force=no version=3.4.2 Subject: Re: [ptxdist] [APPLIED] trace-cmd: version bump 3.3.1 -> 3.4 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: =?UTF-8?q?Sven=20P=C3=BCschel?= Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 69585c897d15d677bcadeec4adc2b899222458aa. Michael [sent from post-receive hook] On Tue, 06 Oct 2026 09:01:21 +0200, Sven Püschel 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 > Message-Id: <20260922121340.2438019-2-s.pueschel@pengutronix.de> > Signed-off-by: Michael Olbrich > > 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 > -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 > ---- > - 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