From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 12 Mar 2026 14:09:35 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1w0fnC-00ApdG-1N for lore@lore.pengutronix.de; Thu, 12 Mar 2026 14:09:35 +0100 Received: from [127.0.0.1] (helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1w0fnD-0004ak-2w; Thu, 12 Mar 2026 14:09:35 +0100 Received: from mx07-007fc201.pphosted.com ([185.132.181.212]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1w0fmy-0004PE-Gw for ptxdist@pengutronix.de; Thu, 12 Mar 2026 14:09:22 +0100 Received: from pps.filterd (m0456228.ppops.net [127.0.0.1]) by mx07-007fc201.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62CColQL1596109 for ; Thu, 12 Mar 2026 14:09:20 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cab.de; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pp-2025; bh=YE sR4SBjqDM1iWpMi025hLOi9aHECf/a8dSL99Z+W1M=; b=tiFQdJSPnwMcYtKviV EIpFHg5JID3bWgfdVlUCvVy089WN/9d19CUl8BeOj4p4he5Qq59MhzvHRpa40sNT PlXj/a4MDcnAOC5tkbauaziUEhHga8CeabmnvzIV0ViLH95ygeWx/ShwObqJYwxa klwomV4YP/9J/WPw/fxwgXBOyBxYyLRsZYxTFYFjDu94+23idP3Vuw5xhus/nqLx pVBscVfVxiqvCW9t0MPK74RfiNTwgK40LV0GMd2ZSDAvuclAfKaDNAzbovHBlg2u BZt2gCfiG60Pa8kNxlojW43n7Sa0wFlNVipSwNxkpfYjC2285PXK1izBsnz3w4ey F+fA== Received: from adranos.cab.de (adranos.cab.de [46.232.229.107]) by mx07-007fc201.pphosted.com (PPS) with ESMTPS id 4cuh6088be-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 12 Mar 2026 14:09:19 +0100 (CET) Received: from KAN23-025.cab.de (10.10.3.180) by Adranos.cab.de (10.10.1.54) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.37; Thu, 12 Mar 2026 14:09:19 +0100 To: Date: Thu, 12 Mar 2026 14:08:23 +0100 Message-ID: <20260312130827.137022-3-m.heidelberg@cab.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260312130827.137022-1-m.heidelberg@cab.de> References: <20260312130827.137022-1-m.heidelberg@cab.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.10.3.180] X-ClientProxiedBy: Adranos.cab.de (10.10.1.54) To Adranos.cab.de (10.10.1.54) X-Proofpoint-GUID: b27ygOU1uxmlqWYpxfo4w7El2RYKABeq X-Proofpoint-ORIG-GUID: b27ygOU1uxmlqWYpxfo4w7El2RYKABeq X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzEyMDEwNCBTYWx0ZWRfX18DCqh/TrUZW ezix4JFkGCbNlXhWPdcUxbVIJ1gchsrASfl5PUfAMgI0Dtwo8fxxGLW8x8t2pfzjywj/E9hfKoS NbqaaKUHHKctSJi4cq1jHK6qh4oV1L6ltfUTvj/39tzbmQfnIZHIkJQSBtEyOxfHiMVGSR3lX8/ dFo2nE+WrX7NLdDl7nAzIlPJwIpgat8fM6kaNxw74fRVo8vjTvLGFXhKUK2nDcawiuhkmrgTISU vMBMy5AHL/wOciYSxhbqQfb3XrZkVcDFHgJXfUKwFwzRFUn+oPoLr/WYuYSDhJs5PTBe1Acf/pk WWuET5VVDJRmeh7mqE0/3W1ZbsZT7JtwWVpehNGCmIuukacmkWtEazloQVbc2f727Pg9o0tTQ7n 1nA1NzVCnBhtCyd9ud87XXyreSUgEDjAFqyekpQa1YBQBCwL+BMaOaFwSEn0Le+9Iya2SfKNIH0 YXoli6y8NtVCSgPyLcQ== X-Authority-Analysis: v=2.4 cv=E9/AZKdl c=1 sm=1 tr=0 ts=69b2baff cx=c_pps a=LmW7qmVeM6tFdl5svFU9Cg==:117 a=LmW7qmVeM6tFdl5svFU9Cg==:17 a=kldc_9v1VKEA:10 a=Yq5XynenixoA:10 a=VkNPw1HP01LnGYTKEx00:22 a=cWcFGAZ52ywjfBe9x-Am:22 a=z9Sxt0DssY18wmaVz86D:22 a=e5mUnYsNAAAA:8 a=OcE5tU-iAAAA:8 a=NEAV23lmAAAA:8 a=-LCu6K_DAAAA:8 a=RAEbLpG9y-X-mb7MCPsA:9 a=Vxmtnl_E_bksehYqCbjh:22 a=qwkNQZnGtIHGNKTLT1RO:22 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-1.8 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH 2/5] use upper case SPDX license expression operators X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Markus Heidelberg via ptxdist Reply-To: ptxdist@pengutronix.de Cc: Markus Heidelberg Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false 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 --- 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