[ptxdist] [PATCH 2/5] use upper case SPDX license expression operators

[Markus Heidelberg via ptxdist <ptxdist@pengutronix.de>]

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