From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Markus Heidelberg <m.heidelberg@cab.de>
Subject: Re: [ptxdist] [APPLIED] fix some invalid SPDX license expressions/identifiers
Date: Fri, 13 Mar 2026 14:03:14 +0100 [thread overview]
Message-ID: <20260313130314.2185867-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20260312130827.137022-4-m.heidelberg@cab.de>
Thanks, applied as 331afae8807c2d6c32d205854f827ade531be04e.
Michael
[sent from post-receive hook]
On Fri, 13 Mar 2026 14:03:14 +0100, Markus Heidelberg <m.heidelberg@cab.de> wrote:
> Only the obvious mistakes without a look inside the projects.
>
> Signed-off-by: Markus Heidelberg <m.heidelberg@cab.de>
> Message-Id: <20260312130827.137022-4-m.heidelberg@cab.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/acl.make b/rules/acl.make
> index d00eeb71cd1f..a3ccd4b7ec26 100644
> --- a/rules/acl.make
> +++ b/rules/acl.make
> @@ -24,7 +24,7 @@ ACL_DIR := $(BUILDDIR)/$(ACL)
> ACL_LICENSE := LGPL-2.1-or-later
> ACL_LICENSE_FILES:= file://doc/COPYING.LGPL;md5=9e9a206917f8af112da634ce3ab41764
> ifdef PTXCONF_ACL_TOOLS
> -ACL_LICENSE+= AND GPL-2.0.or-later
> +ACL_LICENSE+= AND GPL-2.0-or-later
> ACL_LICENSE_FILES+= file://doc/COPYING;md5=c781d70ed2b4d48995b790403217a249
> endif
>
> diff --git a/rules/gpgme.make b/rules/gpgme.make
> index d9b37c179496..2110e8c4ba35 100644
> --- a/rules/gpgme.make
> +++ b/rules/gpgme.make
> @@ -21,7 +21,7 @@ GPGME_SUFFIX := tar.bz2
> GPGME_URL := https://www.gnupg.org/ftp/gcrypt/gpgme/$(GPGME).$(GPGME_SUFFIX)
> GPGME_SOURCE := $(SRCDIR)/$(GPGME).$(GPGME_SUFFIX)
> GPGME_DIR := $(BUILDDIR)/$(GPGME)
> -GPGME_LICENSE := LGPLv2.1+
> +GPGME_LICENSE := LGPL-2.1-or-later
>
> # ----------------------------------------------------------------------------
> # Prepare
> diff --git a/rules/libarchive.make b/rules/libarchive.make
> index 28348ee794ae..69238bdf7ed3 100644
> --- a/rules/libarchive.make
> +++ b/rules/libarchive.make
> @@ -22,7 +22,7 @@ LIBARCHIVE_URL := https://www.libarchive.org/downloads/$(LIBARCHIVE).$(LIBARCHI
> LIBARCHIVE_SOURCE := $(SRCDIR)/$(LIBARCHIVE).$(LIBARCHIVE_SUFFIX)
> LIBARCHIVE_DIR := $(BUILDDIR)/$(LIBARCHIVE)
> LIBARCHIVE_LICENSE := BSD-2-Clause AND BSD-3-Clause AND public_domain AND \
> - (CC-0-1.0 OR OpenSSL OR Apache-2.0)
> + (CC0-1.0 OR OpenSSL OR Apache-2.0)
> LIBARCHIVE_LICENSE_FILES := file://COPYING;md5=7ce08437ff7f5e24d72e666313ae4084
>
> # ----------------------------------------------------------------------------
> diff --git a/rules/libev.make b/rules/libev.make
> index 1f12a0d8798b..9db898801ad1 100644
> --- a/rules/libev.make
> +++ b/rules/libev.make
> @@ -21,7 +21,7 @@ LIBEV_SUFFIX := tar.gz
> LIBEV_URL := http://dist.schmorp.de/libev/Attic/$(LIBEV).$(LIBEV_SUFFIX)
> LIBEV_SOURCE := $(SRCDIR)/$(LIBEV).$(LIBEV_SUFFIX)
> LIBEV_DIR := $(BUILDDIR)/$(LIBEV)
> -LIBEV_LICENSE := GPLv2+, BSD
> +LIBEV_LICENSE := GPL-2.0-or-later AND BSD
>
> # ----------------------------------------------------------------------------
> # Prepare
> diff --git a/rules/libkcapi.make b/rules/libkcapi.make
> index 0aba6ffecfe5..eae2f9cc6cf5 100644
> --- a/rules/libkcapi.make
> +++ b/rules/libkcapi.make
> @@ -21,7 +21,7 @@ LIBKCAPI_SUFFIX := tar.gz
> LIBKCAPI_URL := https://github.com/smuellerDD/libkcapi/archive/refs/tags/v$(LIBKCAPI_VERSION).$(LIBKCAPI_SUFFIX)
> LIBKCAPI_SOURCE := $(SRCDIR)/$(LIBKCAPI).$(LIBKCAPI_SUFFIX)
> LIBKCAPI_DIR := $(BUILDDIR)/$(LIBKCAPI)
> -LIBKCAPI_LICENSE := GPLv2+
> +LIBKCAPI_LICENSE := GPL-2.0-or-later
>
> # ----------------------------------------------------------------------------
> # Prepare
> diff --git a/rules/lvm2.make b/rules/lvm2.make
> index 8d4f3a01dcfd..6a976a9628c3 100644
> --- a/rules/lvm2.make
> +++ b/rules/lvm2.make
> @@ -23,7 +23,7 @@ LVM2_URL := \
> https://sourceware.org/pub/lvm2/old/$(LVM2).$(LVM2_SUFFIX)
> LVM2_SOURCE := $(SRCDIR)/$(LVM2).$(LVM2_SUFFIX)
> LVM2_DIR := $(BUILDDIR)/$(LVM2)
> -LVM2_LICENSE := GPL-2.0-only, LGPL-2.1-only
> +LVM2_LICENSE := GPL-2.0-only AND LGPL-2.1-only
> LVM2_LICENSE_FILES := \
> file://COPYING;md5=12713b4d9386533feeb07d6e4831765a \
> file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24
> diff --git a/rules/openh264.make b/rules/openh264.make
> index f61430d06975..b7c27c340726 100644
> --- a/rules/openh264.make
> +++ b/rules/openh264.make
> @@ -21,7 +21,7 @@ OPENH264_SUFFIX := tar.gz
> OPENH264_URL := https://github.com/cisco/openh264/archive/refs/tags/v$(OPENH264_VERSION).$(OPENH264_SUFFIX)
> OPENH264_SOURCE := $(SRCDIR)/$(OPENH264).$(OPENH264_SUFFIX)
> OPENH264_DIR := $(BUILDDIR)/$(OPENH264)
> -OPENH264_LICENSE := BSD 2-Clause
> +OPENH264_LICENSE := BSD-2-Clause
> OPENH264_LICENSE_FILES := file://LICENSE;md5=bb6d3771da6a07d33fd50d4d9aa73bcf
>
> # ----------------------------------------------------------------------------
> diff --git a/rules/piglit.make b/rules/piglit.make
> index a59e95129c33..3678ccbde050 100644
> --- a/rules/piglit.make
> +++ b/rules/piglit.make
> @@ -21,7 +21,7 @@ PIGLIT_SUFFIX := tar.gz
> PIGLIT_URL := https://gitlab.freedesktop.org/mesa/piglit/-/archive/$(PIGLIT_VERSION)/$(PIGLIT).$(PIGLIT_SUFFIX)
> PIGLIT_SOURCE := $(SRCDIR)/$(PIGLIT).$(PIGLIT_SUFFIX)
> PIGLIT_DIR := $(BUILDDIR)/$(PIGLIT)
> -PIGLIT_LICENSE := MIT AND GPLv2+ AND GPLv3 AND LGPLv2
> +PIGLIT_LICENSE := MIT AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-only
>
> # ----------------------------------------------------------------------------
> # Prepare
> diff --git a/rules/v4l-utils.make b/rules/v4l-utils.make
> index 8c6edf597f40..e1606f7f3768 100644
> --- a/rules/v4l-utils.make
> +++ b/rules/v4l-utils.make
> @@ -21,7 +21,7 @@ V4L_UTILS_SUFFIX := tar.xz
> V4L_UTILS_URL := http://linuxtv.org/downloads/v4l-utils/$(V4L_UTILS).$(V4L_UTILS_SUFFIX)
> V4L_UTILS_SOURCE := $(SRCDIR)/$(V4L_UTILS).$(V4L_UTILS_SUFFIX)
> V4L_UTILS_DIR := $(BUILDDIR)/$(V4L_UTILS)
> -V4L_UTILS_LICENSE := GPL-2.0-or-later (tools); LGPL-2.1-or-later (libs)
> +V4L_UTILS_LICENSE := GPL-2.0-or-later AND LGPL-2.1-or-later
> V4L_UTILS_LICENSE_FILES := \
> file://COPYING;md5=0ebceacbd7029b5e7051e9f529542b7c \
> file://COPYING.libdvbv5;md5=209de6465458b9065125bd859a3081be \
next prev parent reply other threads:[~2026-03-13 13:03 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-12 13:08 [ptxdist] [PATCH 0/5] SPDX license expression fixes Markus Heidelberg via ptxdist
2026-03-12 13:08 ` [ptxdist] [PATCH 1/5] use canonical upper and lower case in SPDX license identifiers Markus Heidelberg via ptxdist
2026-03-13 13:03 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-03-12 13:08 ` [ptxdist] [PATCH 2/5] use upper case SPDX license expression operators Markus Heidelberg via ptxdist
2026-03-13 13:03 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-03-12 13:08 ` [ptxdist] [PATCH 3/5] fix some invalid SPDX license expressions/identifiers Markus Heidelberg via ptxdist
2026-03-13 13:03 ` Michael Olbrich [this message]
2026-03-12 13:08 ` [ptxdist] [PATCH 4/5] glmark2: fix SPDX license identifier for SGI license Markus Heidelberg via ptxdist
2026-03-13 13:03 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-03-12 13:08 ` [ptxdist] [RFC PATCH 5/5] ptxd_make_world_license: allow lower case SPDX license expression operators Markus Heidelberg via ptxdist
2026-03-13 13:03 ` [ptxdist] [APPLIED] " Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260313130314.2185867-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=m.heidelberg@cab.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox