From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 13 Mar 2026 14:03:32 +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 1w12Au-000CYc-32 for lore@lore.pengutronix.de; Fri, 13 Mar 2026 14:03:32 +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 1w12Au-0007U2-MU; Fri, 13 Mar 2026 14:03:32 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1w12Ac-0006ty-IV; Fri, 13 Mar 2026 14:03:14 +0100 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1w12Ac-000597-1G; Fri, 13 Mar 2026 14:03:14 +0100 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.98.2) (envelope-from ) id 1w12Ac-00000009Ae6-1QVM; Fri, 13 Mar 2026 14:03:14 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Fri, 13 Mar 2026 14:03:14 +0100 Message-ID: <20260313130314.2185867-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260312130827.137022-4-m.heidelberg@cab.de> References: <20260312130827.137022-4-m.heidelberg@cab.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] 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: , 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 Thanks, applied as 331afae8807c2d6c32d205854f827ade531be04e. Michael [sent from post-receive hook] On Fri, 13 Mar 2026 14:03:14 +0100, Markus Heidelberg wrote: > Only the obvious mistakes without a look inside the projects. > > Signed-off-by: Markus Heidelberg > Message-Id: <20260312130827.137022-4-m.heidelberg@cab.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/acl.make b/rules/acl.make > index d00eeb71cd1f..a3ccd4b7ec26 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 d9b37c179496..2110e8c4ba35 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 28348ee794ae..69238bdf7ed3 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 1f12a0d8798b..9db898801ad1 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 0aba6ffecfe5..eae2f9cc6cf5 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 8d4f3a01dcfd..6a976a9628c3 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 f61430d06975..b7c27c340726 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 a59e95129c33..3678ccbde050 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 8c6edf597f40..e1606f7f3768 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 \