* [PATCH 1/5] libdevmapper,lvm2: Do not inherit license
2021-07-20 16:30 [PATCH 0/5] Various fixes for YP compatible Nicolas Dechesne
@ 2021-07-20 16:30 ` Nicolas Dechesne
2021-07-20 16:30 ` [PATCH 2/5] python3-markupsafe: remove recipe Nicolas Dechesne
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Nicolas Dechesne @ 2021-07-20 16:30 UTC (permalink / raw)
To: akuster808, openembedded-devel; +Cc: Khem Raj, Nicolas Dechesne
From: Khem Raj <raj.khem@gmail.com>
inheriting license class which brings in
AVAILABLE_LICENSES into do_configure task checksums class since it wants to
enable thin-provisioning-tools if distro allows GPL-3 automatically, but this
brings issues when other layers which have additional licenses are
provided which ends up in signature mismatches so leave that setting to end-user and keep it disabled by
default with a comment in recipes stating that if needed then the user should enable it via
config metadata or bbappends.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit f592e81f11d455546447ddff35b2f89e18c0cc0c)
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
---
meta-oe/recipes-support/lvm2/lvm2.inc | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc
index 01c9df45c..2fe97d571 100644
--- a/meta-oe/recipes-support/lvm2/lvm2.inc
+++ b/meta-oe/recipes-support/lvm2/lvm2.inc
@@ -19,12 +19,11 @@ SRC_URI = "git://sourceware.org/git/lvm2.git \
SRCREV = "b9391b1b9f0b73303fa21f8f92574d17ce4c2b02"
S = "${WORKDIR}/git"
-inherit autotools-brokensep pkgconfig systemd license
+inherit autotools-brokensep pkgconfig systemd
LVM2_PACKAGECONFIG = "dmeventd"
LVM2_PACKAGECONFIG_append_class-target = " \
${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \
- ${@incompatible_license_contains('GPLv3', '', 'thin-provisioning-tools', d)} \
"
# odirect is always enabled because there currently is a bug in
@@ -37,6 +36,7 @@ PACKAGECONFIG[dmeventd] = "--enable-dmeventd,--disable-dmeventd"
PACKAGECONFIG[odirect] = "--enable-o_direct,--disable-o_direct"
PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline"
PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux"
+# NOTE: Add thin-provisioning-tools only if your distro policy allows GPL-3.0 license
PACKAGECONFIG[thin-provisioning-tools] = "--with-thin=internal,--with-thin=none,,thin-provisioning-tools"
# Unset user/group to unbreak install.
@@ -53,4 +53,3 @@ EXTRA_OECONF = "--with-user= \
--with-thin-repair=${sbindir}/thin_repair \
--with-thin-restore=${sbindir}/thin_restore \
"
-
--
2.29.2
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 2/5] python3-markupsafe: remove recipe
2021-07-20 16:30 [PATCH 0/5] Various fixes for YP compatible Nicolas Dechesne
2021-07-20 16:30 ` [PATCH 1/5] libdevmapper,lvm2: Do not inherit license Nicolas Dechesne
@ 2021-07-20 16:30 ` Nicolas Dechesne
2021-07-20 16:30 ` [PATCH 3/5] python3-jinja2: " Nicolas Dechesne
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Nicolas Dechesne @ 2021-07-20 16:30 UTC (permalink / raw)
To: akuster808, openembedded-devel; +Cc: Nicolas Dechesne
It was moved to OE-core/dunfell in
ec222f6af5f8 (python3-markupsafe: Import from meta-oe/meta-python)
However it was not removed from meta-oe, as such this recipe is now
duplicated, for no good reason. The version in meta-oe and oe-core
match so, it's really a no-op.
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
---
.../recipes-devtools/python/python3-markupsafe/run-ptest | 3 ---
.../recipes-devtools/python/python3-markupsafe_1.1.1.bb | 2 --
2 files changed, 5 deletions(-)
delete mode 100644 meta-python/recipes-devtools/python/python3-markupsafe/run-ptest
delete mode 100644 meta-python/recipes-devtools/python/python3-markupsafe_1.1.1.bb
diff --git a/meta-python/recipes-devtools/python/python3-markupsafe/run-ptest b/meta-python/recipes-devtools/python/python3-markupsafe/run-ptest
deleted file mode 100644
index 5cec71169..000000000
--- a/meta-python/recipes-devtools/python/python3-markupsafe/run-ptest
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-pytest
diff --git a/meta-python/recipes-devtools/python/python3-markupsafe_1.1.1.bb b/meta-python/recipes-devtools/python/python3-markupsafe_1.1.1.bb
deleted file mode 100644
index 765e3c906..000000000
--- a/meta-python/recipes-devtools/python/python3-markupsafe_1.1.1.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-inherit setuptools3
-require python-markupsafe.inc
--
2.29.2
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 3/5] python3-jinja2: remove recipe
2021-07-20 16:30 [PATCH 0/5] Various fixes for YP compatible Nicolas Dechesne
2021-07-20 16:30 ` [PATCH 1/5] libdevmapper,lvm2: Do not inherit license Nicolas Dechesne
2021-07-20 16:30 ` [PATCH 2/5] python3-markupsafe: remove recipe Nicolas Dechesne
@ 2021-07-20 16:30 ` Nicolas Dechesne
2021-07-20 16:30 ` [PATCH 4/5] python3-{pyyaml,cython,pyparsing}: move from meta-python to meta-oe Nicolas Dechesne
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Nicolas Dechesne @ 2021-07-20 16:30 UTC (permalink / raw)
To: akuster808, openembedded-devel; +Cc: Nicolas Dechesne
It was moved to OE-core/dunfell in
cc0f56a788c3 (python3-jinja2: Import from meta-oe/meta-python)
However it was not removed from meta-oe, as such this recipe is now
duplicated, for no good reason. Worse than that, the version in
meta-oe and oe-core differ. OE-core has 2.11.3 and meta-oe is older
with 2.11.2.
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
---
.../python/python3-jinja2/run-ptest | 3 --
.../python/python3-jinja2_2.11.2.bb | 43 -------------------
2 files changed, 46 deletions(-)
delete mode 100644 meta-python/recipes-devtools/python/python3-jinja2/run-ptest
delete mode 100644 meta-python/recipes-devtools/python/python3-jinja2_2.11.2.bb
diff --git a/meta-python/recipes-devtools/python/python3-jinja2/run-ptest b/meta-python/recipes-devtools/python/python3-jinja2/run-ptest
deleted file mode 100644
index 5cec71169..000000000
--- a/meta-python/recipes-devtools/python/python3-jinja2/run-ptest
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-pytest
diff --git a/meta-python/recipes-devtools/python/python3-jinja2_2.11.2.bb b/meta-python/recipes-devtools/python/python3-jinja2_2.11.2.bb
deleted file mode 100644
index 681acf8f1..000000000
--- a/meta-python/recipes-devtools/python/python3-jinja2_2.11.2.bb
+++ /dev/null
@@ -1,43 +0,0 @@
-DESCRIPTION = "Python Jinja2: A small but fast and easy to use stand-alone template engine written in pure python."
-
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=5dc88300786f1c214c1e9827a5229462"
-
-SRC_URI[sha256sum] = "89aab215427ef59c34ad58735269eb58b1a5808103067f7bb9d5836c651b3bb0"
-
-PYPI_PACKAGE = "Jinja2"
-
-CLEANBROKEN = "1"
-
-inherit pypi setuptools3 ptest
-
-SRC_URI += " \
- file://run-ptest \
-"
-
-do_install_ptest() {
- install -d ${D}${PTEST_PATH}/tests
- cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/
-}
-
-RDEPENDS_${PN}-ptest += " \
- ${PYTHON_PN}-pytest \
- ${PYTHON_PN}-unixadmin \
-"
-
-RDEPENDS_${PN} += " \
- ${PYTHON_PN}-asyncio \
- ${PYTHON_PN}-crypt \
- ${PYTHON_PN}-io \
- ${PYTHON_PN}-json \
- ${PYTHON_PN}-markupsafe \
- ${PYTHON_PN}-math \
- ${PYTHON_PN}-netclient \
- ${PYTHON_PN}-numbers\
- ${PYTHON_PN}-pickle \
- ${PYTHON_PN}-pprint \
- ${PYTHON_PN}-shell \
- ${PYTHON_PN}-threading \
-"
-
-BBCLASSEXTEND = "native nativesdk"
--
2.29.2
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 4/5] python3-{pyyaml,cython,pyparsing}: move from meta-python to meta-oe
2021-07-20 16:30 [PATCH 0/5] Various fixes for YP compatible Nicolas Dechesne
` (2 preceding siblings ...)
2021-07-20 16:30 ` [PATCH 3/5] python3-jinja2: " Nicolas Dechesne
@ 2021-07-20 16:30 ` Nicolas Dechesne
2021-07-20 16:30 ` [PATCH 5/5] ostree: Do not check for meta-python Nicolas Dechesne
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Nicolas Dechesne @ 2021-07-20 16:30 UTC (permalink / raw)
To: akuster808, openembedded-devel; +Cc: Nicolas Dechesne
This specific statement in ostree recipe breaks the YP compatible
status (yocto-check-layer):
RDEPENDS_${PN}-ptest += " \
...
${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-python', 'python3-pyyaml', '', d)} \
...
"
Recently python3-pyyaml was moved to OE-core (0a8600f9cec0), and the
ostree recipe was fixed with:
b9ede0cb182a (python3-pyyaml: Do not check for meta-python)
In dunfell, moving python3-pyyaml to OE-core is not a great idea, but
moving it from meta-python to meta-oe allows us to fix ostree YP
compatible issue. Since meta-python depends on meta-oe, it should not
be a change with any visible effect.
python3-cython and python3-pyparsing are collateral damages since they are
dependency for python3-pyyaml, so needed to be moved too.
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
---
.../recipes-devtools/python/python-cython.inc | 0
.../recipes-devtools/python/python3-cython_0.29.14.bb | 0
.../recipes-devtools/python/python3-pyparsing_2.4.6.bb | 0
.../recipes-devtools/python/python3-pyyaml_5.3.1.bb | 0
4 files changed, 0 insertions(+), 0 deletions(-)
rename {meta-python => meta-oe}/recipes-devtools/python/python-cython.inc (100%)
rename {meta-python => meta-oe}/recipes-devtools/python/python3-cython_0.29.14.bb (100%)
rename {meta-python => meta-oe}/recipes-devtools/python/python3-pyparsing_2.4.6.bb (100%)
rename {meta-python => meta-oe}/recipes-devtools/python/python3-pyyaml_5.3.1.bb (100%)
diff --git a/meta-python/recipes-devtools/python/python-cython.inc b/meta-oe/recipes-devtools/python/python-cython.inc
similarity index 100%
rename from meta-python/recipes-devtools/python/python-cython.inc
rename to meta-oe/recipes-devtools/python/python-cython.inc
diff --git a/meta-python/recipes-devtools/python/python3-cython_0.29.14.bb b/meta-oe/recipes-devtools/python/python3-cython_0.29.14.bb
similarity index 100%
rename from meta-python/recipes-devtools/python/python3-cython_0.29.14.bb
rename to meta-oe/recipes-devtools/python/python3-cython_0.29.14.bb
diff --git a/meta-python/recipes-devtools/python/python3-pyparsing_2.4.6.bb b/meta-oe/recipes-devtools/python/python3-pyparsing_2.4.6.bb
similarity index 100%
rename from meta-python/recipes-devtools/python/python3-pyparsing_2.4.6.bb
rename to meta-oe/recipes-devtools/python/python3-pyparsing_2.4.6.bb
diff --git a/meta-python/recipes-devtools/python/python3-pyyaml_5.3.1.bb b/meta-oe/recipes-devtools/python/python3-pyyaml_5.3.1.bb
similarity index 100%
rename from meta-python/recipes-devtools/python/python3-pyyaml_5.3.1.bb
rename to meta-oe/recipes-devtools/python/python3-pyyaml_5.3.1.bb
--
2.29.2
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH 5/5] ostree: Do not check for meta-python
2021-07-20 16:30 [PATCH 0/5] Various fixes for YP compatible Nicolas Dechesne
` (3 preceding siblings ...)
2021-07-20 16:30 ` [PATCH 4/5] python3-{pyyaml,cython,pyparsing}: move from meta-python to meta-oe Nicolas Dechesne
@ 2021-07-20 16:30 ` Nicolas Dechesne
2021-07-20 16:32 ` [PATCH 0/5] Various fixes for YP compatible Nicolas Dechesne
2021-07-25 22:40 ` Armin Kuster
6 siblings, 0 replies; 8+ messages in thread
From: Nicolas Dechesne @ 2021-07-20 16:30 UTC (permalink / raw)
To: akuster808, openembedded-devel; +Cc: Nicolas Dechesne
It is a (non trivial) cherry pick from
(cherry picked from commit b9ede0cb182ab095c863a6a5154bbe259a33f5c0)
python3-pyyaml was moved from meta-python to meta-oe, so that we could
apply this specific patch which breaks basic YP compatible check
script.
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
---
meta-oe/recipes-extended/ostree/ostree_2020.3.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-extended/ostree/ostree_2020.3.bb b/meta-oe/recipes-extended/ostree/ostree_2020.3.bb
index 86407459b..c1f43feb6 100644
--- a/meta-oe/recipes-extended/ostree/ostree_2020.3.bb
+++ b/meta-oe/recipes-extended/ostree/ostree_2020.3.bb
@@ -176,7 +176,7 @@ RDEPENDS_${PN}-ptest += " \
util-linux \
xz \
${PN}-trivial-httpd \
- ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-python', 'python3-pyyaml', '', d)} \
+ python3-pyyaml \
${@bb.utils.contains('PACKAGECONFIG', 'gjs', 'gjs', '', d)} \
"
RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils glibc-localedata-en-us"
--
2.29.2
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 0/5] Various fixes for YP compatible
2021-07-20 16:30 [PATCH 0/5] Various fixes for YP compatible Nicolas Dechesne
` (4 preceding siblings ...)
2021-07-20 16:30 ` [PATCH 5/5] ostree: Do not check for meta-python Nicolas Dechesne
@ 2021-07-20 16:32 ` Nicolas Dechesne
2021-07-25 22:40 ` Armin Kuster
6 siblings, 0 replies; 8+ messages in thread
From: Nicolas Dechesne @ 2021-07-20 16:32 UTC (permalink / raw)
To: akuster808, openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 2260 bytes --]
d'oh... I meant to add it in the prefix.. but these patches are for dunfell
branch.
On Tue, Jul 20, 2021 at 6:31 PM Nicolas Dechesne <
nicolas.dechesne@linaro.org> wrote:
> There are some pending requests for YP compatible for layers which
> depend on meta-oe, meta-python and meta-networking. In dunfell, these
> layers do not PASS the yocto-check-layer compatibility script. With
> these patches applied, I am able to get this:
>
> INFO: Summary of results:
> INFO:
> INFO: meta-networking ... PASS
> INFO: meta-python ... PASS
> INFO: meta-oe ... PASS
>
> Khem Raj (1):
> libdevmapper,lvm2: Do not inherit license
>
> Nicolas Dechesne (4):
> python3-markupsafe: remove recipe
> python3-jinja2: remove recipe
> python3-{pyyaml,cython,pyparsing}: move from meta-python to meta-oe
> ostree: Do not check for meta-python
>
> .../recipes-devtools/python/python-cython.inc | 0
> .../python/python3-cython_0.29.14.bb | 0
> .../python/python3-pyparsing_2.4.6.bb | 0
> .../python/python3-pyyaml_5.3.1.bb | 0
> .../recipes-extended/ostree/ostree_2020.3.bb | 2 +-
> meta-oe/recipes-support/lvm2/lvm2.inc | 5 +--
> .../python/python3-jinja2/run-ptest | 3 --
> .../python/python3-jinja2_2.11.2.bb | 43 -------------------
> .../python/python3-markupsafe/run-ptest | 3 --
> .../python/python3-markupsafe_1.1.1.bb | 2 -
> 10 files changed, 3 insertions(+), 55 deletions(-)
> rename {meta-python => meta-oe}/recipes-devtools/python/python-cython.inc
> (100%)
> rename {meta-python => meta-oe}/recipes-devtools/python/
> python3-cython_0.29.14.bb (100%)
> rename {meta-python => meta-oe}/recipes-devtools/python/
> python3-pyparsing_2.4.6.bb (100%)
> rename {meta-python => meta-oe}/recipes-devtools/python/
> python3-pyyaml_5.3.1.bb (100%)
> delete mode 100644
> meta-python/recipes-devtools/python/python3-jinja2/run-ptest
> delete mode 100644 meta-python/recipes-devtools/python/
> python3-jinja2_2.11.2.bb
> delete mode 100644
> meta-python/recipes-devtools/python/python3-markupsafe/run-ptest
> delete mode 100644 meta-python/recipes-devtools/python/
> python3-markupsafe_1.1.1.bb
>
> --
> 2.29.2
>
>
[-- Attachment #2: Type: text/html, Size: 3576 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 0/5] Various fixes for YP compatible
2021-07-20 16:30 [PATCH 0/5] Various fixes for YP compatible Nicolas Dechesne
` (5 preceding siblings ...)
2021-07-20 16:32 ` [PATCH 0/5] Various fixes for YP compatible Nicolas Dechesne
@ 2021-07-25 22:40 ` Armin Kuster
6 siblings, 0 replies; 8+ messages in thread
From: Armin Kuster @ 2021-07-25 22:40 UTC (permalink / raw)
To: Nicolas Dechesne, openembedded-devel
On 7/20/21 9:30 AM, Nicolas Dechesne wrote:
> There are some pending requests for YP compatible for layers which
> depend on meta-oe, meta-python and meta-networking. In dunfell, these
> layers do not PASS the yocto-check-layer compatibility script. With
> these patches applied, I am able to get this:
>
> INFO: Summary of results:
> INFO:
> INFO: meta-networking ... PASS
> INFO: meta-python ... PASS
> INFO: meta-oe ... PASS
>
> Khem Raj (1):
> libdevmapper,lvm2: Do not inherit license
I remembered these changes after I sent out the last patch review. They
are queued up in the next batch.
-armin
>
> Nicolas Dechesne (4):
> python3-markupsafe: remove recipe
> python3-jinja2: remove recipe
> python3-{pyyaml,cython,pyparsing}: move from meta-python to meta-oe
> ostree: Do not check for meta-python
>
> .../recipes-devtools/python/python-cython.inc | 0
> .../python/python3-cython_0.29.14.bb | 0
> .../python/python3-pyparsing_2.4.6.bb | 0
> .../python/python3-pyyaml_5.3.1.bb | 0
> .../recipes-extended/ostree/ostree_2020.3.bb | 2 +-
> meta-oe/recipes-support/lvm2/lvm2.inc | 5 +--
> .../python/python3-jinja2/run-ptest | 3 --
> .../python/python3-jinja2_2.11.2.bb | 43 -------------------
> .../python/python3-markupsafe/run-ptest | 3 --
> .../python/python3-markupsafe_1.1.1.bb | 2 -
> 10 files changed, 3 insertions(+), 55 deletions(-)
> rename {meta-python => meta-oe}/recipes-devtools/python/python-cython.inc (100%)
> rename {meta-python => meta-oe}/recipes-devtools/python/python3-cython_0.29.14.bb (100%)
> rename {meta-python => meta-oe}/recipes-devtools/python/python3-pyparsing_2.4.6.bb (100%)
> rename {meta-python => meta-oe}/recipes-devtools/python/python3-pyyaml_5.3.1.bb (100%)
> delete mode 100644 meta-python/recipes-devtools/python/python3-jinja2/run-ptest
> delete mode 100644 meta-python/recipes-devtools/python/python3-jinja2_2.11.2.bb
> delete mode 100644 meta-python/recipes-devtools/python/python3-markupsafe/run-ptest
> delete mode 100644 meta-python/recipes-devtools/python/python3-markupsafe_1.1.1.bb
>
^ permalink raw reply [flat|nested] 8+ messages in thread