From 4584257494ae197c6b03b4afbc2485e8253ea4b4 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Fri, 17 Dec 2021 12:52:53 +0100 Subject: [PATCH] hardknott: python: sync with meta-imx hardknott-5.10.72-2.2.0 branch Remove recipes that are available in the community layers, include a new .bbappend for python3-matplotlib and update the .bbappend for python3-wheel Signed-off-by: Gabriel Valcazar --- .../python-pycrypto/cross-compiling.patch | 23 ------------- .../python/python-pycrypto_2.6.1.bb | 34 ------------------- .../python/python-pycryptodome.inc | 31 ----------------- .../python/python-pyelftools.inc | 12 ------- .../python/python3-matplotlib_%.bbappend | 5 +++ .../python/python3-pycryptodomex_3.9.4.bb | 7 ---- .../python/python3-pyelftools_0.25.bb | 2 -- .../python/python3-wheel_%.bbappend | 3 +- 8 files changed, 6 insertions(+), 111 deletions(-) delete mode 100644 meta-digi-dey/recipes-devtools/python/python-pycrypto/cross-compiling.patch delete mode 100644 meta-digi-dey/recipes-devtools/python/python-pycrypto_2.6.1.bb delete mode 100644 meta-digi-dey/recipes-devtools/python/python-pycryptodome.inc delete mode 100644 meta-digi-dey/recipes-devtools/python/python-pyelftools.inc create mode 100644 meta-digi-dey/recipes-devtools/python/python3-matplotlib_%.bbappend delete mode 100644 meta-digi-dey/recipes-devtools/python/python3-pycryptodomex_3.9.4.bb delete mode 100644 meta-digi-dey/recipes-devtools/python/python3-pyelftools_0.25.bb diff --git a/meta-digi-dey/recipes-devtools/python/python-pycrypto/cross-compiling.patch b/meta-digi-dey/recipes-devtools/python/python-pycrypto/cross-compiling.patch deleted file mode 100644 index 712f3e8dd..000000000 --- a/meta-digi-dey/recipes-devtools/python/python-pycrypto/cross-compiling.patch +++ /dev/null @@ -1,23 +0,0 @@ -Index: pycrypto-2.6/setup.py -=================================================================== ---- pycrypto-2.6.orig/setup.py -+++ pycrypto-2.6/setup.py -@@ -271,7 +271,8 @@ class PCTBuildConfigure(Command): - if not os.path.exists("config.status"): - if os.system("chmod 0755 configure") != 0: - raise RuntimeError("chmod error") -- cmd = "sh configure" # we use "sh" here so that it'll work on mingw32 with standard python.org binaries -+ host = os.environ.get("HOST_SYS") -+ cmd = "ac_cv_func_malloc_0_nonnull=yes sh configure --host " + host # we use "sh" here so that it'll work on mingw32 with standard python.org binaries - if self.verbose < 1: - cmd += " -q" - if os.system(cmd) != 0: -@@ -370,7 +371,7 @@ kw = {'name':"pycrypto", - 'ext_modules': plat_ext + [ - # _fastmath (uses GNU mp library) - Extension("Crypto.PublicKey._fastmath", -- include_dirs=['src/','/usr/include/'], -+ include_dirs=['src/'], - libraries=['gmp'], - sources=["src/_fastmath.c"]), - diff --git a/meta-digi-dey/recipes-devtools/python/python-pycrypto_2.6.1.bb b/meta-digi-dey/recipes-devtools/python/python-pycrypto_2.6.1.bb deleted file mode 100644 index 1477418dc..000000000 --- a/meta-digi-dey/recipes-devtools/python/python-pycrypto_2.6.1.bb +++ /dev/null @@ -1,34 +0,0 @@ -DESCRIPTION = "Cryptographic modules for Python." -HOMEPAGE = "http://www.pycrypto.org/" -SECTION = "devel/python" -LICENSE = "PSFv2" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=35f354d199e8cb7667b059a23578e63d" - -SRCNAME = "pycrypto" - -SRC_URI = "https://pypi.python.org/packages/source/p/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \ - file://cross-compiling.patch" - -SRC_URI[md5sum] = "55a61a054aa66812daf5161a0d5d7eda" -SRC_URI[sha256sum] = "f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c" - -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit autotools autotools-brokensep distutils - -DEPENDS += " gmp" - -export STAGING_INCDIR -export STAGING_LIBDIR -export BUILD_SYS -export HOST_SYS - - -# We explicitly call distutils_do_install, since we want it to run, but -# *don't* want the autotools install to run, since this package doesn't -# provide a "make install" target. -do_install() { - distutils_do_install -} - -BBCLASSEXTEND = "native" diff --git a/meta-digi-dey/recipes-devtools/python/python-pycryptodome.inc b/meta-digi-dey/recipes-devtools/python/python-pycryptodome.inc deleted file mode 100644 index 1d568c346..000000000 --- a/meta-digi-dey/recipes-devtools/python/python-pycryptodome.inc +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Cryptographic library for Python" -DESCRIPTION = "PyCryptodome is a self-contained Python package of low-level \ - cryptographic primitives.\ -This library is a fork of the pycrypto library. It can be installed as a drop-in replacement\ - or an independent library that works along side pycrypto." - -HOMEPAGE = "http://www.pycryptodome.org" -LICENSE = "PD & BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=6dc0e2a13d2f25d6f123c434b761faba" - -SRC_URI[md5sum] = "46ba513d95b6e323734074d960a7d57b" -SRC_URI[sha256sum] = "22d970cee5c096b9123415e183ae03702b2cd4d3ba3f0ced25c4e1aba3967167" -inherit pypi - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-math \ -" - -RDEPENDS_${PN}-tests += " \ - ${PYTHON_PN}-unittest \ -" - -PACKAGES =+ "${PN}-tests" - -FILES_${PN}-tests += " \ - ${PYTHON_SITEPACKAGES_DIR}/Cryptodome/SelfTest/ \ - ${PYTHON_SITEPACKAGES_DIR}/Cryptodome/SelfTest/__pycache__/ \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-digi-dey/recipes-devtools/python/python-pyelftools.inc b/meta-digi-dey/recipes-devtools/python/python-pyelftools.inc deleted file mode 100644 index a02166af8..000000000 --- a/meta-digi-dey/recipes-devtools/python/python-pyelftools.inc +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "Python library and tools for doing stuff with EFL files." -DESCRIPTION = "Minimal but very flexible implementation of the expect pattern" -SECTION = "devel/python" -HOMEPAGE = " git://github.com/eliben/pyelftools" -LICENSE = "PD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=5ce2a2b07fca326bc7c146d10105ccfc" - -inherit pypi python3native - -SRC_URI[sha256sum] = "89c6da6f56280c37a5ff33468591ba9a124e17d71fe42de971818cbff46c1b24" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-digi-dey/recipes-devtools/python/python3-matplotlib_%.bbappend b/meta-digi-dey/recipes-devtools/python/python3-matplotlib_%.bbappend new file mode 100644 index 000000000..67033d7be --- /dev/null +++ b/meta-digi-dey/recipes-devtools/python/python3-matplotlib_%.bbappend @@ -0,0 +1,5 @@ +do_compile_prepend() { + # Packages are downloaded during the build so the proxy is needed + export http_proxy=${http_proxy} + export https_proxy=${https_proxy} +} diff --git a/meta-digi-dey/recipes-devtools/python/python3-pycryptodomex_3.9.4.bb b/meta-digi-dey/recipes-devtools/python/python3-pycryptodomex_3.9.4.bb deleted file mode 100644 index 788beb726..000000000 --- a/meta-digi-dey/recipes-devtools/python/python3-pycryptodomex_3.9.4.bb +++ /dev/null @@ -1,7 +0,0 @@ -require python-pycryptodome.inc -inherit setuptools3 - -# This recipe install pycryptodome as an independent library. -do_configure_prepend () { -touch ${S}/.separate_namespace -} diff --git a/meta-digi-dey/recipes-devtools/python/python3-pyelftools_0.25.bb b/meta-digi-dey/recipes-devtools/python/python3-pyelftools_0.25.bb deleted file mode 100644 index a71b2f652..000000000 --- a/meta-digi-dey/recipes-devtools/python/python3-pyelftools_0.25.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-pyelftools.inc \ No newline at end of file diff --git a/meta-digi-dey/recipes-devtools/python/python3-wheel_%.bbappend b/meta-digi-dey/recipes-devtools/python/python3-wheel_%.bbappend index fe2bad50c..2a590838b 100644 --- a/meta-digi-dey/recipes-devtools/python/python3-wheel_%.bbappend +++ b/meta-digi-dey/recipes-devtools/python/python3-wheel_%.bbappend @@ -1,2 +1 @@ - -BBCLASSEXTEND = "native nativesdk" +BBCLASSEXTEND += "nativesdk"