[PATCH 01/14] lz4: remove redundant BSD license

[PATCH 01/14] lz4: remove redundant BSD license

[Ross Burton]

The upstream license is BSD-2-Clause or GPLv2, so remove the redundant
and ambiguous BSD license.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-support/lz4/lz4_1.9.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-support/lz4/lz4_1.9.3.bb b/meta/recipes-support/lz4/lz4_1.9.3.bb
index 74f6743b916..b22eea3156a 100644
--- a/meta/recipes-support/lz4/lz4_1.9.3.bb
+++ b/meta/recipes-support/lz4/lz4_1.9.3.bb
@@ -2,7 +2,7 @@ SUMMARY = "Extremely Fast Compression algorithm"
 DESCRIPTION = "LZ4 is a very fast lossless compression algorithm, providing compression speed at 400 MB/s per core, scalable with multi-cores CPU. It also features an extremely fast decoder, with speed in multiple GB/s per core, typically reaching RAM speed limits on multi-core systems."
 HOMEPAGE = "https://github.com/lz4/lz4"
 
-LICENSE = "BSD | BSD-2-Clause | GPL-2.0"
+LICENSE = "BSD-2-Clause | GPL-2.0"
 LIC_FILES_CHKSUM = "file://lib/LICENSE;md5=ebc2ea4814a64de7708f1571904b32cc \
                     file://programs/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://LICENSE;md5=d57c0d21cb917fb4e0af2454aa48b956 \
-- 
2.25.1

[PATCH 02/14] python3-numpy: remove redundant BSD license

[Ross Burton]

The license list already includes BSD-2-Clause and BSD-3-Clause, so
remove the redundant and ambiguous BSD license.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-devtools/python-numpy/python3-numpy_1.21.2.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/python-numpy/python3-numpy_1.21.2.bb b/meta/recipes-devtools/python-numpy/python3-numpy_1.21.2.bb
index 2d4c62af811..8e09585712d 100644
--- a/meta/recipes-devtools/python-numpy/python3-numpy_1.21.2.bb
+++ b/meta/recipes-devtools/python-numpy/python3-numpy_1.21.2.bb
@@ -2,7 +2,7 @@ SUMMARY = "A sophisticated Numeric Processing Package for Python"
 HOMEPAGE = "https://numpy.org/"
 DESCRIPTION = "NumPy is the fundamental package needed for scientific computing with Python."
 SECTION = "devel/python"
-LICENSE = "BSD-3-Clause & BSD-2-Clause & PSF & Apache-2.0 & BSD & MIT"
+LICENSE = "BSD-3-Clause & BSD-2-Clause & PSF & Apache-2.0 & MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b076ad374a7d311ba3126a22b2d52596"
 
 SRCNAME = "numpy"
-- 
2.25.1

[PATCH 03/14] quota: remove BSD license

[Ross Burton]

Only the 'quot' tool was BSD licensed, and this was removed upstream in
commit 5d30a29 (since 4.05).

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-extended/quota/quota_4.06.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-extended/quota/quota_4.06.bb b/meta/recipes-extended/quota/quota_4.06.bb
index 5115cb389ae..e32bdd4c32b 100644
--- a/meta/recipes-extended/quota/quota_4.06.bb
+++ b/meta/recipes-extended/quota/quota_4.06.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 HOMEPAGE = "http://sourceforge.net/projects/linuxquota/"
 DESCRIPTION = "Tools and patches for the Linux Diskquota system as part of the Linux kernel"
 BUGTRACKER = "http://sourceforge.net/tracker/?group_id=18136&atid=118136"
-LICENSE = "BSD & GPLv2+ & LGPLv2.1+"
+LICENSE = "GPLv2+ & LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://rquota_server.c;beginline=1;endline=20;md5=fe7e0d7e11c6f820f8fa62a5af71230f \
                     file://svc_socket.c;beginline=1;endline=17;md5=24d5a8792da45910786eeac750be8ceb"
 
-- 
2.25.1

[PATCH 04/14] nfs-utils: set precise BSD license

[Ross Burton]

"BSD" is ambiguous, use the precise license BSD-3-Clause.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-connectivity/nfs-utils/nfs-utils_2.5.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.5.4.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.5.4.bb
index 495ce4e542c..a655de2aca7 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.5.4.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.5.4.bb
@@ -4,7 +4,7 @@ NFS server and related tools."
 HOMEPAGE = "http://nfs.sourceforge.net/"
 SECTION = "console/network"
 
-LICENSE = "MIT & GPLv2+ & BSD"
+LICENSE = "MIT & GPLv2+ & BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=95f3a93a5c3c7888de623b46ea085a84"
 
 # util-linux for libblkid
-- 
2.25.1

[PATCH 05/14] dtc: set precise BSD license

[Ross Burton]

"BSD" is ambiguous, use the precise license BSD-2-Clause.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-kernel/dtc/dtc.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-kernel/dtc/dtc.inc b/meta/recipes-kernel/dtc/dtc.inc
index 12508b235d9..bfdc9f86399 100644
--- a/meta/recipes-kernel/dtc/dtc.inc
+++ b/meta/recipes-kernel/dtc/dtc.inc
@@ -2,7 +2,7 @@ SUMMARY = "Device Tree Compiler"
 HOMEPAGE = "https://devicetree.org/"
 DESCRIPTION = "The Device Tree Compiler is a tool used to manipulate the Open-Firmware-like device tree used by PowerPC kernels."
 SECTION = "bootloader"
-LICENSE = "GPLv2 | BSD"
+LICENSE = "GPLv2 | BSD-2-Clause"
 DEPENDS = "flex-native bison-native"
 
 SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git \
-- 
2.25.1

[PATCH 06/14] acpica: set precise BSD license

[Ross Burton]

"BSD" is ambiguous, use the precise license BSD-3-Clause.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-extended/acpica/acpica_20210730.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-extended/acpica/acpica_20210730.bb b/meta/recipes-extended/acpica/acpica_20210730.bb
index 490e8124348..b66e605f8b2 100644
--- a/meta/recipes-extended/acpica/acpica_20210730.bb
+++ b/meta/recipes-extended/acpica/acpica_20210730.bb
@@ -9,7 +9,7 @@ ACPI tables."
 HOMEPAGE = "http://www.acpica.org/"
 SECTION = "console/tools"
 
-LICENSE = "Intel | BSD | GPLv2"
+LICENSE = "Intel | BSD-3-Clause | GPLv2"
 LIC_FILES_CHKSUM = "file://source/compiler/aslcompile.c;beginline=7;endline=150;md5=c33ce358fdcd142684e41e336b7992e8"
 
 COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"
-- 
2.25.1

[PATCH 07/14] libevent: set precise BSD license

[Ross Burton]

"BSD" is ambiguous, use the precise license BSD-3-Clause.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-support/libevent/libevent_2.1.12.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-support/libevent/libevent_2.1.12.bb b/meta/recipes-support/libevent/libevent_2.1.12.bb
index 2a562fe2e96..4b419eab226 100644
--- a/meta/recipes-support/libevent/libevent_2.1.12.bb
+++ b/meta/recipes-support/libevent/libevent_2.1.12.bb
@@ -8,7 +8,7 @@ HOMEPAGE = "http://libevent.org/"
 BUGTRACKER = "https://github.com/libevent/libevent/issues"
 SECTION = "libs"
 
-LICENSE = "BSD & MIT"
+LICENSE = "BSD-3-Clause & MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=17f20574c0b154d12236d5fbe964f549"
 
 SRC_URI = "https://github.com/libevent/libevent/releases/download/release-${PV}-stable/${BP}-stable.tar.gz \
-- 
2.25.1

[PATCH 08/14] openssh: remove redundant BSD license

[Ross Burton]

The license statement already includes BSD-2-Clause and BSD-3-Clause, so
remove the redundant and ambiguous BSD license.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-connectivity/openssh/openssh_8.7p1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-connectivity/openssh/openssh_8.7p1.bb b/meta/recipes-connectivity/openssh/openssh_8.7p1.bb
index c4a08f71d63..8a2e7611af8 100644
--- a/meta/recipes-connectivity/openssh/openssh_8.7p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_8.7p1.bb
@@ -5,7 +5,7 @@ Ssh (Secure Shell) is a program for logging into a remote machine \
 and for executing commands on a remote machine."
 HOMEPAGE = "http://www.openssh.com/"
 SECTION = "console/network"
-LICENSE = "BSD-2-Clause & BSD-3-Clause & BSD-4-Clause & BSD & ISC & MIT"
+LICENSE = "BSD-2-Clause & BSD-3-Clause & BSD-4-Clause & ISC & MIT"
 LIC_FILES_CHKSUM = "file://LICENCE;md5=d9d2753bdef9f19466dc7bc959114b11"
 
 DEPENDS = "zlib openssl virtual/crypt"
-- 
2.25.1

[PATCH 09/14] python3-packaging: fix license statement

[Ross Burton]

This is licensed as Apache OR BSD, not AND.

Also use the precise license BSD-2-Clause.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-devtools/python/python3-packaging_21.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/python/python3-packaging_21.0.bb b/meta/recipes-devtools/python/python3-packaging_21.0.bb
index eacc48e56af..201b583de22 100644
--- a/meta/recipes-devtools/python/python3-packaging_21.0.bb
+++ b/meta/recipes-devtools/python/python3-packaging_21.0.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Core utilities for Python packages"
 HOMEPAGE = "https://github.com/pypa/packaging"
-LICENSE = "Apache-2.0 & BSD"
+LICENSE = "Apache-2.0 | BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=faadaedca9251a90b205c9167578ce91"
 
 SRC_URI[sha256sum] = "7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7"
-- 
2.25.1

[PATCH 10/14] iputils: set precise BSD license

[Ross Burton]

"BSD" is ambiguous, use the precise license BSD-3-Clause.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-extended/iputils/iputils_20210722.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-extended/iputils/iputils_20210722.bb b/meta/recipes-extended/iputils/iputils_20210722.bb
index 2e8d9032e47..cafb0f634ec 100644
--- a/meta/recipes-extended/iputils/iputils_20210722.bb
+++ b/meta/recipes-extended/iputils/iputils_20210722.bb
@@ -4,7 +4,7 @@ tracepath, tracepath6, ping, ping6 and arping."
 HOMEPAGE = "https://github.com/iputils/iputils"
 SECTION = "console/network"
 
-LICENSE = "BSD & GPLv2+"
+LICENSE = "BSD-3-Clause & GPLv2+"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=55aa8c9fcad0691cef0ecd420361e390"
 
-- 
2.25.1

[PATCH 11/14] libx11-compose-data: set precise BSD license

[Ross Burton]

"BSD" is ambiguous, use the precise licenses BSD-2-Clause BSD-4-Clause.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb b/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb
index 7519b4c018d..e53ccc6aea8 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb
@@ -8,7 +8,7 @@ python () {
 
 require xorg-lib-common.inc
 
-LICENSE = "MIT & MIT-style & BSD"
+LICENSE = "MIT & MIT-style & BSD-4-Clause & BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
 
 SRC_URI[md5sum] = "c5fa5a86a20e3591bed6c046498d4b8f"
-- 
2.25.1

[PATCH 12/14] webkitgtk: set precise BSD license

[Ross Burton]

"BSD" is ambiguous, use the precise license BSD-2-Clause.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-sato/webkit/webkitgtk_2.32.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-sato/webkit/webkitgtk_2.32.3.bb b/meta/recipes-sato/webkit/webkitgtk_2.32.3.bb
index c30bdf3428d..1f3f7a9c00a 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.32.3.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.32.3.bb
@@ -2,7 +2,7 @@ SUMMARY = "WebKit web rendering engine for the GTK+ platform"
 HOMEPAGE = "https://www.webkitgtk.org/"
 BUGTRACKER = "https://bugs.webkit.org/"
 
-LICENSE = "BSD & LGPLv2+"
+LICENSE = "BSD-2-Clause & LGPLv2+"
 LIC_FILES_CHKSUM = "file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d84286dda758da57bd691 \
                     file://Source/WebCore/LICENSE-APPLE;md5=4646f90082c40bcf298c285f8bab0b12 \
 		    file://Source/WebCore/LICENSE-LGPL-2;md5=36357ffde2b64ae177b2494445b79d21 \
-- 
2.25.1

[PATCH 13/14] libwpe: set precise BSD license

[Ross Burton]

"BSD" is ambiguous, use the precise license BSD-2-Clause.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-sato/webkit/libwpe_1.10.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-sato/webkit/libwpe_1.10.1.bb b/meta/recipes-sato/webkit/libwpe_1.10.1.bb
index 6f2fe1df423..4e77481bc8f 100644
--- a/meta/recipes-sato/webkit/libwpe_1.10.1.bb
+++ b/meta/recipes-sato/webkit/libwpe_1.10.1.bb
@@ -2,7 +2,7 @@ SUMMARY = "General-purpose library specifically developed for the WPE-flavored p
 HOMEPAGE = "https://github.com/WebPlatformForEmbedded/libwpe"
 BUGTRACKER = "https://github.com/WebPlatformForEmbedded/libwpe/issues"
 
-LICENSE = "BSD"
+LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc"
 DEPENDS = "virtual/egl libxkbcommon"
 
-- 
2.25.1

[PATCH 14/14] wpebackend-fdo: set precise BSD license

[Ross Burton]

"BSD" is ambiguous, use the precise license BSD-2-Clause.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-sato/webkit/wpebackend-fdo_1.10.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-sato/webkit/wpebackend-fdo_1.10.0.bb b/meta/recipes-sato/webkit/wpebackend-fdo_1.10.0.bb
index 4588ee10eaf..29ffb9091fe 100644
--- a/meta/recipes-sato/webkit/wpebackend-fdo_1.10.0.bb
+++ b/meta/recipes-sato/webkit/wpebackend-fdo_1.10.0.bb
@@ -2,7 +2,7 @@ SUMMARY = "WPE's backend based on a freedesktop.org stack."
 HOMEPAGE = "https://github.com/Igalia/WPEBackend-fdo"
 BUGTRACKER = "https://github.com/Igalia/WPEBackend-fdo/issues"
 
-LICENSE = "BSD"
+LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=1f62cef2e3645e3e74eb05fd389d7a66"
 DEPENDS = "glib-2.0 libxkbcommon wayland virtual/egl libwpe libepoxy"
 
-- 
2.25.1

RE: [OE-core] [PATCH 11/14] libx11-compose-data: set precise BSD license

[Peter Kjellerstedt]

> -----Original Message-----
> From: openembedded-core@lists.openembedded.org <openembedded-
> core@lists.openembedded.org> On Behalf Of Ross Burton
> Sent: den 2 september 2021 18:25
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core] [PATCH 11/14] libx11-compose-data: set precise BSD
> license
> 
> "BSD" is ambiguous, use the precise licenses BSD-2-Clause BSD-4-Clause.
> 
> Signed-off-by: Ross Burton <ross.burton@arm.com>
> ---
>  meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb
> b/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb
> index 7519b4c018d..e53ccc6aea8 100644
> --- a/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb
> +++ b/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb
> @@ -8,7 +8,7 @@ python () {
> 
>  require xorg-lib-common.inc
> 
> -LICENSE = "MIT & MIT-style & BSD"
> +LICENSE = "MIT & MIT-style & BSD-4-Clause & BSD-2-Clause"

Why is this marked as BSD-4-Clause? Looking at the COPYING file and 
searching the code I can find no trace of any license text with the 
advertising clause from BSD-4-Clause. What am I missing?

>  LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
> 
>  SRC_URI[md5sum] = "c5fa5a86a20e3591bed6c046498d4b8f"
> --
> 2.25.1

//Peter

RE: [OE-core] [PATCH 11/14] libx11-compose-data: set precise BSD license

[Peter Kjellerstedt]

Ross: any comment to my question below?

> -----Original Message-----
> From: openembedded-core@lists.openembedded.org <openembedded-
> core@lists.openembedded.org> On Behalf Of Peter Kjellerstedt
> Sent: den 28 oktober 2021 17:44
> To: Ross Burton <ross@burtonini.com>
> Cc: openembedded-core@lists.openembedded.org
> Subject: Re: [OE-core] [PATCH 11/14] libx11-compose-data: set precise BSD
> license
> 
> > -----Original Message-----
> > From: openembedded-core@lists.openembedded.org <openembedded-
> > core@lists.openembedded.org> On Behalf Of Ross Burton
> > Sent: den 2 september 2021 18:25
> > To: openembedded-core@lists.openembedded.org
> > Subject: [OE-core] [PATCH 11/14] libx11-compose-data: set precise BSD
> > license
> >
> > "BSD" is ambiguous, use the precise licenses BSD-2-Clause BSD-4-Clause.
> >
> > Signed-off-by: Ross Burton <ross.burton@arm.com>
> > ---
> >  meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb
> > b/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb
> > index 7519b4c018d..e53ccc6aea8 100644
> > --- a/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb
> > +++ b/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb
> > @@ -8,7 +8,7 @@ python () {
> >
> >  require xorg-lib-common.inc
> >
> > -LICENSE = "MIT & MIT-style & BSD"
> > +LICENSE = "MIT & MIT-style & BSD-4-Clause & BSD-2-Clause"
> 
> Why is this marked as BSD-4-Clause? Looking at the COPYING file and
> searching the code I can find no trace of any license text with the
> advertising clause from BSD-4-Clause. What am I missing?
> 
> >  LIC_FILES_CHKSUM =
> "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
> >
> >  SRC_URI[md5sum] = "c5fa5a86a20e3591bed6c046498d4b8f"
> > --
> > 2.25.1
> 
> //Peter

//Peter

Re: [OE-core] [PATCH 11/14] libx11-compose-data: set precise BSD license

[Ross Burton]

Sorry, missed this email.

I copied the license from libx11, as it is the same tarball.  It was
Joshua Watt who introduced the expanded licenses in
44fd2aa731956fe0a0f74d36959c88b0b87adab5.

Ross

On Thu, 4 Nov 2021 at 11:19, Peter Kjellerstedt
<peter.kjellerstedt@axis.com> wrote:
>
> Ross: any comment to my question below?
>
> > -----Original Message-----
> > From: openembedded-core@lists.openembedded.org <openembedded-
> > core@lists.openembedded.org> On Behalf Of Peter Kjellerstedt
> > Sent: den 28 oktober 2021 17:44
> > To: Ross Burton <ross@burtonini.com>
> > Cc: openembedded-core@lists.openembedded.org
> > Subject: Re: [OE-core] [PATCH 11/14] libx11-compose-data: set precise BSD
> > license
> >
> > > -----Original Message-----
> > > From: openembedded-core@lists.openembedded.org <openembedded-
> > > core@lists.openembedded.org> On Behalf Of Ross Burton
> > > Sent: den 2 september 2021 18:25
> > > To: openembedded-core@lists.openembedded.org
> > > Subject: [OE-core] [PATCH 11/14] libx11-compose-data: set precise BSD
> > > license
> > >
> > > "BSD" is ambiguous, use the precise licenses BSD-2-Clause BSD-4-Clause.
> > >
> > > Signed-off-by: Ross Burton <ross.burton@arm.com>
> > > ---
> > >  meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb
> > > b/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb
> > > index 7519b4c018d..e53ccc6aea8 100644
> > > --- a/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb
> > > +++ b/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb
> > > @@ -8,7 +8,7 @@ python () {
> > >
> > >  require xorg-lib-common.inc
> > >
> > > -LICENSE = "MIT & MIT-style & BSD"
> > > +LICENSE = "MIT & MIT-style & BSD-4-Clause & BSD-2-Clause"
> >
> > Why is this marked as BSD-4-Clause? Looking at the COPYING file and
> > searching the code I can find no trace of any license text with the
> > advertising clause from BSD-4-Clause. What am I missing?
> >
> > >  LIC_FILES_CHKSUM =
> > "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
> > >
> > >  SRC_URI[md5sum] = "c5fa5a86a20e3591bed6c046498d4b8f"
> > > --
> > > 2.25.1
> >
> > //Peter
>
> //Peter
>

Re: [OE-core] [PATCH 11/14] libx11-compose-data: set precise BSD license

[Joshua Watt]

On Thu, Nov 4, 2021 at 6:33 AM Ross Burton <ross@burtonini.com> wrote:
>
> Sorry, missed this email.
>
> I copied the license from libx11, as it is the same tarball.  It was
> Joshua Watt who introduced the expanded licenses in
> 44fd2aa731956fe0a0f74d36959c88b0b87adab5.

I don't recall the reasoning for BSD-4-Clause in that specific recipe.
I can go back and look again. It's also possible I just got it wrong;
if you have a better idea what it should be, that would save me the
trouble :)

>
> Ross
>
> On Thu, 4 Nov 2021 at 11:19, Peter Kjellerstedt
> <peter.kjellerstedt@axis.com> wrote:
> >
> > Ross: any comment to my question below?
> >
> > > -----Original Message-----
> > > From: openembedded-core@lists.openembedded.org <openembedded-
> > > core@lists.openembedded.org> On Behalf Of Peter Kjellerstedt
> > > Sent: den 28 oktober 2021 17:44
> > > To: Ross Burton <ross@burtonini.com>
> > > Cc: openembedded-core@lists.openembedded.org
> > > Subject: Re: [OE-core] [PATCH 11/14] libx11-compose-data: set precise BSD
> > > license
> > >
> > > > -----Original Message-----
> > > > From: openembedded-core@lists.openembedded.org <openembedded-
> > > > core@lists.openembedded.org> On Behalf Of Ross Burton
> > > > Sent: den 2 september 2021 18:25
> > > > To: openembedded-core@lists.openembedded.org
> > > > Subject: [OE-core] [PATCH 11/14] libx11-compose-data: set precise BSD
> > > > license
> > > >
> > > > "BSD" is ambiguous, use the precise licenses BSD-2-Clause BSD-4-Clause.
> > > >
> > > > Signed-off-by: Ross Burton <ross.burton@arm.com>
> > > > ---
> > > >  meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb | 2 +-
> > > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > >
> > > > diff --git a/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb
> > > > b/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb
> > > > index 7519b4c018d..e53ccc6aea8 100644
> > > > --- a/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb
> > > > +++ b/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb
> > > > @@ -8,7 +8,7 @@ python () {
> > > >
> > > >  require xorg-lib-common.inc
> > > >
> > > > -LICENSE = "MIT & MIT-style & BSD"
> > > > +LICENSE = "MIT & MIT-style & BSD-4-Clause & BSD-2-Clause"
> > >
> > > Why is this marked as BSD-4-Clause? Looking at the COPYING file and
> > > searching the code I can find no trace of any license text with the
> > > advertising clause from BSD-4-Clause. What am I missing?
> > >
> > > >  LIC_FILES_CHKSUM =
> > > "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
> > > >
> > > >  SRC_URI[md5sum] = "c5fa5a86a20e3591bed6c046498d4b8f"
> > > > --
> > > > 2.25.1
> > >
> > > //Peter
> >
> > //Peter
> >