* [honister 01/18] lvm2: do not install systemd units/initscripts when building native SDK tools
2021-12-16 15:23 [honister 00/18] Patch review Dec 16th Armin Kuster
@ 2021-12-16 15:23 ` Armin Kuster
2021-12-16 15:23 ` [honister 02/18] msgpack-cpp: fix msgpack-cpp is a header only library Armin Kuster
` (16 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Armin Kuster @ 2021-12-16 15:23 UTC (permalink / raw)
To: openembedded-devel
From: Luca Boccassi <luca.boccassi@microsoft.com>
Nothing picks them up, so the build fails. Required to be able to build
native tools like systemd-analyze.
Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit defbcad66fc1e91117ba08bf1051035188e40b37)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb b/meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb
index 3988d54910..a729324c9b 100644
--- a/meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb
+++ b/meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb
@@ -17,13 +17,16 @@ do_install:append() {
install -d ${D}${sysconfdir}/lvm
install -m 0644 ${WORKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf
sed -i -e 's:@libdir@:${libdir}:g' ${D}${sysconfdir}/lvm/lvm.conf
- if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
- oe_runmake 'DESTDIR=${D}' install install_systemd_units
- sed -i -e 's:/usr/bin/true:${base_bindir}/true:g' ${D}${systemd_system_unitdir}/blk-availability.service
- else
- oe_runmake 'DESTDIR=${D}' install install_initscripts
- mv ${D}${sysconfdir}/rc.d/init.d ${D}${sysconfdir}/init.d
- rm -rf ${D}${sysconfdir}/rc.d
+ # We don't want init scripts/systemd units for native SDK utilities
+ if [ "${PN}" != "nativesdk-lvm2" ]; then
+ if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+ oe_runmake 'DESTDIR=${D}' install install_systemd_units
+ sed -i -e 's:/usr/bin/true:${base_bindir}/true:g' ${D}${systemd_system_unitdir}/blk-availability.service
+ else
+ oe_runmake 'DESTDIR=${D}' install install_initscripts
+ mv ${D}${sysconfdir}/rc.d/init.d ${D}${sysconfdir}/init.d
+ rm -rf ${D}${sysconfdir}/rc.d
+ fi
fi
}
--
2.25.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [honister 02/18] msgpack-cpp: fix msgpack-cpp is a header only library
2021-12-16 15:23 [honister 00/18] Patch review Dec 16th Armin Kuster
2021-12-16 15:23 ` [honister 01/18] lvm2: do not install systemd units/initscripts when building native SDK tools Armin Kuster
@ 2021-12-16 15:23 ` Armin Kuster
2021-12-16 15:23 ` [honister 03/18] imlib2: clarify license Armin Kuster
` (15 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Armin Kuster @ 2021-12-16 15:23 UTC (permalink / raw)
To: openembedded-devel
From: Sean Nyekjaer <sean.nyekjaer.ext@siemensgamesa.com>
${PN} is empty so don't let the -dev package RDEPEND on it
Signed-off-by: Sean Nyekjaer <sean.nyekjaer.ext@siemensgamesa.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit b8a8fbaf7df3d52acf02e7a3eec97ffd57acabf3)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta-oe/recipes-devtools/msgpack/msgpack-cpp_4.0.2.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-oe/recipes-devtools/msgpack/msgpack-cpp_4.0.2.bb b/meta-oe/recipes-devtools/msgpack/msgpack-cpp_4.0.2.bb
index ef066753d7..25b199f572 100644
--- a/meta-oe/recipes-devtools/msgpack/msgpack-cpp_4.0.2.bb
+++ b/meta-oe/recipes-devtools/msgpack/msgpack-cpp_4.0.2.bb
@@ -19,4 +19,6 @@ S = "${WORKDIR}/git"
inherit cmake pkgconfig
+RDEPENDS:${PN}-dev = ""
+
BBCLASSEXTEND += "native nativesdk"
--
2.25.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [honister 03/18] imlib2: clarify license
2021-12-16 15:23 [honister 00/18] Patch review Dec 16th Armin Kuster
2021-12-16 15:23 ` [honister 01/18] lvm2: do not install systemd units/initscripts when building native SDK tools Armin Kuster
2021-12-16 15:23 ` [honister 02/18] msgpack-cpp: fix msgpack-cpp is a header only library Armin Kuster
@ 2021-12-16 15:23 ` Armin Kuster
2021-12-16 15:23 ` [honister 04/18] xmlrpc-c: set precise BSD license Armin Kuster
` (14 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Armin Kuster @ 2021-12-16 15:23 UTC (permalink / raw)
To: openembedded-devel
From: Ross Burton <ross@burtonini.com>
Imlib2 has its own special license, so use that instead of MIT & BSD.
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit d085c4e1d29345bcc5f32f54646be381aeb83908)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta-oe/recipes-graphics/imlib2/imlib2_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-graphics/imlib2/imlib2_git.bb b/meta-oe/recipes-graphics/imlib2/imlib2_git.bb
index 9e4daddd53..56d41cd394 100644
--- a/meta-oe/recipes-graphics/imlib2/imlib2_git.bb
+++ b/meta-oe/recipes-graphics/imlib2/imlib2_git.bb
@@ -2,7 +2,7 @@ SUMMARY = "A graphic library for file loading, saving, rendering, and manipulati
HOMEPAGE = "https://sourceforge.net/projects/enlightenment/"
SECTION = "libs"
-LICENSE = "MIT & BSD"
+LICENSE = "Imlib2"
LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35"
DEPENDS = "freetype "
--
2.25.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [honister 04/18] xmlrpc-c: set precise BSD license
2021-12-16 15:23 [honister 00/18] Patch review Dec 16th Armin Kuster
` (2 preceding siblings ...)
2021-12-16 15:23 ` [honister 03/18] imlib2: clarify license Armin Kuster
@ 2021-12-16 15:23 ` Armin Kuster
2021-12-16 15:23 ` [honister 05/18] dash: " Armin Kuster
` (13 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Armin Kuster @ 2021-12-16 15:23 UTC (permalink / raw)
To: openembedded-devel
From: Ross Burton <ross@burtonini.com>
"BSD" is ambiguous, use the precise license BSD-3-Clause.
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 11af3bd25062bd63b4c00918e4f08cf6813ae7de)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.54.02.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.54.02.bb b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.54.02.bb
index d3aa6d2ea2..e119420d2a 100644
--- a/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.54.02.bb
+++ b/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.54.02.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "XML-RPC for C/C++ is programming libraries and related tools to h
write an XML-RPC server or client in C or C++."
HOMEPAGE = "http://xmlrpc-c.sourceforge.net/"
-LICENSE = "BSD & MIT"
+LICENSE = "BSD-3-Clause & MIT"
LIC_FILES_CHKSUM = "file://doc/COPYING;md5=aefbf81ba0750f02176b6f86752ea951"
SRC_URI = "git://github.com/mirror/xmlrpc-c.git;branch=master;protocol=https \
--
2.25.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [honister 05/18] dash: set precise BSD license
2021-12-16 15:23 [honister 00/18] Patch review Dec 16th Armin Kuster
` (3 preceding siblings ...)
2021-12-16 15:23 ` [honister 04/18] xmlrpc-c: set precise BSD license Armin Kuster
@ 2021-12-16 15:23 ` Armin Kuster
2021-12-16 15:23 ` [honister 06/18] sg3-utils: " Armin Kuster
` (12 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Armin Kuster @ 2021-12-16 15:23 UTC (permalink / raw)
To: openembedded-devel
From: Ross Burton <ross@burtonini.com>
"BSD" is ambiguous, use the precise license BSD-3-Clause.
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 09aa844891f7ffae50a8ad7112c8f64737df17f0)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta-oe/recipes-shells/dash/dash_0.5.11.5.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-shells/dash/dash_0.5.11.5.bb b/meta-oe/recipes-shells/dash/dash_0.5.11.5.bb
index 8fe601a2d4..20f840411f 100644
--- a/meta-oe/recipes-shells/dash/dash_0.5.11.5.bb
+++ b/meta-oe/recipes-shells/dash/dash_0.5.11.5.bb
@@ -2,7 +2,7 @@ SUMMARY = "Small and fast POSIX-compliant shell"
HOMEPAGE = "http://gondor.apana.org.au/~herbert/dash/"
SECTION = "System Environment/Shells"
-LICENSE = "BSD & GPLv2+"
+LICENSE = "BSD-3-Clause & GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=b5262b4a1a1bff72b48e935531976d2e"
inherit autotools update-alternatives
--
2.25.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [honister 06/18] sg3-utils: set precise BSD license
2021-12-16 15:23 [honister 00/18] Patch review Dec 16th Armin Kuster
` (4 preceding siblings ...)
2021-12-16 15:23 ` [honister 05/18] dash: " Armin Kuster
@ 2021-12-16 15:23 ` Armin Kuster
2021-12-16 15:23 ` [honister 07/18] nodejs: " Armin Kuster
` (11 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Armin Kuster @ 2021-12-16 15:23 UTC (permalink / raw)
To: openembedded-devel
From: Ross Burton <ross@burtonini.com>
"BSD" is ambiguous, use the precise license BSD-2-Clause.
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 3e5651b6b4027ffa768492ed4083c4220b4e59e6)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta-oe/recipes-support/sg3-utils/sg3-utils_1.45.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-support/sg3-utils/sg3-utils_1.45.bb b/meta-oe/recipes-support/sg3-utils/sg3-utils_1.45.bb
index 43ee19afb8..3d07c01f07 100644
--- a/meta-oe/recipes-support/sg3-utils/sg3-utils_1.45.bb
+++ b/meta-oe/recipes-support/sg3-utils/sg3-utils_1.45.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "This package contains low level utilities for devices that use th
HOMEPAGE = "http://sg.danny.cz/sg/sg3_utils.html"
SECTION = "console/admin"
-LICENSE = "GPLv2+ & BSD"
+LICENSE = "GPLv2+ & BSD-2-Clause"
LIC_FILES_CHKSUM = "file://COPYING;md5=f90da7fc52172599dbf082d7620f18ca"
SRC_URI = "http://sg.danny.cz/sg/p/sg3_utils-${PV}.tgz \
--
2.25.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [honister 07/18] nodejs: set precise BSD license
2021-12-16 15:23 [honister 00/18] Patch review Dec 16th Armin Kuster
` (5 preceding siblings ...)
2021-12-16 15:23 ` [honister 06/18] sg3-utils: " Armin Kuster
@ 2021-12-16 15:23 ` Armin Kuster
2021-12-16 15:23 ` [honister 08/18] libkcapi: " Armin Kuster
` (10 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Armin Kuster @ 2021-12-16 15:23 UTC (permalink / raw)
To: openembedded-devel
From: Ross Burton <ross@burtonini.com>
"BSD" is ambiguous, use the precise licenses BSD-2-Clause and BSD-3-Clause.
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 4004a2279e11287407d820b997bb043b6ffe6fa7)
[Fixed up for Honistor context]
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta-oe/recipes-devtools/nodejs/nodejs_14.17.1.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_14.17.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_14.17.1.bb
index 4715019798..47be000c9f 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_14.17.1.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_14.17.1.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript"
HOMEPAGE = "http://nodejs.org"
-LICENSE = "MIT & BSD & Artistic-2.0"
+LICENSE = "MIT & ISC & BSD-2-Clause & BSD-3-Clause & Artistic-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=a1016f9b7979cfe6fc3466a9bba60b1e"
DEPENDS = "openssl"
--
2.25.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [honister 08/18] libkcapi: set precise BSD license
2021-12-16 15:23 [honister 00/18] Patch review Dec 16th Armin Kuster
` (6 preceding siblings ...)
2021-12-16 15:23 ` [honister 07/18] nodejs: " Armin Kuster
@ 2021-12-16 15:23 ` Armin Kuster
2021-12-16 15:23 ` [honister 09/18] pcsc-lite: " Armin Kuster
` (9 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Armin Kuster @ 2021-12-16 15:23 UTC (permalink / raw)
To: openembedded-devel
From: Ross Burton <ross@burtonini.com>
"BSD" is ambiguous, use the precise license BSD-3-Clause.
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit c8384c874f804d591427ab1d70b08a7881285b15)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta-oe/recipes-crypto/libkcapi/libkcapi_1.2.1.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-crypto/libkcapi/libkcapi_1.2.1.bb b/meta-oe/recipes-crypto/libkcapi/libkcapi_1.2.1.bb
index a66504dd83..ad68dc926d 100644
--- a/meta-oe/recipes-crypto/libkcapi/libkcapi_1.2.1.bb
+++ b/meta-oe/recipes-crypto/libkcapi/libkcapi_1.2.1.bb
@@ -1,6 +1,6 @@
SUMMARY = "Linux Kernel Crypto API User Space Interface Library"
HOMEPAGE = "http://www.chronox.de/libkcapi.html"
-LICENSE = "BSD | GPL-2.0"
+LICENSE = "BSD-3-Clause | GPL-2.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=c78be93ed8d1637f2a3f4a83ff9d5f54"
DEPENDS = "libtool"
--
2.25.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [honister 09/18] pcsc-lite: set precise BSD license
2021-12-16 15:23 [honister 00/18] Patch review Dec 16th Armin Kuster
` (7 preceding siblings ...)
2021-12-16 15:23 ` [honister 08/18] libkcapi: " Armin Kuster
@ 2021-12-16 15:23 ` Armin Kuster
2021-12-16 15:23 ` [honister 10/18] python3-cryptography: " Armin Kuster
` (8 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Armin Kuster @ 2021-12-16 15:23 UTC (permalink / raw)
To: openembedded-devel
From: Ross Burton <ross@burtonini.com>
"BSD" is ambiguous, use the precise license BSD-3-Clause.
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 2755ba786a1d8e54b065320b7a35bfe8f31ef847)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.9.0.bb | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.9.0.bb b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.9.0.bb
index 93b18ba1d5..d90dd43042 100644
--- a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.9.0.bb
+++ b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.9.0.bb
@@ -1,11 +1,11 @@
SUMMARY = "PC/SC Lite smart card framework and applications"
HOMEPAGE = "http://pcsclite.alioth.debian.org/"
-LICENSE = "BSD & GPLv3+"
-LICENSE:${PN} = "BSD"
-LICENSE:${PN}-lib = "BSD"
-LICENSE:${PN}-doc = "BSD"
-LICENSE:${PN}-dev = "BSD"
-LICENSE:${PN}-dbg = "BSD & GPLv3+"
+LICENSE = "BSD-3-Clause & GPLv3+"
+LICENSE:${PN} = "BSD-3-Clause"
+LICENSE:${PN}-lib = "BSD-3-Clause"
+LICENSE:${PN}-doc = "BSD-3-Clause"
+LICENSE:${PN}-dev = "BSD-3-Clause"
+LICENSE:${PN}-dbg = "BSD-3-Clause & GPLv3+"
LICENSE:${PN}-spy = "GPLv3+"
LICENSE:${PN}-spy-dev = "GPLv3+"
LIC_FILES_CHKSUM = "file://COPYING;md5=628c01ba985ecfa21677f5ee2d5202f6"
--
2.25.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [honister 10/18] python3-cryptography: set precise BSD license
2021-12-16 15:23 [honister 00/18] Patch review Dec 16th Armin Kuster
` (8 preceding siblings ...)
2021-12-16 15:23 ` [honister 09/18] pcsc-lite: " Armin Kuster
@ 2021-12-16 15:23 ` Armin Kuster
2021-12-16 15:23 ` [honister 11/18] python3-crypto-vectors: " Armin Kuster
` (7 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Armin Kuster @ 2021-12-16 15:23 UTC (permalink / raw)
To: openembedded-devel
From: Ross Burton <ross@burtonini.com>
"BSD" is ambiguous, use the precise license BSD-3-Clause.
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
(cherry picked from commit 378dbb135b4ce6f44cf647e8aa08f01497c160cb)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../recipes-devtools/python/python3-cryptography_3.3.2.bb | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta-python/recipes-devtools/python/python3-cryptography_3.3.2.bb b/meta-python/recipes-devtools/python/python3-cryptography_3.3.2.bb
index baec105a3e..6c70284564 100644
--- a/meta-python/recipes-devtools/python/python3-cryptography_3.3.2.bb
+++ b/meta-python/recipes-devtools/python/python3-cryptography_3.3.2.bb
@@ -1,8 +1,10 @@
SUMMARY = "Provides cryptographic recipes and primitives to python developers"
HOMEPAGE = "https://cryptography.io/"
SECTION = "devel/python"
-LICENSE = "Apache-2.0 | BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=bf405a8056a6647e7d077b0e7bc36aba"
+LICENSE = "Apache-2.0 | BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=bf405a8056a6647e7d077b0e7bc36aba \
+ file://LICENSE.APACHE;md5=4e168cce331e5c827d4c2b68a6200e1b \
+ file://LICENSE.BSD;md5=5ae30ba4123bc4f2fa49aa0b0dce887b"
LDSHARED += "-pthread"
--
2.25.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [honister 11/18] python3-crypto-vectors: set precise BSD license
2021-12-16 15:23 [honister 00/18] Patch review Dec 16th Armin Kuster
` (9 preceding siblings ...)
2021-12-16 15:23 ` [honister 10/18] python3-cryptography: " Armin Kuster
@ 2021-12-16 15:23 ` Armin Kuster
2021-12-16 15:23 ` [honister 12/18] python3-gevent: use system libraries instead of embedding Armin Kuster
` (6 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Armin Kuster @ 2021-12-16 15:23 UTC (permalink / raw)
To: openembedded-devel
From: Ross Burton <ross@burtonini.com>
"BSD" is ambiguous, use the precise license BSD-3-Clause.
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
(cherry picked from commit cf172e66fe8f0ba6f676beb1eae6efb7c00d8b1a)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../python/python3-cryptography-vectors_3.4.8.bb | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta-python/recipes-devtools/python/python3-cryptography-vectors_3.4.8.bb b/meta-python/recipes-devtools/python/python3-cryptography-vectors_3.4.8.bb
index 2fb48f3cf7..25ff63b5eb 100644
--- a/meta-python/recipes-devtools/python/python3-cryptography-vectors_3.4.8.bb
+++ b/meta-python/recipes-devtools/python/python3-cryptography-vectors_3.4.8.bb
@@ -1,8 +1,10 @@
SUMMARY = "Test vectors for the cryptography package."
HOMEPAGE = "https://cryptography.io/"
SECTION = "devel/python"
-LICENSE = "Apache-2.0 | BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4"
+LICENSE = "Apache-2.0 | BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4 \
+ file://LICENSE.APACHE;md5=4e168cce331e5c827d4c2b68a6200e1b \
+ file://LICENSE.BSD;md5=5ae30ba4123bc4f2fa49aa0b0dce887b"
SRC_URI[sha256sum] = "4c84410257993d3de058b44b777a49e1da2ae35ebea2970a360c7e3aa0f580f2"
--
2.25.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [honister 12/18] python3-gevent: use system libraries instead of embedding
2021-12-16 15:23 [honister 00/18] Patch review Dec 16th Armin Kuster
` (10 preceding siblings ...)
2021-12-16 15:23 ` [honister 11/18] python3-crypto-vectors: " Armin Kuster
@ 2021-12-16 15:23 ` Armin Kuster
2021-12-16 15:23 ` [honister 13/18] python3-gevent: update license Armin Kuster
` (5 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Armin Kuster @ 2021-12-16 15:23 UTC (permalink / raw)
To: openembedded-devel
From: Ross Burton <ross@burtonini.com>
gevent by default will build its own c-ares and libuv, but that build
needs patches and embedded libraries are bad form.
DEPEND on the recipes instead, and turn off embedding.
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
(cherry picked from commit 2d63ec9476690a0da648c805dc3fdb9b0201bbbb)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../python/python-gevent/libev-conf.patch | 26 -------------------
.../python/python3-gevent_21.8.0.bb | 22 ++++++----------
2 files changed, 8 insertions(+), 40 deletions(-)
delete mode 100644 meta-python/recipes-devtools/python/python-gevent/libev-conf.patch
diff --git a/meta-python/recipes-devtools/python/python-gevent/libev-conf.patch b/meta-python/recipes-devtools/python/python-gevent/libev-conf.patch
deleted file mode 100644
index 79c1867ba7..0000000000
--- a/meta-python/recipes-devtools/python/python-gevent/libev-conf.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 2294734ef9d5e2efb05820e9759a1635799bdea9 Mon Sep 17 00:00:00 2001
-From: Andrej Rode <andrej.rode@ettus.com>
-Date: Mon, 10 Apr 2017 19:25:18 -0700
-Subject: [PATCH] libev: make configure crosscompile compatible
-
-Signed-off-by: Andrej Rode <andrej.rode@ettus.com>
----
- deps/libev/configure | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/deps/libev/configure b/deps/libev/configure
-index 743817e..96c2366 100755
---- a/deps/libev/configure
-+++ b/deps/libev/configure
-@@ -2208,7 +2208,7 @@ fi
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_link='$CC -static -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
---
-2.10.2
-
diff --git a/meta-python/recipes-devtools/python/python3-gevent_21.8.0.bb b/meta-python/recipes-devtools/python/python3-gevent_21.8.0.bb
index 74ae6cf69d..8fb6e18504 100644
--- a/meta-python/recipes-devtools/python/python3-gevent_21.8.0.bb
+++ b/meta-python/recipes-devtools/python/python3-gevent_21.8.0.bb
@@ -7,27 +7,21 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4de99aac27b470c29c6c309e0c279b65 \
file://NOTICE;md5=18108df3583462cafd457f024b9b09b5 \
file://deps/libev/LICENSE;md5=d6ad416afd040c90698edcdf1cbee347 \
"
-DEPENDS += "libevent"
-DEPENDS += "${PYTHON_PN}-greenlet"
+DEPENDS += "${PYTHON_PN}-greenlet libev c-ares"
+
RDEPENDS:${PN} = "${PYTHON_PN}-greenlet \
${PYTHON_PN}-mime \
${PYTHON_PN}-pprint \
"
-FILESEXTRAPATHS:prepend := "${THISDIR}/python-gevent:"
+SRC_URI[sha256sum] = "43e93e1a4738c922a2416baf33f0afb0a20b22d3dba886720bc037cd02a98575"
-SRC_URI:append = " \
- file://libev-conf.patch;patch=1;pnum=1 \
-"
+inherit pypi setuptools3
-SRC_URI[sha256sum] = "43e93e1a4738c922a2416baf33f0afb0a20b22d3dba886720bc037cd02a98575"
+# Don't embed libraries, link to the system instead
+export GEVENTSETUP_EMBED = "0"
-# The python-gevent has no autoreconf ability
-# and the logic for detecting a cross compile is flawed
-# so always force a cross compile
+# Delete the embedded copies of libraries so we can't accidentally link to them
do_configure:append() {
- sed -i -e 's/^cross_compiling=no/cross_compiling=yes/' ${S}/deps/libev/configure
- sed -i -e 's/^cross_compiling=no/cross_compiling=yes/' ${S}/deps/c-ares/configure
+ rm -rf ${S}/deps
}
-
-inherit pypi setuptools3
--
2.25.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [honister 13/18] python3-gevent: update license
2021-12-16 15:23 [honister 00/18] Patch review Dec 16th Armin Kuster
` (11 preceding siblings ...)
2021-12-16 15:23 ` [honister 12/18] python3-gevent: use system libraries instead of embedding Armin Kuster
@ 2021-12-16 15:23 ` Armin Kuster
2021-12-16 15:23 ` [honister 14/18] python3-lxml: set precise BSD license Armin Kuster
` (4 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Armin Kuster @ 2021-12-16 15:23 UTC (permalink / raw)
To: openembedded-devel
From: Ross Burton <ross@burtonini.com>
gevent is MIT, and it embeds copies of Python which is Python-2.0.
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
(cherry picked from commit 91b516cc80ea9f46cdf94bd4ce6a168c240b5c58)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../recipes-devtools/python/python3-gevent_21.8.0.bb | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/meta-python/recipes-devtools/python/python3-gevent_21.8.0.bb b/meta-python/recipes-devtools/python/python3-gevent_21.8.0.bb
index 8fb6e18504..7bdf126dea 100644
--- a/meta-python/recipes-devtools/python/python3-gevent_21.8.0.bb
+++ b/meta-python/recipes-devtools/python/python3-gevent_21.8.0.bb
@@ -2,11 +2,8 @@ SUMMARY = "A coroutine-based Python networking library"
DESCRIPTION = "gevent is a coroutine-based Python networking library that uses greenlet to provide \
a high-level synchronous API on top of the libevent event loop."
HOMEPAGE = "http://www.gevent.org"
-LICENSE = "MIT & Python-2.0 & BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=4de99aac27b470c29c6c309e0c279b65 \
- file://NOTICE;md5=18108df3583462cafd457f024b9b09b5 \
- file://deps/libev/LICENSE;md5=d6ad416afd040c90698edcdf1cbee347 \
- "
+LICENSE = "MIT & Python-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=4de99aac27b470c29c6c309e0c279b65"
DEPENDS += "${PYTHON_PN}-greenlet libev c-ares"
RDEPENDS:${PN} = "${PYTHON_PN}-greenlet \
--
2.25.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [honister 14/18] python3-lxml: set precise BSD license
2021-12-16 15:23 [honister 00/18] Patch review Dec 16th Armin Kuster
` (12 preceding siblings ...)
2021-12-16 15:23 ` [honister 13/18] python3-gevent: update license Armin Kuster
@ 2021-12-16 15:23 ` Armin Kuster
2021-12-16 15:23 ` [honister 15/18] python3-posix-ipc: " Armin Kuster
` (3 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Armin Kuster @ 2021-12-16 15:23 UTC (permalink / raw)
To: openembedded-devel
From: Ross Burton <ross@burtonini.com>
"BSD" is ambiguous, use the precise license BSD-3-Clause.
Also update the HOMEPAGE.
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
(cherry picked from commit 45e5b27db6f34cefeb4d66197161fbfa9ebd476a)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta-python/recipes-devtools/python/python3-lxml_4.6.3.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-python/recipes-devtools/python/python3-lxml_4.6.3.bb b/meta-python/recipes-devtools/python/python3-lxml_4.6.3.bb
index 669c2eaeeb..d5594847f4 100644
--- a/meta-python/recipes-devtools/python/python3-lxml_4.6.3.bb
+++ b/meta-python/recipes-devtools/python/python3-lxml_4.6.3.bb
@@ -4,9 +4,9 @@ libxslt libraries. It provides safe and convenient access to these \
libraries using the ElementTree API. It extends the ElementTree API \
significantly to offer support for XPath, RelaxNG, XML Schema, XSLT, \
C14N and much more."
-HOMEPAGE = "http://codespeak.net/lxml"
+HOMEPAGE = "https://lxml.de/"
SECTION = "devel/python"
-LICENSE = "BSD & GPLv2 & MIT & PSF"
+LICENSE = "BSD-3-Clause & GPLv2 & MIT & PSF"
LIC_FILES_CHKSUM = "file://LICENSES.txt;md5=e4c045ebad958ead4b48008f70838403 \
file://doc/licenses/elementtree.txt;md5=eb34d036a6e3d56314ee49a6852ac891 \
file://doc/licenses/BSD.txt;md5=700a1fc17f4797d4f2d34970c8ee694b \
--
2.25.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [honister 15/18] python3-posix-ipc: set precise BSD license
2021-12-16 15:23 [honister 00/18] Patch review Dec 16th Armin Kuster
` (13 preceding siblings ...)
2021-12-16 15:23 ` [honister 14/18] python3-lxml: set precise BSD license Armin Kuster
@ 2021-12-16 15:23 ` Armin Kuster
2021-12-16 15:23 ` [honister 16/18] python3-posix-ipc: remove spurious dependencies Armin Kuster
` (2 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Armin Kuster @ 2021-12-16 15:23 UTC (permalink / raw)
To: openembedded-devel
From: Ross Burton <ross@burtonini.com>
"BSD" is ambiguous, use the precise license BSD-3-Clause.
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
(cherry picked from commit 4b526f42ed8db2c45bdfa7d1ba0a37e444676e1f)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta-python/recipes-devtools/python/python3-posix-ipc_1.0.5.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-python/recipes-devtools/python/python3-posix-ipc_1.0.5.bb b/meta-python/recipes-devtools/python/python3-posix-ipc_1.0.5.bb
index 2377bd5258..c46881cd47 100644
--- a/meta-python/recipes-devtools/python/python3-posix-ipc_1.0.5.bb
+++ b/meta-python/recipes-devtools/python/python3-posix-ipc_1.0.5.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "POSIX IPC primitives (semaphores, shared memory and message queues) for Python"
HOMEPAGE = "http://semanchuk.com/philip/posix_ipc/"
SECTION = "devel/python"
-LICENSE = "BSD"
+LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=dc089fb2f37e90799a54c19a20c9880f"
PYPI_PACKAGE = "posix_ipc"
--
2.25.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [honister 16/18] python3-posix-ipc: remove spurious dependencies
2021-12-16 15:23 [honister 00/18] Patch review Dec 16th Armin Kuster
` (14 preceding siblings ...)
2021-12-16 15:23 ` [honister 15/18] python3-posix-ipc: " Armin Kuster
@ 2021-12-16 15:23 ` Armin Kuster
2021-12-16 15:23 ` [honister 17/18] python3-pyzmq: set precise BSD license Armin Kuster
2021-12-16 15:23 ` [honister 18/18] fb-test: fix SRC_URI Armin Kuster
17 siblings, 0 replies; 19+ messages in thread
From: Armin Kuster @ 2021-12-16 15:23 UTC (permalink / raw)
To: openembedded-devel
From: Ross Burton <ross@burtonini.com>
pip isn't needed to build, and adding the empty string to RDEPENDS is
most certainly meaningless.
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
(cherry picked from commit 57ae325941d3a71eaeeca107ecef69d664a3f710)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../recipes-devtools/python/python3-posix-ipc_1.0.5.bb | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/meta-python/recipes-devtools/python/python3-posix-ipc_1.0.5.bb b/meta-python/recipes-devtools/python/python3-posix-ipc_1.0.5.bb
index c46881cd47..d66ef0e3c4 100644
--- a/meta-python/recipes-devtools/python/python3-posix-ipc_1.0.5.bb
+++ b/meta-python/recipes-devtools/python/python3-posix-ipc_1.0.5.bb
@@ -13,13 +13,3 @@ SRC_URI[md5sum] = "8c9443859492ecf3aae9182aa6b5c78c"
SRC_URI[sha256sum] = "6cddb1ce2cf4aae383f2a0079c26c69bee257fe2720f372201ef047f8ceb8b97"
inherit setuptools3 pypi
-
-# DEPENDS_default: python-pip
-
-DEPENDS += " \
- ${PYTHON_PN}-pip \
- "
-
-# RDEPENDS:default:
-RDEPENDS:${PN} += " \
- "
--
2.25.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [honister 17/18] python3-pyzmq: set precise BSD license
2021-12-16 15:23 [honister 00/18] Patch review Dec 16th Armin Kuster
` (15 preceding siblings ...)
2021-12-16 15:23 ` [honister 16/18] python3-posix-ipc: remove spurious dependencies Armin Kuster
@ 2021-12-16 15:23 ` Armin Kuster
2021-12-16 15:23 ` [honister 18/18] fb-test: fix SRC_URI Armin Kuster
17 siblings, 0 replies; 19+ messages in thread
From: Armin Kuster @ 2021-12-16 15:23 UTC (permalink / raw)
To: openembedded-devel
From: Ross Burton <ross@burtonini.com>
"BSD" is ambiguous, use the precise license BSD-3-Clause.
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
(cherry picked from commit 57647ea0d6b87a02bf812192ae39f2d81644b744)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
meta-python/recipes-devtools/python/python3-pyzmq_22.3.0.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-python/recipes-devtools/python/python3-pyzmq_22.3.0.bb b/meta-python/recipes-devtools/python/python3-pyzmq_22.3.0.bb
index 3c91eee16f..87605c2b3e 100644
--- a/meta-python/recipes-devtools/python/python3-pyzmq_22.3.0.bb
+++ b/meta-python/recipes-devtools/python/python3-pyzmq_22.3.0.bb
@@ -1,6 +1,6 @@
SUMMARY = "Pyzmq provides Zero message queue access for the Python language"
HOMEPAGE = "http://zeromq.org/bindings:python"
-LICENSE = "BSD & LGPL-3.0"
+LICENSE = "BSD-3-Clause & LGPL-3.0"
LIC_FILES_CHKSUM = "file://COPYING.BSD;md5=11c65680f637c3df7f58bbc8d133e96e \
file://COPYING.LESSER;md5=12c592fa0bcfff3fb0977b066e9cb69e"
DEPENDS = "zeromq"
--
2.25.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [honister 18/18] fb-test: fix SRC_URI
2021-12-16 15:23 [honister 00/18] Patch review Dec 16th Armin Kuster
` (16 preceding siblings ...)
2021-12-16 15:23 ` [honister 17/18] python3-pyzmq: set precise BSD license Armin Kuster
@ 2021-12-16 15:23 ` Armin Kuster
17 siblings, 0 replies; 19+ messages in thread
From: Armin Kuster @ 2021-12-16 15:23 UTC (permalink / raw)
To: openembedded-devel
From: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Original repo doesn't exist any more. Even though I couldn't find any
new official repo, this is the only one on github that contains used
commit hash.
Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit c57e4d5faa3d1c4b23173a4f26b2cd1aff846b34)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../recipes-test/fbtest/{fb-test_git.bb => fb-test_1.1.0.bb} | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
rename meta-oe/recipes-test/fbtest/{fb-test_git.bb => fb-test_1.1.0.bb} (82%)
diff --git a/meta-oe/recipes-test/fbtest/fb-test_git.bb b/meta-oe/recipes-test/fbtest/fb-test_1.1.0.bb
similarity index 82%
rename from meta-oe/recipes-test/fbtest/fb-test_git.bb
rename to meta-oe/recipes-test/fbtest/fb-test_1.1.0.bb
index 2992135726..14ab41b144 100644
--- a/meta-oe/recipes-test/fbtest/fb-test_git.bb
+++ b/meta-oe/recipes-test/fbtest/fb-test_1.1.0.bb
@@ -1,12 +1,10 @@
SUMMARY = "Test suite for Linux framebuffer"
-PV = "1.1.0"
-
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
SRCREV = "063ec650960c2d79ac51f5c5f026cb05343a33e2"
-SRC_URI = "git://github.com/prpplague/fb-test-app.git;branch=master;protocol=https"
+SRC_URI = "git://github.com//ponty/fb-test-app.git;branch=master;protocol=https"
S = "${WORKDIR}/git"
--
2.25.1
^ permalink raw reply related [flat|nested] 19+ messages in thread