diff options
author | Nicolas Dechesne <nicolas.dechesne@linaro.org> | 2021-07-20 18:30:51 +0200 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2021-07-25 13:36:16 -0700 |
commit | d34d040fdaf199cee2a956b09a448aa8d9aa8fe9 (patch) | |
tree | af806fd4788c52c7df685cd6f33be5bc3ed92766 /meta-python | |
parent | 8bdc78483115e12943f0946c8e863d4a70ef7168 (diff) | |
download | meta-openembedded-d34d040fdaf199cee2a956b09a448aa8d9aa8fe9.tar.gz |
python3-{pyyaml,cython,pyparsing}: move from meta-python to meta-oe
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>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-python')
4 files changed, 0 insertions, 97 deletions
diff --git a/meta-python/recipes-devtools/python/python-cython.inc b/meta-python/recipes-devtools/python/python-cython.inc deleted file mode 100644 index 3260e92bac..0000000000 --- a/meta-python/recipes-devtools/python/python-cython.inc +++ /dev/null @@ -1,40 +0,0 @@ -DESCRIPTION = "Cython is a language specially designed for writing Python extension modules. \ -It's designed to bridge the gap between the nice, high-level, easy-to-use world of Python \ -and the messy, low-level world of C." -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e23fadd6ceef8c618fc1c65191d846fa" -PYPI_PACKAGE = "Cython" -BBCLASSEXTEND = "native nativesdk" - -SRC_URI[md5sum] = "6e2f139e30bb08d68366f9370d87964c" -SRC_URI[sha256sum] = "e4d6bb8703d0319eb04b7319b12ea41580df44fd84d83ccda13ea463c6801414" - -inherit pypi - -RDEPENDS_${PN}_class-target += "\ - ${PYTHON_PN}-misc \ - ${PYTHON_PN}-netserver \ - ${PYTHON_PN}-pkgutil \ - ${PYTHON_PN}-pyparsing \ - ${PYTHON_PN}-setuptools \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-xml \ -" - -RDEPENDS_${PN}_class-nativesdk += "\ - nativesdk-${PYTHON_PN}-misc \ - nativesdk-${PYTHON_PN}-netserver \ - nativesdk-${PYTHON_PN}-pkgutil \ - nativesdk-${PYTHON_PN}-pyparsing \ - nativesdk-${PYTHON_PN}-setuptools \ - nativesdk-${PYTHON_PN}-shell \ - nativesdk-${PYTHON_PN}-xml \ -" - -do_install_append() { - # Make sure we use /usr/bin/env python - for PYTHSCRIPT in `grep -rIl '^#!.*python' ${D}`; do - sed -i -e '1s|^#!.*|#!/usr/bin/env ${PYTHON_PN}|' $PYTHSCRIPT - done -} diff --git a/meta-python/recipes-devtools/python/python3-cython_0.29.14.bb b/meta-python/recipes-devtools/python/python3-cython_0.29.14.bb deleted file mode 100644 index 2ce6bdbd68..0000000000 --- a/meta-python/recipes-devtools/python/python3-cython_0.29.14.bb +++ /dev/null @@ -1,18 +0,0 @@ -inherit setuptools3 -require python-cython.inc - -RDEPENDS_${PN} += "\ - python3-setuptools \ -" - -# running build_ext a second time during install fails, because Python -# would then attempt to import cythonized modules built for the target -# architecture. -DISTUTILS_INSTALL_ARGS += "--skip-build" - -do_install_append() { - # rename scripts that would conflict with the Python 2 build of Cython - mv ${D}${bindir}/cython ${D}${bindir}/cython3 - mv ${D}${bindir}/cythonize ${D}${bindir}/cythonize3 - mv ${D}${bindir}/cygdb ${D}${bindir}/cygdb3 -} diff --git a/meta-python/recipes-devtools/python/python3-pyparsing_2.4.6.bb b/meta-python/recipes-devtools/python/python3-pyparsing_2.4.6.bb deleted file mode 100644 index a6ec1cb9c3..0000000000 --- a/meta-python/recipes-devtools/python/python3-pyparsing_2.4.6.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Python parsing module" -HOMEPAGE = "http://pyparsing.wikispaces.com/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=657a566233888513e1f07ba13e2f47f1" - -SRC_URI[md5sum] = "29733ea8cbee0291aad121c69c6e51a1" -SRC_URI[sha256sum] = "4c830582a84fb022400b85429791bc551f1f4871c33f23e44f353119e92f969f" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-debugger \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-pprint \ - ${PYTHON_PN}-stringold \ - ${PYTHON_PN}-threading \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-pyyaml_5.3.1.bb b/meta-python/recipes-devtools/python/python3-pyyaml_5.3.1.bb deleted file mode 100644 index 8cf9093041..0000000000 --- a/meta-python/recipes-devtools/python/python3-pyyaml_5.3.1.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Python support for YAML" -DEPENDS += "libyaml ${PYTHON_PN}-cython-native" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=7bbd28caa69f81f5cd5f48647236663d" - -PYPI_PACKAGE = "PyYAML" - -inherit pypi setuptools3 - -SRC_URI[sha256sum] = "b8eac752c5e14d3eca0e6dd9199cd627518cb5ec06add0de9d32baeee6fe645d" - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-netclient \ -" - -BBCLASSEXTEND = "native nativesdk" |