From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Markus Heidelberg <m.heidelberg@cab.de>
Subject: Re: [ptxdist] [APPLIED] use upper case SPDX license expression operators
Date: Fri, 13 Mar 2026 14:03:13 +0100 [thread overview]
Message-ID: <20260313130313.2185825-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20260312130827.137022-3-m.heidelberg@cab.de>
Thanks, applied as 5ca485b8d878daf9dc5629c6d1468351b4fca747.
Michael
[sent from post-receive hook]
On Fri, 13 Mar 2026 14:03:13 +0100, Markus Heidelberg <m.heidelberg@cab.de> wrote:
> Besides the AND/OR/WITH operators, the lower case variants and/or/with
> are valid since v3.0 of the SPDX specification, but not supported in
> scripts/lib/ptxd_make_world_license.sh.
> Instead of (or additionally to) implementing them there, change them for
> consistency in the rules files.
>
> Fixes wrong placement of the licenses into the "other" section.
>
> Signed-off-by: Markus Heidelberg <m.heidelberg@cab.de>
> Message-Id: <20260312130827.137022-3-m.heidelberg@cab.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/fontconfig.make b/rules/fontconfig.make
> index d3357b6e0c25..98d19be10f5c 100644
> --- a/rules/fontconfig.make
> +++ b/rules/fontconfig.make
> @@ -21,7 +21,7 @@ FONTCONFIG_SUFFIX := tar.gz
> FONTCONFIG_URL := https://gitlab.freedesktop.org/fontconfig/fontconfig/-/archive/$(FONTCONFIG_VERSION)/$(FONTCONFIG).$(FONTCONFIG_SUFFIX)
> FONTCONFIG_SOURCE := $(SRCDIR)/$(FONTCONFIG).$(FONTCONFIG_SUFFIX)
> FONTCONFIG_DIR := $(BUILDDIR)/$(FONTCONFIG)
> -FONTCONFIG_LICENSE := HPND-sell-variant AND MIT AND custom AND MIT-Modern-Variant AND Unicode-TOU and public_domain
> +FONTCONFIG_LICENSE := HPND-sell-variant AND MIT AND custom AND MIT-Modern-Variant AND Unicode-TOU AND public_domain
> FONTCONFIG_LICENSE_FILES := \
> file://COPYING;md5=00252fd272bf2e722925613ad74cb6c7 \
> file://src/ftglue.c;startline=1;endline=8;md5=789386c3d7c853bbce055520a11aaeb9 \
> diff --git a/rules/host-bindgen-cli.make b/rules/host-bindgen-cli.make
> index fb54eafdb6a2..28476bf63423 100644
> --- a/rules/host-bindgen-cli.make
> +++ b/rules/host-bindgen-cli.make
> @@ -21,7 +21,7 @@ HOST_BINDGEN_CLI_SUFFIX := tar.gz
> HOST_BINDGEN_CLI_URL := https://crates.io/api/v1/crates/bindgen-cli/$(HOST_BINDGEN_CLI_VERSION)/download
> HOST_BINDGEN_CLI_SOURCE := $(SRCDIR)/$(HOST_BINDGEN_CLI).$(HOST_BINDGEN_CLI_SUFFIX)
> HOST_BINDGEN_CLI_DIR := $(HOST_BUILDDIR)/$(HOST_BINDGEN_CLI)
> -HOST_BINDGEN_CLI_LICENSE := BSD-3-Clause and unknown
> +HOST_BINDGEN_CLI_LICENSE := BSD-3-Clause AND unknown
> HOST_BINDGEN_CLI_LICENSE_FILES := \
> file://LICENSE;md5=0b9a98cb3dcdefcceb145324693fda9b
>
> diff --git a/rules/libtasn1.make b/rules/libtasn1.make
> index 440986d00247..cb46df72114c 100644
> --- a/rules/libtasn1.make
> +++ b/rules/libtasn1.make
> @@ -21,7 +21,7 @@ LIBTASN1_SUFFIX := tar.gz
> LIBTASN1_URL := $(call ptx/mirror, GNU, libtasn1/$(LIBTASN1).$(LIBTASN1_SUFFIX))
> LIBTASN1_SOURCE := $(SRCDIR)/$(LIBTASN1).$(LIBTASN1_SUFFIX)
> LIBTASN1_DIR := $(BUILDDIR)/$(LIBTASN1)
> -LIBTASN1_LICENSE := GPL-3.0-or-later or LGPL-2.1-or-later
> +LIBTASN1_LICENSE := GPL-3.0-or-later OR LGPL-2.1-or-later
> LIBTASN1_LICENSE_FILES := \
> file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \
> file://COPYING.LESSERv2;md5=4bf661c1e3793e55c8d1051bc5e0ae21 \
> diff --git a/rules/libtsm.make b/rules/libtsm.make
> index 2986d2d05c54..7fa74667cde7 100644
> --- a/rules/libtsm.make
> +++ b/rules/libtsm.make
> @@ -21,7 +21,7 @@ LIBTSM_SUFFIX := tar.gz
> LIBTSM_URL := https://github.com/kmscon/libtsm/archive/refs/tags/v$(LIBTSM_VERSION).$(LIBTSM_SUFFIX)
> LIBTSM_SOURCE := $(SRCDIR)/$(LIBTSM).$(LIBTSM_SUFFIX)
> LIBTSM_DIR := $(BUILDDIR)/$(LIBTSM)
> -LIBTSM_LICENSE := MIT and BSD-2-Clause
> +LIBTSM_LICENSE := MIT AND BSD-2-Clause
> LIBTSM_LICENSE_FILES := file://COPYING;md5=69e8256cdc4e949f86fedf94b1b320b4
>
> # ----------------------------------------------------------------------------
> diff --git a/rules/nodejs.make b/rules/nodejs.make
> index 41d3ff44ad53..a11fa5a9b11e 100644
> --- a/rules/nodejs.make
> +++ b/rules/nodejs.make
> @@ -24,7 +24,7 @@ NODEJS_SUFFIX := tar.xz
> NODEJS_URL := http://nodejs.org/dist/$(NODEJS_VERSION)/$(NODEJS).$(NODEJS_SUFFIX)
> NODEJS_SOURCE := $(SRCDIR)/$(NODEJS).$(NODEJS_SUFFIX)
> NODEJS_DIR := $(BUILDDIR)/$(NODEJS)
> -NODEJS_LICENSE := MIT AND ISC AND BSD-3-Clause AND BSD-2-Clause AND Apache-2.0 AND Unicode-3.0 and NAIST-2003
> +NODEJS_LICENSE := MIT AND ISC AND BSD-3-Clause AND BSD-2-Clause AND Apache-2.0 AND Unicode-3.0 AND NAIST-2003
> NODEJS_LICENSE_FILES := \
> file://LICENSE;md5=ac91fab5dbaf757274d2b29888f943ef
>
> diff --git a/rules/optee-test.make b/rules/optee-test.make
> index 31c56d1827a7..fe1c40e8c90e 100644
> --- a/rules/optee-test.make
> +++ b/rules/optee-test.make
> @@ -23,7 +23,7 @@ OPTEE_TEST_SUFFIX := tar.gz
> OPTEE_TEST_URL := https://github.com/OP-TEE/optee_test/archive/$(OPTEE_TEST_VERSION).$(OPTEE_TEST_SUFFIX)
> OPTEE_TEST_SOURCE := $(SRCDIR)/$(OPTEE_TEST).$(OPTEE_TEST_SUFFIX)
> OPTEE_TEST_DIR := $(BUILDDIR)/$(OPTEE_TEST)
> -OPTEE_TEST_LICENSE := BSD-2-Clause and GPL-2.0
> +OPTEE_TEST_LICENSE := BSD-2-Clause AND GPL-2.0
> OPTEE_TEST_LICENSE_FILES := \
> file://LICENSE-BSD;md5=dca16d6efa93b55d0fd662ae5cd6feeb \
> file://LICENSE-GPL;md5=10e86b5d2a6cb0e2b9dcfdd26a9ac58d
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 ` Michael Olbrich [this message]
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 ` [ptxdist] [APPLIED] " Michael Olbrich
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=20260313130313.2185825-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