mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] libtraceevent: Use AND and not + in SPDX license identifiers
@ 2025-04-21  9:23 Bruno Thomsen
  2025-05-09  7:25 ` [ptxdist] [APPLIED] " Michael Olbrich
  0 siblings, 1 reply; 2+ messages in thread
From: Bruno Thomsen @ 2025-04-21  9:23 UTC (permalink / raw)
  To: ptxdist; +Cc: bruno.thomsen

Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
 rules/libtraceevent.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/libtraceevent.make b/rules/libtraceevent.make
index c78469068..ecc4a2dc0 100644
--- a/rules/libtraceevent.make
+++ b/rules/libtraceevent.make
@@ -21,7 +21,7 @@ LIBTRACEEVENT_SUFFIX	:= tar.xz
 LIBTRACEEVENT_URL	:= https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git;tag=libtraceevent-$(LIBTRACEEVENT_VERSION)
 LIBTRACEEVENT_SOURCE	:= $(SRCDIR)/$(LIBTRACEEVENT).$(LIBTRACEEVENT_SUFFIX)
 LIBTRACEEVENT_DIR	:= $(BUILDDIR)/$(LIBTRACEEVENT)
-LIBTRACEEVENT_LICENSE	:= LGPL-2.1 + GPL-2.0
+LIBTRACEEVENT_LICENSE	:= LGPL-2.1 AND GPL-2.0
 
 # ----------------------------------------------------------------------------
 # Prepare

base-commit: f61905c23240642dec3e5390ee15e83cf1e016e9
-- 
2.49.0




^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [ptxdist] [APPLIED] libtraceevent: Use AND and not + in SPDX license identifiers
  2025-04-21  9:23 [ptxdist] [PATCH] libtraceevent: Use AND and not + in SPDX license identifiers Bruno Thomsen
@ 2025-05-09  7:25 ` Michael Olbrich
  0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2025-05-09  7:25 UTC (permalink / raw)
  To: ptxdist; +Cc: Bruno Thomsen

Thanks, applied as 3d14f06e7ff93bff1cacaedede61ed3f9f5e6635.

Michael

[sent from post-receive hook]

On Fri, 09 May 2025 09:25:17 +0200, Bruno Thomsen <bruno.thomsen@gmail.com> wrote:
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> Message-Id: <20250421092309.104539-1-bruno.thomsen@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/libtraceevent.make b/rules/libtraceevent.make
> index c78469068f58..ecc4a2dc022e 100644
> --- a/rules/libtraceevent.make
> +++ b/rules/libtraceevent.make
> @@ -21,7 +21,7 @@ LIBTRACEEVENT_SUFFIX	:= tar.xz
>  LIBTRACEEVENT_URL	:= https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git;tag=libtraceevent-$(LIBTRACEEVENT_VERSION)
>  LIBTRACEEVENT_SOURCE	:= $(SRCDIR)/$(LIBTRACEEVENT).$(LIBTRACEEVENT_SUFFIX)
>  LIBTRACEEVENT_DIR	:= $(BUILDDIR)/$(LIBTRACEEVENT)
> -LIBTRACEEVENT_LICENSE	:= LGPL-2.1 + GPL-2.0
> +LIBTRACEEVENT_LICENSE	:= LGPL-2.1 AND GPL-2.0
>  
>  # ----------------------------------------------------------------------------
>  # Prepare



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2025-05-09  7:30 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-04-21  9:23 [ptxdist] [PATCH] libtraceevent: Use AND and not + in SPDX license identifiers Bruno Thomsen
2025-05-09  7:25 ` [ptxdist] [APPLIED] " Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox