[PATCH 0/3] Import two python recipes from meta-oe/meta-python

[PATCH 0/3] Import two python recipes from meta-oe/meta-python

[Richard Purdie]

We have a slightly pressing situation where the performance test builds
are failing after we cleaned up the system installs on those machines
and tried to switch over to buildtools entirely.

The issue is the need for jinja2, complicated by the recipe's ptest
dependencies. This series imports them with ptest not inherited, the
idea being meta-python can bbappend and add the inherit.

The alternatives are either to try and solve this on the performace
test machines using horrible hacks and revert my earlier attempted fix
(which is correct but makes the situation worse), or import pytest 
over too which we may ultimately end up doing but probably should 
do right now?

Richard Purdie (3):
  python3-markupsafe: Import from meta-oe/meta-python
  python3-jinja2: Import from meta-oe/meta-python
  buildtools-tarball: Add python3-jinja2

 meta/conf/distro/include/maintainers.inc      |  2 +
 meta/recipes-core/meta/buildtools-tarball.bb  |  1 +
 .../python/python3-jinja2/run-ptest           |  3 ++
 .../python/python3-jinja2_2.11.2.bb           | 45 +++++++++++++++++++
 .../python/python3-markupsafe/run-ptest       |  3 ++
 .../python/python3-markupsafe_1.1.1.bb        | 28 ++++++++++++
 6 files changed, 82 insertions(+)
 create mode 100644 meta/recipes-devtools/python/python3-jinja2/run-ptest
 create mode 100644 meta/recipes-devtools/python/python3-jinja2_2.11.2.bb
 create mode 100644 meta/recipes-devtools/python/python3-markupsafe/run-ptest
 create mode 100644 meta/recipes-devtools/python/python3-markupsafe_1.1.1.bb

-- 
2.25.1

[PATCH 1/3] python3-markupsafe: Import from meta-oe/meta-python

[Richard Purdie]

Needed as a dependency of python3-jinja2. ptest is disabled for OE-Core, at
least for now since it depends on python3-pytest which in turn has may other
dependencies.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/conf/distro/include/maintainers.inc      |  1 +
 .../python/python3-markupsafe/run-ptest       |  3 ++
 .../python/python3-markupsafe_1.1.1.bb        | 28 +++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 meta/recipes-devtools/python/python3-markupsafe/run-ptest
 create mode 100644 meta/recipes-devtools/python/python3-markupsafe_1.1.1.bb

diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index a094b39b2af..84f473290ab 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -592,6 +592,7 @@ RECIPE_MAINTAINER_pn-python3-iniparse = "Oleksandr Kravchuk <open.source@oleksan
 RECIPE_MAINTAINER_pn-python3-libarchive-c = "Joshua Watt <JPEWhacker@gmail.com>"
 RECIPE_MAINTAINER_pn-python3-magic = "Joshua Watt <JPEWhacker@gmail.com>"
 RECIPE_MAINTAINER_pn-python3-mako = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
+RECIPE_MAINTAINER_pn-python3-markupsafe = "Richard Purdie <richard.purdie@linuxfoundation.org>"
 RECIPE_MAINTAINER_pn-python3-nose = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
 RECIPE_MAINTAINER_pn-python3-numpy = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
 RECIPE_MAINTAINER_pn-python3-pbr = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
diff --git a/meta/recipes-devtools/python/python3-markupsafe/run-ptest b/meta/recipes-devtools/python/python3-markupsafe/run-ptest
new file mode 100644
index 00000000000..5cec7116968
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-markupsafe/run-ptest
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+pytest
diff --git a/meta/recipes-devtools/python/python3-markupsafe_1.1.1.bb b/meta/recipes-devtools/python/python3-markupsafe_1.1.1.bb
new file mode 100644
index 00000000000..403a98a43f8
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-markupsafe_1.1.1.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "Implements a XML/HTML/XHTML Markup safe string for Python"
+HOMEPAGE = "http://github.com/mitsuhiko/markupsafe"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=ffeffa59c90c9c4a033c7574f8f3fb75"
+
+SRC_URI[md5sum] = "43fd756864fe42063068e092e220c57b"
+SRC_URI[sha256sum] = "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b"
+
+PYPI_PACKAGE = "MarkupSafe"
+inherit pypi setuptools3
+# ptest disabled in OE-Core for now due to missing dependencies
+
+RDEPENDS_${PN} += "${PYTHON_PN}-stringold"
+
+BBCLASSEXTEND = "native nativesdk"
+
+SRC_URI += " \
+	file://run-ptest \
+"
+
+RDEPENDS_${PN}-ptest += " \
+	${PYTHON_PN}-pytest \
+"
+
+do_install_ptest() {
+	install -d ${D}${PTEST_PATH}/tests
+	cp -f ${S}/tests/* ${D}${PTEST_PATH}/tests/
+}
-- 
2.25.1

[PATCH 2/3] python3-jinja2: Import from meta-oe/meta-python

[Richard Purdie]

This is used by some of the results handling code and needed as part of
buildtools tarball on various autobuilder worker for testing.

ptest is disabled for OE-Core, at least for now since it depends on
python3-pytest which in turn has may other dependencies.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/conf/distro/include/maintainers.inc      |  1 +
 .../python/python3-jinja2/run-ptest           |  3 ++
 .../python/python3-jinja2_2.11.2.bb           | 45 +++++++++++++++++++
 3 files changed, 49 insertions(+)
 create mode 100644 meta/recipes-devtools/python/python3-jinja2/run-ptest
 create mode 100644 meta/recipes-devtools/python/python3-jinja2_2.11.2.bb

diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index 84f473290ab..d349382cb9d 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -589,6 +589,7 @@ RECIPE_MAINTAINER_pn-python3-extras = "Oleksandr Kravchuk <open.source@oleksandr
 RECIPE_MAINTAINER_pn-python3-git = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
 RECIPE_MAINTAINER_pn-python3-gitdb = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
 RECIPE_MAINTAINER_pn-python3-iniparse = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
+RECIPE_MAINTAINER_pn-python3-jinja2 = "Richard Purdie <richard.purdie@linuxfoundation.org>"
 RECIPE_MAINTAINER_pn-python3-libarchive-c = "Joshua Watt <JPEWhacker@gmail.com>"
 RECIPE_MAINTAINER_pn-python3-magic = "Joshua Watt <JPEWhacker@gmail.com>"
 RECIPE_MAINTAINER_pn-python3-mako = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
diff --git a/meta/recipes-devtools/python/python3-jinja2/run-ptest b/meta/recipes-devtools/python/python3-jinja2/run-ptest
new file mode 100644
index 00000000000..5cec7116968
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-jinja2/run-ptest
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+pytest
diff --git a/meta/recipes-devtools/python/python3-jinja2_2.11.2.bb b/meta/recipes-devtools/python/python3-jinja2_2.11.2.bb
new file mode 100644
index 00000000000..89538d2f272
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-jinja2_2.11.2.bb
@@ -0,0 +1,45 @@
+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 disabled in OE-Core for now due to missing dependencies
+
+
+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.25.1

[PATCH 3/3] buildtools-tarball: Add python3-jinja2

[Richard Purdie]

This is used by various pieces of the result handling code, particularly the
performance testing and we're seeing autobuilder failures that are
easiest resolved using this.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-core/meta/buildtools-tarball.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb
index 75b71f55327..ef56f76fa71 100644
--- a/meta/recipes-core/meta/buildtools-tarball.bb
+++ b/meta/recipes-core/meta/buildtools-tarball.bb
@@ -11,6 +11,7 @@ TOOLCHAIN_HOST_TASK ?= "\
     nativesdk-python3-modules \
     nativesdk-python3-misc \
     nativesdk-python3-git \
+    nativesdk-python3-jinja2 \
     nativesdk-python3-testtools \
     nativesdk-python3-subunit \
     nativesdk-ncurses-terminfo-base \
-- 
2.25.1

Re: [OE-core] [PATCH 0/3] Import two python recipes from meta-oe/meta-python

[Tim Orling]

[-- Attachment #1: Type: text/plain, Size: 2135 bytes --]

On Mon, Sep 21, 2020 at 5:12 AM Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:

> We have a slightly pressing situation where the performance test builds
> are failing after we cleaned up the system installs on those machines
> and tried to switch over to buildtools entirely.
>
> The issue is the need for jinja2, complicated by the recipe's ptest
> dependencies. This series imports them with ptest not inherited, the
> idea being meta-python can bbappend and add the inherit.
>
> The alternatives are either to try and solve this on the performace
> test machines using horrible hacks and revert my earlier attempted fix
> (which is correct but makes the situation worse), or import pytest
> over too which we may ultimately end up doing but probably should
> do right now?
>
>
While bringing pytest into oe-core may ultimately make sense, the shear
number of dependencies
should not be brought in lightly. Given the urgency of the situation, I
agree with the approach to only
bring in what is necessary and disable ptest for these recipes. I will work
on .bbappends for meta-python.
Trevor G and I will fix any collateral damage in meta-python.

Richard Purdie (3):
>   python3-markupsafe: Import from meta-oe/meta-python
>   python3-jinja2: Import from meta-oe/meta-python
>   buildtools-tarball: Add python3-jinja2
>
>  meta/conf/distro/include/maintainers.inc      |  2 +
>  meta/recipes-core/meta/buildtools-tarball.bb  |  1 +
>  .../python/python3-jinja2/run-ptest           |  3 ++
>  .../python/python3-jinja2_2.11.2.bb           | 45 +++++++++++++++++++
>  .../python/python3-markupsafe/run-ptest       |  3 ++
>  .../python/python3-markupsafe_1.1.1.bb        | 28 ++++++++++++
>  6 files changed, 82 insertions(+)
>  create mode 100644 meta/recipes-devtools/python/python3-jinja2/run-ptest
>  create mode 100644 meta/recipes-devtools/python/python3-jinja2_2.11.2.bb
>  create mode 100644
> meta/recipes-devtools/python/python3-markupsafe/run-ptest
>  create mode 100644 meta/recipes-devtools/python/
> python3-markupsafe_1.1.1.bb
>
> --
> 2.25.1
>
>
> 
>
>

[-- Attachment #2: Type: text/html, Size: 3249 bytes --]

Re: [OE-core] [PATCH 1/3] python3-markupsafe: Import from meta-oe/meta-python

[Tim Orling]

[-- Attachment #1: Type: text/plain, Size: 3443 bytes --]

On Mon, Sep 21, 2020 at 5:12 AM Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:

> Needed as a dependency of python3-jinja2. ptest is disabled for OE-Core, at
> least for now since it depends on python3-pytest which in turn has may
> other
> dependencies.
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>
Acked-by: Tim Orling <ticotimo@gmail.com>
Signed-off-by: Tim Orling <ticotimo@gmail.com>

> ---
>  meta/conf/distro/include/maintainers.inc      |  1 +
>  .../python/python3-markupsafe/run-ptest       |  3 ++
>  .../python/python3-markupsafe_1.1.1.bb        | 28 +++++++++++++++++++
>  3 files changed, 32 insertions(+)
>  create mode 100644
> meta/recipes-devtools/python/python3-markupsafe/run-ptest
>  create mode 100644 meta/recipes-devtools/python/
> python3-markupsafe_1.1.1.bb
>
> diff --git a/meta/conf/distro/include/maintainers.inc
> b/meta/conf/distro/include/maintainers.inc
> index a094b39b2af..84f473290ab 100644
> --- a/meta/conf/distro/include/maintainers.inc
> +++ b/meta/conf/distro/include/maintainers.inc
> @@ -592,6 +592,7 @@ RECIPE_MAINTAINER_pn-python3-iniparse = "Oleksandr
> Kravchuk <open.source@oleksan
>  RECIPE_MAINTAINER_pn-python3-libarchive-c = "Joshua Watt <
> JPEWhacker@gmail.com>"
>  RECIPE_MAINTAINER_pn-python3-magic = "Joshua Watt <JPEWhacker@gmail.com>"
>  RECIPE_MAINTAINER_pn-python3-mako = "Oleksandr Kravchuk <
> open.source@oleksandr-kravchuk.com>"
> +RECIPE_MAINTAINER_pn-python3-markupsafe = "Richard Purdie <
> richard.purdie@linuxfoundation.org>"
>  RECIPE_MAINTAINER_pn-python3-nose = "Oleksandr Kravchuk <
> open.source@oleksandr-kravchuk.com>"
>  RECIPE_MAINTAINER_pn-python3-numpy = "Oleksandr Kravchuk <
> open.source@oleksandr-kravchuk.com>"
>  RECIPE_MAINTAINER_pn-python3-pbr = "Oleksandr Kravchuk <
> open.source@oleksandr-kravchuk.com>"
> diff --git a/meta/recipes-devtools/python/python3-markupsafe/run-ptest
> b/meta/recipes-devtools/python/python3-markupsafe/run-ptest
> new file mode 100644
> index 00000000000..5cec7116968
> --- /dev/null
> +++ b/meta/recipes-devtools/python/python3-markupsafe/run-ptest
> @@ -0,0 +1,3 @@
> +#!/bin/sh
> +
> +pytest
> diff --git a/meta/recipes-devtools/python/python3-markupsafe_1.1.1.bb
> b/meta/recipes-devtools/python/python3-markupsafe_1.1.1.bb
> new file mode 100644
> index 00000000000..403a98a43f8
> --- /dev/null
> +++ b/meta/recipes-devtools/python/python3-markupsafe_1.1.1.bb
> @@ -0,0 +1,28 @@
> +DESCRIPTION = "Implements a XML/HTML/XHTML Markup safe string for Python"
> +HOMEPAGE = "http://github.com/mitsuhiko/markupsafe"
> +LICENSE = "BSD-3-Clause"
> +LIC_FILES_CHKSUM =
> "file://LICENSE.rst;md5=ffeffa59c90c9c4a033c7574f8f3fb75"
> +
> +SRC_URI[md5sum] = "43fd756864fe42063068e092e220c57b"
> +SRC_URI[sha256sum] =
> "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b"
> +
> +PYPI_PACKAGE = "MarkupSafe"
> +inherit pypi setuptools3
> +# ptest disabled in OE-Core for now due to missing dependencies
> +
> +RDEPENDS_${PN} += "${PYTHON_PN}-stringold"
> +
> +BBCLASSEXTEND = "native nativesdk"
> +
> +SRC_URI += " \
> +       file://run-ptest \
> +"
> +
> +RDEPENDS_${PN}-ptest += " \
> +       ${PYTHON_PN}-pytest \
> +"
> +
> +do_install_ptest() {
> +       install -d ${D}${PTEST_PATH}/tests
> +       cp -f ${S}/tests/* ${D}${PTEST_PATH}/tests/
> +}
> --
> 2.25.1
>
>
> 
>
>

[-- Attachment #2: Type: text/html, Size: 5505 bytes --]

Re: [OE-core] [PATCH 2/3] python3-jinja2: Import from meta-oe/meta-python

[Tim Orling]

[-- Attachment #1: Type: text/plain, Size: 3850 bytes --]

On Mon, Sep 21, 2020 at 5:12 AM Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:

> This is used by some of the results handling code and needed as part of
> buildtools tarball on various autobuilder worker for testing.
>
> ptest is disabled for OE-Core, at least for now since it depends on
> python3-pytest which in turn has may other dependencies.
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>
Acked-by: Tim Orling <ticotimo@gmail.com>
Signed-off-by: Tim Orling <ticotimo@gmail.com>

> ---
>  meta/conf/distro/include/maintainers.inc      |  1 +
>  .../python/python3-jinja2/run-ptest           |  3 ++
>  .../python/python3-jinja2_2.11.2.bb           | 45 +++++++++++++++++++
>  3 files changed, 49 insertions(+)
>  create mode 100644 meta/recipes-devtools/python/python3-jinja2/run-ptest
>  create mode 100644 meta/recipes-devtools/python/python3-jinja2_2.11.2.bb
>
> diff --git a/meta/conf/distro/include/maintainers.inc
> b/meta/conf/distro/include/maintainers.inc
> index 84f473290ab..d349382cb9d 100644
> --- a/meta/conf/distro/include/maintainers.inc
> +++ b/meta/conf/distro/include/maintainers.inc
> @@ -589,6 +589,7 @@ RECIPE_MAINTAINER_pn-python3-extras = "Oleksandr
> Kravchuk <open.source@oleksandr
>  RECIPE_MAINTAINER_pn-python3-git = "Oleksandr Kravchuk <
> open.source@oleksandr-kravchuk.com>"
>  RECIPE_MAINTAINER_pn-python3-gitdb = "Oleksandr Kravchuk <
> open.source@oleksandr-kravchuk.com>"
>  RECIPE_MAINTAINER_pn-python3-iniparse = "Oleksandr Kravchuk <
> open.source@oleksandr-kravchuk.com>"
> +RECIPE_MAINTAINER_pn-python3-jinja2 = "Richard Purdie <
> richard.purdie@linuxfoundation.org>"
>  RECIPE_MAINTAINER_pn-python3-libarchive-c = "Joshua Watt <
> JPEWhacker@gmail.com>"
>  RECIPE_MAINTAINER_pn-python3-magic = "Joshua Watt <JPEWhacker@gmail.com>"
>  RECIPE_MAINTAINER_pn-python3-mako = "Oleksandr Kravchuk <
> open.source@oleksandr-kravchuk.com>"
> diff --git a/meta/recipes-devtools/python/python3-jinja2/run-ptest
> b/meta/recipes-devtools/python/python3-jinja2/run-ptest
> new file mode 100644
> index 00000000000..5cec7116968
> --- /dev/null
> +++ b/meta/recipes-devtools/python/python3-jinja2/run-ptest
> @@ -0,0 +1,3 @@
> +#!/bin/sh
> +
> +pytest
> diff --git a/meta/recipes-devtools/python/python3-jinja2_2.11.2.bb
> b/meta/recipes-devtools/python/python3-jinja2_2.11.2.bb
> new file mode 100644
> index 00000000000..89538d2f272
> --- /dev/null
> +++ b/meta/recipes-devtools/python/python3-jinja2_2.11.2.bb
> @@ -0,0 +1,45 @@
> +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 disabled in OE-Core for now due to missing dependencies
> +
> +
> +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.25.1
>
>
> 
>
>

[-- Attachment #2: Type: text/html, Size: 5961 bytes --]

Re: [OE-core] [PATCH 3/3] buildtools-tarball: Add python3-jinja2

[Tim Orling]

[-- Attachment #1: Type: text/plain, Size: 1141 bytes --]

On Mon, Sep 21, 2020 at 5:12 AM Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:

> This is used by various pieces of the result handling code, particularly
> the
> performance testing and we're seeing autobuilder failures that are
> easiest resolved using this.
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>
Acked-by: Tim Orling <ticotimo@gmail.com>
Signed-off-by: Tim Orling <ticotimo@gmail.com>

> ---
>  meta/recipes-core/meta/buildtools-tarball.bb | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/meta/recipes-core/meta/buildtools-tarball.bb
> b/meta/recipes-core/meta/buildtools-tarball.bb
> index 75b71f55327..ef56f76fa71 100644
> --- a/meta/recipes-core/meta/buildtools-tarball.bb
> +++ b/meta/recipes-core/meta/buildtools-tarball.bb
> @@ -11,6 +11,7 @@ TOOLCHAIN_HOST_TASK ?= "\
>      nativesdk-python3-modules \
>      nativesdk-python3-misc \
>      nativesdk-python3-git \
> +    nativesdk-python3-jinja2 \
>      nativesdk-python3-testtools \
>      nativesdk-python3-subunit \
>      nativesdk-ncurses-terminfo-base \
> --
> 2.25.1
>
>
> 
>
>

[-- Attachment #2: Type: text/html, Size: 2409 bytes --]

Re: [OE-core] [PATCH 0/3] Import two python recipes from meta-oe/meta-python

[Khem Raj]

On 9/21/20 5:12 AM, Richard Purdie wrote:
> We have a slightly pressing situation where the performance test builds
> are failing after we cleaned up the system installs on those machines
> and tried to switch over to buildtools entirely.
> 
> The issue is the need for jinja2, complicated by the recipe's ptest
> dependencies. This series imports them with ptest not inherited, the
> idea being meta-python can bbappend and add the inherit.
> 

this seems to make this recipes inferior to what they currently are, 
IMO, while it solves the OE-Core usecase, it is ignoring wider usecase 
it has already been addressing all along. So either bring them in full
or leave some bbappends in meta-python to keep features working for 
users who are using it.


> The alternatives are either to try and solve this on the performace
> test machines using horrible hacks and revert my earlier attempted fix
> (which is correct but makes the situation worse), or import pytest
> over too which we may ultimately end up doing but probably should
> do right now?



> 
> Richard Purdie (3):
>    python3-markupsafe: Import from meta-oe/meta-python
>    python3-jinja2: Import from meta-oe/meta-python
>    buildtools-tarball: Add python3-jinja2
> 
>   meta/conf/distro/include/maintainers.inc      |  2 +
>   meta/recipes-core/meta/buildtools-tarball.bb  |  1 +
>   .../python/python3-jinja2/run-ptest           |  3 ++
>   .../python/python3-jinja2_2.11.2.bb           | 45 +++++++++++++++++++
>   .../python/python3-markupsafe/run-ptest       |  3 ++
>   .../python/python3-markupsafe_1.1.1.bb        | 28 ++++++++++++
>   6 files changed, 82 insertions(+)
>   create mode 100644 meta/recipes-devtools/python/python3-jinja2/run-ptest
>   create mode 100644 meta/recipes-devtools/python/python3-jinja2_2.11.2.bb
>   create mode 100644 meta/recipes-devtools/python/python3-markupsafe/run-ptest
>   create mode 100644 meta/recipes-devtools/python/python3-markupsafe_1.1.1.bb
> 
> 
> 
> 
> 

Re: [OE-core] [PATCH 0/3] Import two python recipes from meta-oe/meta-python

[Richard Purdie]

On Mon, 2020-09-21 at 23:57 -0700, Khem Raj wrote:
> 
> On 9/21/20 5:12 AM, Richard Purdie wrote:
> > We have a slightly pressing situation where the performance test builds
> > are failing after we cleaned up the system installs on those machines
> > and tried to switch over to buildtools entirely.
> > 
> > The issue is the need for jinja2, complicated by the recipe's ptest
> > dependencies. This series imports them with ptest not inherited, the
> > idea being meta-python can bbappend and add the inherit.
> > 
> 
> this seems to make this recipes inferior to what they currently are, 
> IMO, while it solves the OE-Core usecase, it is ignoring wider usecase 
> it has already been addressing all along. So either bring them in full
> or leave some bbappends in meta-python to keep features working for 
> users who are using it.

I discussed this and Tim/Trevor are going to replace the recipe with a
bbappend in meta-oe to ensure that doesn't regress.

Cheers,

Richard