From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 12 Mar 2026 14:09:36 +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 1w0fnD-00Apdc-2D for lore@lore.pengutronix.de; Thu, 12 Mar 2026 14:09:36 +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 1w0fnE-0004fk-8t; Thu, 12 Mar 2026 14:09:36 +0100 Received: from mx08-007fc201.pphosted.com ([91.207.212.40]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1w0fmz-0004PX-Qt for ptxdist@pengutronix.de; Thu, 12 Mar 2026 14:09:24 +0100 Received: from pps.filterd (m0456229.ppops.net [127.0.0.1]) by mx08-007fc201.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62CD9LLv1578102; Thu, 12 Mar 2026 14:09:21 +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=3/ RDpKRq5P0aTQd/xGDiFGQYIOLrPRvy8UkdX7zQrSw=; b=O3F/ZXnMvMkMyIxRfc Ffw/WoG/K5thxq6A/BelnIHfYuS1n3dMawhWLG0TAqUrZK1/EgkY+JoFTuuE9Ai4 DTis35qBNBAGaUB2/kjjaSZ43Um5viqtatmG4wtU+PcSZ4APKs9C23IvnQw7P9T7 3THaJB/r7Kd0FViG5e9DlaJRValYa7rWQQsBmJ1I2R+UgpyBPQ0cGgjkChFcfuSA bq+6XSre0elDNmT0RlZLlGf/b3UqAHlsFIjgXkCSC4HLV6XG1Q/hLp7LWG3b6bAf 6yHstXCFNkVEmJ7QxWHcTPbxNTdB8wyJrZTOlNeRf75bsGHu6DG2i5D0dGHK1hX6 XtJA== Received: from adranos.cab.de (adranos.cab.de [46.232.229.107]) by mx08-007fc201.pphosted.com (PPS) with ESMTPS id 4cuh5pg7wd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 12 Mar 2026 14:09:21 +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:21 +0100 To: Date: Thu, 12 Mar 2026 14:08:24 +0100 Message-ID: <20260312130827.137022-4-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-ORIG-GUID: ghdTOXocFeclxuC3dJ5dvMvs62DCCmP9 X-Authority-Analysis: v=2.4 cv=BfnVE7t2 c=1 sm=1 tr=0 ts=69b2bb01 cx=c_pps a=LmW7qmVeM6tFdl5svFU9Cg==:117 a=LmW7qmVeM6tFdl5svFU9Cg==:17 a=kldc_9v1VKEA:10 a=Yq5XynenixoA:10 a=VkNPw1HP01LnGYTKEx00:22 a=cWcFGAZ52ywjfBe9x-Am:22 a=fhGH0ZMTm4w8Nt5gLHlq:22 a=GwUem0DFAAAA:8 a=3uWsZ661AAAA:8 a=561Vo0wAAAAA:8 a=NEAV23lmAAAA:8 a=CCpqsmhAAAAA:8 a=e5mUnYsNAAAA:8 a=xq3W2uTSAAAA:8 a=J0dZVwT4wOPnjXWvMyMA:9 a=r0dl5i_q2XGqDZkti5dn:22 a=fYNom5PXsM5enKJDCoVv:22 a=pGV5B61SGPbAHu_EfFT_:22 a=ul9cdbp4aOFLsgKbc677:22 a=Vxmtnl_E_bksehYqCbjh:22 a=P5L7wpMTXyg1GfFA3Gwx:22 X-Proofpoint-GUID: ghdTOXocFeclxuC3dJ5dvMvs62DCCmP9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzEyMDEwNCBTYWx0ZWRfX01fCoV5AseSs 77scBPBpgSKWUfaTwpf0TGZZiYQ23OyVb8wLtN6oRC0JrBELwivGTx5DI91d9YSSbjK1Kho8Qx8 vU9NGMCy+xoyxMXXu72gC/GYVRunO8mbUEwYbBJJ/EBjflIeXbmDBevf40Jncjr35WilpeuwY/O BEi8lF6EOKcS7DXeqFR6gG9HQIxTYMR3z3te3mDWDCKgdqhVWvEzhskWLA5J/dVXtD2fM6SqGhW D+NSLcDwQWRa1ZeikCvzoiu59G4zYQalPfRQmi4moQF+j+rYB5hojiOC1EOnHlj3S0YVt4tJ0Yj Z+nx10A1Idla+T7re0bJNfBbV7jK8wstTnIcIYEmrCWrxBWE53dLxKkROFMZ4xUN95XmjQFEYOj /rZLMcMBOQKadqEEnUjhlkT6RJWKjU18GEQxD0BixcD63TSdH87i0aC4/CDV9R+JvE4osVDzY5o pDY0RtodAbuzY+OYxGw== 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 3/5] fix some invalid SPDX license expressions/identifiers 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 Only the obvious mistakes without a look inside the projects. Signed-off-by: Markus Heidelberg --- 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