font-util: Correct SPDX expression
PATCH 1/1 font-util: Correct SPDX expression
The BSD-4-Clause license is not contained in version 1.4.1. But MIT and X11 are listed in the COPYING file.
License-Update: upstream has changed
--- meta/recipes-graphics/xorg-font/font-util_1.4.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/xorg-font/font-util_1.4.1.bb +1 -1
@@ -2,7 +2,7 @@ SUMMARY = "X.Org font package creation/installation utilities" require xorg-font-common.inc -LICENSE = "Unicode-TOU & BSD-4-Clause & BSD-2-Clause" +LICENSE = "Unicode-TOU & MIT & X11 & BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=2a9e705c00e463c8d294f90486852e06 \ file://ucs2any.c;endline=28;md5=8357dc567fc628bd12696f15b2a33bcb \ file://bdftruncate.c;endline=26;md5=4f82ffc101a1b165eae9c6998abff937 \
PATCH 1/1 libbsd: Drop licenses that were removed upstream
The libbsd project has gotten rid of BSD-4-Clause licensed material. Version 0.11.8 is the first not to contain any such material anymore.
License-Update: removed upstream
--- meta/recipes-support/libbsd/libbsd_0.12.2.bb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
meta/recipes-support/libbsd/libbsd_0.12.2.bb +2 -5
@@ -15,20 +15,17 @@ HOMEPAGE = "https://libbsd.freedesktop.org/wiki/" # License: BSD-3-clause-author # License: BSD-3-clause-John-Birrell # License: BSD-3-clause-Regents -# License: BSD-4-clause-Christopher-G-Demetriou -# License: BSD-4-clause-Niels-Provos # License: BSD-5-clause-Peter-Wemm # License: Beerware # License: Expat # License: ISC # License: ISC-Original # License: public-domain -# License: public-domain-Colin-Plumb -LICENSE = "BSD-3-Clause & BSD-4-Clause & ISC & PD" +LICENSE = "BSD-3-Clause & ISC & PD" LICENSE:${PN} = "BSD-3-Clause & ISC & PD" LICENSE:${PN}-dbg = "BSD-3-Clause & ISC & PD" LICENSE:${PN}-dev = "BSD-3-Clause & ISC & PD" -LICENSE:${PN}-doc = "BSD-3-Clause & BSD-4-Clause & ISC & PD" +LICENSE:${PN}-doc = "BSD-3-Clause & ISC & PD" LICENSE:${PN}-locale = "BSD-3-Clause & ISC & PD" LICENSE:${PN}-src = "BSD-3-Clause & ISC & PD" LICENSE:${PN}-staticdev = "BSD-3-Clause & ISC & PD"
PATCH 1/1 libxfont2: Document more specific BSD-4-Clause-UC
In reply to Bastian GermannCOPYING in libxfont2 upstream contains only one BSD-4-Clause text variant, which is explicitly covered by the copyright addendum by University of California. Change the SPDX license reference to BSD-4-Clause-UC.
License-Update: reference can be more specific
--- meta/recipes-graphics/xorg-lib/libxfont2_2.0.7.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/xorg-lib/libxfont2_2.0.7.bb +1 -1
@@ -6,7 +6,7 @@ such as freetype)." require xorg-lib-common.inc -LICENSE = "MIT & MIT & BSD-4-Clause & BSD-2-Clause" +LICENSE = "MIT & MIT & BSD-4-Clause-UC & BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=a5d1388c9d40be70dbad35fa440443f7" DEPENDS += "freetype xtrans xorgproto libfontenc zlib"
PATCH 1/1 man-pages: Document more specific BSD-4-Clause-UC
In reply to Bastian GermannLIC_FILES_CHKSUM in the man-pages recipe already contains the more specific license reference BSD-4-Clause-UC that takes a copyright addendum by University of California into account.
License-Update: reference can be more specific
--- meta/recipes-extended/man-pages/man-pages_6.9.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-extended/man-pages/man-pages_6.9.1.bb +1 -1
@@ -2,7 +2,7 @@ SUMMARY = "Linux man-pages" DESCRIPTION = "The Linux man-pages project documents the Linux kernel and C library interfaces that are employed by user programs" SECTION = "console/utils" HOMEPAGE = "http://www.kernel.org/pub/linux/docs/man-pages" -LICENSE = "GPL-2.0-or-later & GPL-2.0-only & GPL-1.0-or-later & BSD-2-Clause & BSD-3-Clause & BSD-4-Clause & MIT" +LICENSE = "GPL-2.0-or-later & GPL-2.0-only & GPL-1.0-or-later & BSD-2-Clause & BSD-3-Clause & BSD-4-Clause-UC & MIT" LIC_FILES_CHKSUM = "file://README;md5=72cff06b7954222c24d38bc2c41b234e \ file://LICENSES/BSD-2-Clause.txt;md5=9e16594a228301089d759b4f178db91f \
PATCH 1/1 util-linux: Document more specific BSD-4-Clause-UC
In reply to Bastian GermannLIC_FILES_CHKSUM in the util-linux recipe already contains the more specific license reference BSD-4-Clause-UC that takes a copyright addendum by University of California into account.
License-Update: reference can be more specific
--- meta/recipes-core/util-linux/util-linux.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/util-linux/util-linux.inc +1 -1
@@ -6,7 +6,7 @@ disk partitioning, kernel message management, filesystem creation, and system lo SECTION = "base" -LICENSE = "GPL-1.0-or-later & GPL-2.0-only & GPL-2.0-or-later & LGPL-2.1-or-later & BSD-2-Clause & BSD-3-Clause & BSD-4-Clause & MIT" +LICENSE = "GPL-1.0-or-later & GPL-2.0-only & GPL-2.0-or-later & LGPL-2.1-or-later & BSD-2-Clause & BSD-3-Clause & BSD-4-Clause-UC & MIT" LICENSE:${PN}-fcntl-lock = "MIT" LICENSE:${PN}-fdisk = "GPL-1.0-or-later" LICENSE:${PN}-libblkid = "LGPL-2.1-or-later"