* [ptxdist] [PATCH 0/5] SPDX license expression fixes
@ 2026-03-12 13:08 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
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Markus Heidelberg via ptxdist @ 2026-03-12 13:08 UTC (permalink / raw)
To: ptxdist; +Cc: Markus Heidelberg
In the generated report I noticed wrong license categorization in some
packages and thus had a look over the PTXdist rules resulting in several
fixes/improvements.
The following invalid license identifiers have not been fixed.
That would require checking the projects about the license version or
the only/or-later choice. One exception is the "piglit" package because
with using a mix of v2+/v3/v2 it seemed very likely that only the naming
was not SPDX conform.
- BSD
- GPL
- LGPL
- GPL v2
- GPL2
- GPLv3
- LGPLv2
The last patch to allow standard conform lower case license expression
operators is marked as RFC. I think it is probably better to reject it
and to avoid problems by consistently using upper case operators.
Markus Heidelberg (5):
use canonical upper and lower case in SPDX license identifiers
use upper case SPDX license expression operators
fix some invalid SPDX license expressions/identifiers
glmark2: fix SPDX license identifier for SGI license
ptxd_make_world_license: allow lower case SPDX license expression
operators
rules/acl.make | 2 +-
rules/ensmallen.make | 2 +-
rules/figlet.make | 2 +-
rules/fontconfig.make | 2 +-
rules/glmark2.make | 2 +-
rules/glslang.make | 2 +-
rules/gpgme.make | 2 +-
rules/host-bindgen-cli.make | 2 +-
rules/host-cmake.make | 2 +-
rules/libarchive.make | 2 +-
rules/libev.make | 2 +-
rules/libkcapi.make | 2 +-
rules/libtasn1.make | 2 +-
rules/libtsm.make | 2 +-
rules/lvm2.make | 2 +-
rules/nodejs.make | 2 +-
rules/ntp.make | 2 +-
rules/openh264.make | 2 +-
rules/optee-test.make | 2 +-
rules/piglit.make | 2 +-
rules/sdl-ttf.make | 2 +-
rules/sdl2-image.make | 2 +-
rules/sdl2-mixer.make | 2 +-
rules/sdl2-net.make | 2 +-
rules/sdl2-test.make | 2 +-
rules/sdl2-ttf.make | 2 +-
rules/sdl2.make | 2 +-
rules/v4l-utils.make | 2 +-
rules/zstd.make | 2 +-
scripts/lib/ptxd_make_world_license.sh | 2 +-
30 files changed, 30 insertions(+), 30 deletions(-)
--
2.43.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* [ptxdist] [PATCH 1/5] use canonical upper and lower case in SPDX license identifiers
2026-03-12 13:08 [ptxdist] [PATCH 0/5] SPDX license expression fixes Markus Heidelberg via ptxdist
@ 2026-03-12 13:08 ` Markus Heidelberg via ptxdist
2026-03-12 13:08 ` [ptxdist] [PATCH 2/5] use upper case SPDX license expression operators Markus Heidelberg via ptxdist
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Markus Heidelberg via ptxdist @ 2026-03-12 13:08 UTC (permalink / raw)
To: ptxdist; +Cc: Markus Heidelberg
The license identifiers are case-insensitive, but according to the SPDX
specification it is "often important to match with the case of the
canonical identifier".
scripts/lib/ptxd_make_spdx.sh checks for the exact spelling, so these
licenses had wrongly been put into the "other" section, see output:
- platform-*/report/
- "license-section" in platform-*/release/full-bsp-report.yaml
Signed-off-by: Markus Heidelberg <m.heidelberg@cab.de>
---
rules/ensmallen.make | 2 +-
rules/figlet.make | 2 +-
rules/glslang.make | 2 +-
rules/host-cmake.make | 2 +-
rules/ntp.make | 2 +-
rules/sdl-ttf.make | 2 +-
rules/sdl2-image.make | 2 +-
rules/sdl2-mixer.make | 2 +-
rules/sdl2-net.make | 2 +-
rules/sdl2-test.make | 2 +-
rules/sdl2-ttf.make | 2 +-
rules/sdl2.make | 2 +-
rules/zstd.make | 2 +-
13 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/rules/ensmallen.make b/rules/ensmallen.make
index 0fb152d07..0a1ac7be7 100644
--- a/rules/ensmallen.make
+++ b/rules/ensmallen.make
@@ -21,7 +21,7 @@ ENSMALLEN_SUFFIX := tar.gz
ENSMALLEN_URL := https://www.ensmallen.org/files/$(ENSMALLEN).$(ENSMALLEN_SUFFIX)
ENSMALLEN_SOURCE := $(SRCDIR)/$(ENSMALLEN).$(ENSMALLEN_SUFFIX)
ENSMALLEN_DIR := $(BUILDDIR)/$(ENSMALLEN)
-ENSMALLEN_LICENSE := BSD-3-clause
+ENSMALLEN_LICENSE := BSD-3-Clause
ENSMALLEN_LICENSE_FILES := \
file://COPYRIGHT.txt;md5=2f1c587ba8b993d5d929e322d6dbdf72
diff --git a/rules/figlet.make b/rules/figlet.make
index 1dacd4703..af96d5d5f 100644
--- a/rules/figlet.make
+++ b/rules/figlet.make
@@ -23,7 +23,7 @@ FIGLET_SUFFIX := tar.gz
FIGLET_URL := https://github.com/cmatsuoka/figlet/archive/refs/tags/$(FIGLET_VERSION).$(FIGLET_SUFFIX)
FIGLET_SOURCE := $(SRCDIR)/$(FIGLET).$(FIGLET_SUFFIX)
FIGLET_DIR := $(BUILDDIR)/$(FIGLET)
-FIGLET_LICENSE := BSD-3-clause
+FIGLET_LICENSE := BSD-3-Clause
FIGLET_LICENSE_FILES := \
file://LICENSE;md5=1688bcd97b27704f1afcac7336409857
diff --git a/rules/glslang.make b/rules/glslang.make
index 8bdb6af55..68189b50f 100644
--- a/rules/glslang.make
+++ b/rules/glslang.make
@@ -21,7 +21,7 @@ GLSLANG_SUFFIX := tar.gz
GLSLANG_URL := https://github.com/KhronosGroup/glslang/archive/vulkan-sdk-$(GLSLANG_VERSION).$(GLSLANG_SUFFIX)
GLSLANG_SOURCE := $(SRCDIR)/$(GLSLANG).$(GLSLANG_SUFFIX)
GLSLANG_DIR := $(BUILDDIR)/$(GLSLANG)
-GLSLANG_LICENSE := BSD-3-clause AND BSD-2-clause AND MIT AND Apple-MIT-License AND Apache-2.0 AND (GPL-3.0-or-later WITH Bison-exception-2.2) AND custom
+GLSLANG_LICENSE := BSD-3-Clause AND BSD-2-Clause AND MIT AND Apple-MIT-License AND Apache-2.0 AND (GPL-3.0-or-later WITH Bison-exception-2.2) AND custom
GLSLANG_LICENSE_FILES := file://LICENSE.txt;md5=50ff9d0fcde2d5b953ebe431c48e34e3
# ----------------------------------------------------------------------------
diff --git a/rules/host-cmake.make b/rules/host-cmake.make
index 4e78cbc64..482263ca3 100644
--- a/rules/host-cmake.make
+++ b/rules/host-cmake.make
@@ -22,7 +22,7 @@ HOST_CMAKE_SUFFIX := tar.gz
HOST_CMAKE_URL := https://cmake.org/files/v$(basename $(HOST_CMAKE_VERSION))/$(HOST_CMAKE).$(HOST_CMAKE_SUFFIX)
HOST_CMAKE_SOURCE := $(SRCDIR)/$(HOST_CMAKE).$(HOST_CMAKE_SUFFIX)
HOST_CMAKE_DIR := $(HOST_BUILDDIR)/$(HOST_CMAKE)
-HOST_CMAKE_LICENSE := 0BSD AND BSD-2-clause AND BSD-3-Clause AND Apache-2.0 AND bzip2-1.0.6 AND (MIT OR public_domain) AND MIT AND curl
+HOST_CMAKE_LICENSE := 0BSD AND BSD-2-Clause AND BSD-3-Clause AND Apache-2.0 AND bzip2-1.0.6 AND (MIT OR public_domain) AND MIT AND curl
HOST_CMAKE_LICENSE_FILES := \
file://Copyright.txt;md5=718f05155941b33862726348d3cd46ce \
file://Source/kwsys/Copyright.txt;md5=64ed5ec90b0f9868cf0b08ea5b954dfe \
diff --git a/rules/ntp.make b/rules/ntp.make
index 429023645..9514bb434 100644
--- a/rules/ntp.make
+++ b/rules/ntp.make
@@ -24,7 +24,7 @@ NTP_URL := \
https://downloads.nwtime.org/ntp/$(NTP).$(NTP_SUFFIX)
NTP_SOURCE := $(SRCDIR)/$(NTP).$(NTP_SUFFIX)
NTP_DIR := $(BUILDDIR)/$(NTP)
-NTP_LICENSE := ntp
+NTP_LICENSE := NTP
NTP_LICENSE_FILES := file://COPYRIGHT;md5=2311915f6d5142b06395231b0ffeaf29
# ----------------------------------------------------------------------------
diff --git a/rules/sdl-ttf.make b/rules/sdl-ttf.make
index 2fcae7cd9..eeb4ca19b 100644
--- a/rules/sdl-ttf.make
+++ b/rules/sdl-ttf.make
@@ -21,7 +21,7 @@ SDL_TTF_SUFFIX := tar.gz
SDL_TTF_URL := http://www.libsdl.org/projects/SDL_ttf/release/$(SDL_TTF).$(SDL_TTF_SUFFIX)
SDL_TTF_SOURCE := $(SRCDIR)/$(SDL_TTF).$(SDL_TTF_SUFFIX)
SDL_TTF_DIR := $(BUILDDIR)/$(SDL_TTF)
-SDL_TTF_LICENSE := zlib
+SDL_TTF_LICENSE := Zlib
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/sdl2-image.make b/rules/sdl2-image.make
index 1b6c254e0..b710f40cb 100644
--- a/rules/sdl2-image.make
+++ b/rules/sdl2-image.make
@@ -21,7 +21,7 @@ SDL2_IMAGE_SUFFIX := tar.gz
SDL2_IMAGE_URL := https://github.com/libsdl-org/SDL_image/releases/download/release-$(SDL2_IMAGE_VERSION)/$(SDL2_IMAGE).$(SDL2_IMAGE_SUFFIX)
SDL2_IMAGE_SOURCE := $(SRCDIR)/$(SDL2_IMAGE).$(SDL2_IMAGE_SUFFIX)
SDL2_IMAGE_DIR := $(BUILDDIR)/$(SDL2_IMAGE)
-SDL2_IMAGE_LICENSE := zlib
+SDL2_IMAGE_LICENSE := Zlib
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/sdl2-mixer.make b/rules/sdl2-mixer.make
index 16523788d..c3159d016 100644
--- a/rules/sdl2-mixer.make
+++ b/rules/sdl2-mixer.make
@@ -21,7 +21,7 @@ SDL2_MIXER_SUFFIX := tar.gz
SDL2_MIXER_URL := https://www.libsdl.org/projects/SDL_mixer/release/$(SDL2_MIXER).$(SDL2_MIXER_SUFFIX)
SDL2_MIXER_SOURCE := $(SRCDIR)/$(SDL2_MIXER).$(SDL2_MIXER_SUFFIX)
SDL2_MIXER_DIR := $(BUILDDIR)/$(SDL2_MIXER)
-SDL2_MIXER_LICENSE := zlib
+SDL2_MIXER_LICENSE := Zlib
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/sdl2-net.make b/rules/sdl2-net.make
index 2249c2b68..305c1f7b0 100644
--- a/rules/sdl2-net.make
+++ b/rules/sdl2-net.make
@@ -21,7 +21,7 @@ SDL2_NET_SUFFIX := tar.gz
SDL2_NET_URL := https://www.libsdl.org/projects/SDL_net/release/$(SDL2_NET).$(SDL2_NET_SUFFIX)
SDL2_NET_SOURCE := $(SRCDIR)/$(SDL2_NET).$(SDL2_NET_SUFFIX)
SDL2_NET_DIR := $(BUILDDIR)/$(SDL2_NET)
-SDL2_NET_LICENSE := zlib
+SDL2_NET_LICENSE := Zlib
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/sdl2-test.make b/rules/sdl2-test.make
index 1917a2b3d..33bc3a8fe 100644
--- a/rules/sdl2-test.make
+++ b/rules/sdl2-test.make
@@ -22,7 +22,7 @@ SDL2_TEST_URL = $(SDL2_URL)
SDL2_TEST_SOURCE = $(SDL2_SOURCE)
SDL2_TEST_DIR = $(BUILDDIR)/$(SDL2_TEST)
SDL2_TEST_SUBDIR := test
-SDL2_TESTS_LICENSE := zlib
+SDL2_TESTS_LICENSE := Zlib
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/sdl2-ttf.make b/rules/sdl2-ttf.make
index d4b487dc3..3699a3dd1 100644
--- a/rules/sdl2-ttf.make
+++ b/rules/sdl2-ttf.make
@@ -21,7 +21,7 @@ SDL2_TTF_SUFFIX := tar.gz
SDL2_TTF_URL := https://www.libsdl.org/projects/SDL_ttf/release/$(SDL2_TTF).$(SDL2_TTF_SUFFIX)
SDL2_TTF_SOURCE := $(SRCDIR)/$(SDL2_TTF).$(SDL2_TTF_SUFFIX)
SDL2_TTF_DIR := $(BUILDDIR)/$(SDL2_TTF)
-SDL2_TTF_LICENSE := zlib
+SDL2_TTF_LICENSE := Zlib
SDL2_TTF_LICENSE_FILES := \
file://LICENSE.txt;md5=fbb0010b2f7cf6e8a13bcac1ef4d2455
diff --git a/rules/sdl2.make b/rules/sdl2.make
index 1e0604154..b288730f6 100644
--- a/rules/sdl2.make
+++ b/rules/sdl2.make
@@ -21,7 +21,7 @@ SDL2_SUFFIX := tar.gz
SDL2_URL := https://www.libsdl.org/release/$(SDL2).$(SDL2_SUFFIX)
SDL2_SOURCE := $(SRCDIR)/$(SDL2).$(SDL2_SUFFIX)
SDL2_DIR := $(BUILDDIR)/$(SDL2)
-SDL2_LICENSE := zlib
+SDL2_LICENSE := Zlib
# ----------------------------------------------------------------------------
# Prepare
diff --git a/rules/zstd.make b/rules/zstd.make
index e9c57d909..eb6a11282 100644
--- a/rules/zstd.make
+++ b/rules/zstd.make
@@ -22,7 +22,7 @@ ZSTD_URL := https://github.com/facebook/zstd/archive/v$(ZSTD_VERSION).$(ZSTD_SU
ZSTD_SOURCE := $(SRCDIR)/$(ZSTD).$(ZSTD_SUFFIX)
ZSTD_DIR := $(BUILDDIR)/$(ZSTD)
ZSTD_SUBDIR := build/cmake
-ZSTD_LICENSE := BSD-3-clause OR GPL-2.0-only
+ZSTD_LICENSE := BSD-3-Clause OR GPL-2.0-only
ZSTD_LICENSE_FILES := \
file://LICENSE;md5=0822a32f7acdbe013606746641746ee8 \
file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0
--
2.43.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* [ptxdist] [PATCH 2/5] use upper case SPDX license expression operators
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-12 13:08 ` Markus Heidelberg via ptxdist
2026-03-12 13:08 ` [ptxdist] [PATCH 3/5] fix some invalid SPDX license expressions/identifiers Markus Heidelberg via ptxdist
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Markus Heidelberg via ptxdist @ 2026-03-12 13:08 UTC (permalink / raw)
To: ptxdist; +Cc: Markus Heidelberg
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>
---
rules/fontconfig.make | 2 +-
rules/host-bindgen-cli.make | 2 +-
rules/libtasn1.make | 2 +-
rules/libtsm.make | 2 +-
rules/nodejs.make | 2 +-
rules/optee-test.make | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/rules/fontconfig.make b/rules/fontconfig.make
index d3357b6e0..98d19be10 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 fb54eafdb..28476bf63 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 440986d00..cb46df721 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 2986d2d05..7fa74667c 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 41d3ff44a..a11fa5a9b 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 31c56d182..fe1c40e8c 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
--
2.43.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* [ptxdist] [PATCH 3/5] fix some invalid SPDX license expressions/identifiers
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-12 13:08 ` [ptxdist] [PATCH 2/5] use upper case SPDX license expression operators Markus Heidelberg via ptxdist
@ 2026-03-12 13:08 ` Markus Heidelberg via ptxdist
2026-03-12 13:08 ` [ptxdist] [PATCH 4/5] glmark2: fix SPDX license identifier for SGI license Markus Heidelberg via ptxdist
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
4 siblings, 0 replies; 6+ messages in thread
From: Markus Heidelberg via ptxdist @ 2026-03-12 13:08 UTC (permalink / raw)
To: ptxdist; +Cc: Markus Heidelberg
Only the obvious mistakes without a look inside the projects.
Signed-off-by: Markus Heidelberg <m.heidelberg@cab.de>
---
rules/acl.make | 2 +-
rules/gpgme.make | 2 +-
rules/libarchive.make | 2 +-
rules/libev.make | 2 +-
rules/libkcapi.make | 2 +-
rules/lvm2.make | 2 +-
rules/openh264.make | 2 +-
rules/piglit.make | 2 +-
rules/v4l-utils.make | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/rules/acl.make b/rules/acl.make
index d00eeb71c..a3ccd4b7e 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 d9b37c179..2110e8c4b 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 28348ee79..69238bdf7 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 1f12a0d87..9db898801 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 0aba6ffec..eae2f9cc6 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 8d4f3a01d..6a976a962 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 f61430d06..b7c27c340 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 a59e95129..3678ccbde 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 8c6edf597..e1606f7f3 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 \
--
2.43.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* [ptxdist] [PATCH 4/5] glmark2: fix SPDX license identifier for SGI license
2026-03-12 13:08 [ptxdist] [PATCH 0/5] SPDX license expression fixes Markus Heidelberg via ptxdist
` (2 preceding siblings ...)
2026-03-12 13:08 ` [ptxdist] [PATCH 3/5] fix some invalid SPDX license expressions/identifiers Markus Heidelberg via ptxdist
@ 2026-03-12 13:08 ` Markus Heidelberg via ptxdist
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
4 siblings, 0 replies; 6+ messages in thread
From: Markus Heidelberg via ptxdist @ 2026-03-12 13:08 UTC (permalink / raw)
To: ptxdist; +Cc: Markus Heidelberg
The license text in COPYING.SGI matches
https://spdx.org/licenses/SGI-OpenGL
Signed-off-by: Markus Heidelberg <m.heidelberg@cab.de>
---
rules/glmark2.make | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rules/glmark2.make b/rules/glmark2.make
index d0638ac59..44229ae99 100644
--- a/rules/glmark2.make
+++ b/rules/glmark2.make
@@ -21,7 +21,7 @@ GLMARK2_SUFFIX := tar.gz
GLMARK2_URL := https://github.com/glmark2/glmark2/archive/$(GLMARK2_VERSION).$(GLMARK2_SUFFIX)
GLMARK2_SOURCE := $(SRCDIR)/$(GLMARK2).$(GLMARK2_SUFFIX)
GLMARK2_DIR := $(BUILDDIR)/$(GLMARK2)
-GLMARK2_LICENSE := GPL-3.0-only AND SGIv1
+GLMARK2_LICENSE := GPL-3.0-only AND SGI-OpenGL
GLMARK2_LICENSE_FILES := \
file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
file://COPYING.SGI;md5=7125c8894bd29eddfd44ede5ce3ab1e4
--
2.43.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* [ptxdist] [RFC PATCH 5/5] ptxd_make_world_license: allow lower case SPDX license expression operators
2026-03-12 13:08 [ptxdist] [PATCH 0/5] SPDX license expression fixes Markus Heidelberg via ptxdist
` (3 preceding siblings ...)
2026-03-12 13:08 ` [ptxdist] [PATCH 4/5] glmark2: fix SPDX license identifier for SGI license Markus Heidelberg via ptxdist
@ 2026-03-12 13:08 ` Markus Heidelberg via ptxdist
4 siblings, 0 replies; 6+ messages in thread
From: Markus Heidelberg via ptxdist @ 2026-03-12 13:08 UTC (permalink / raw)
To: ptxdist; +Cc: Markus Heidelberg
Besides the AND/OR/WITH operators, the lower case variants and/or/with
are valid since v3.0 of the SPDX specification.
Signed-off-by: Markus Heidelberg <m.heidelberg@cab.de>
---
scripts/lib/ptxd_make_world_license.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/lib/ptxd_make_world_license.sh b/scripts/lib/ptxd_make_world_license.sh
index 74048e207..5aa416672 100644
--- a/scripts/lib/ptxd_make_world_license.sh
+++ b/scripts/lib/ptxd_make_world_license.sh
@@ -322,7 +322,7 @@ ptxd_create_section_from_license()
echo ignore
return 0
;;
- AND|OR|WITH|"")
+ AND|OR|WITH|and|or|with|"")
;;
*)
section[other]="true"
--
2.43.0
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2026-03-12 13:09 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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-12 13:08 ` [ptxdist] [PATCH 2/5] use upper case SPDX license expression operators Markus Heidelberg via ptxdist
2026-03-12 13:08 ` [ptxdist] [PATCH 3/5] fix some invalid SPDX license expressions/identifiers Markus Heidelberg via ptxdist
2026-03-12 13:08 ` [ptxdist] [PATCH 4/5] glmark2: fix SPDX license identifier for SGI license Markus Heidelberg via ptxdist
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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox