From: Joshua Watt <JPEWhacker@gmail.com>
Date: Wed, 15 Jul 2026 16:45:06 +0000 (-0600)
Subject: xz: Replace deprecated SPDX identifier
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=86a5e4b74db018403b0d6e68495fc8523b7fc0b8;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git

xz: Replace deprecated SPDX identifier

The GPL-3.0-with-autoconf-exception license is a deprecated SPDX license
identifier, so replace it with "GPL-3.0-or-later WITH
Autoconf-exception-macro"

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-extended/xz/xz_5.8.3.bb b/meta/recipes-extended/xz/xz_5.8.3.bb
index 0c0886fa7aa..b76b1726e4c 100644
--- a/meta/recipes-extended/xz/xz_5.8.3.bb
+++ b/meta/recipes-extended/xz/xz_5.8.3.bb
@@ -10,11 +10,11 @@ PROVIDES += "xz-decompress"
 # packages, and the LGPL bits are under lib/, which appears to be used for
 # libgnu, which appears to be used for DOS builds. So we're left with
 # GPL-2.0-or-later and 0BSD.
-LICENSE = "GPL-2.0-or-later & GPL-3.0-with-autoconf-exception & LGPL-2.1-or-later & 0BSD"
-LICENSE:${PN} = "0BSD & GPL-2.0-or-later"
-LICENSE:${PN}-dev = "0BSD & GPL-2.0-or-later"
+LICENSE = "GPL-2.0-or-later AND GPL-3.0-or-later WITH Autoconf-exception-macro AND LGPL-2.1-or-later AND 0BSD"
+LICENSE:${PN} = "0BSD AND GPL-2.0-or-later"
+LICENSE:${PN}-dev = "0BSD AND GPL-2.0-or-later"
 LICENSE:${PN}-staticdev = "GPL-2.0-or-later"
-LICENSE:${PN}-doc = "0BSD & GPL-2.0-or-later"
+LICENSE:${PN}-doc = "0BSD AND GPL-2.0-or-later"
 LICENSE:${PN}-dbg = "GPL-2.0-or-later"
 LICENSE:${PN}-locale = "GPL-2.0-or-later"
 LICENSE:liblzma = "0BSD"