From cb3e4746dc3c1252cfb309326f89fcba06b6727f Mon Sep 17 00:00:00 2001 From: Derek Straka Date: Sat, 4 Apr 2020 13:12:51 -0400 Subject: [PATCH] python-scrypt: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- .../recipes-devtools/python/python-scrypt.inc | 29 ------------------- ...-remove-the-hard-coded-include-paths.patch | 0 .../python/python3-scrypt_0.8.6.bb | 25 ++++++++++++++-- 3 files changed, 23 insertions(+), 31 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python-scrypt.inc rename meta-python/recipes-devtools/python/{python-scrypt => python3-scrypt}/0001-py-scrypt-remove-the-hard-coded-include-paths.patch (100%) diff --git a/meta-python/recipes-devtools/python/python-scrypt.inc b/meta-python/recipes-devtools/python/python-scrypt.inc deleted file mode 100644 index aa9d7b8d4..000000000 --- a/meta-python/recipes-devtools/python/python-scrypt.inc +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION = "Bindings for the scrypt key derivation function library" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=168ff75417f75a83e63c8875292d44dc" -HOMEPAGE="https://bitbucket.org/mhallin/py-scrypt/overview" - -FILESEXTRAPATHS_prepend := "${THISDIR}/python-scrypt:" - -SRC_URI += "file://0001-py-scrypt-remove-the-hard-coded-include-paths.patch" - -SRC_URI[md5sum] = "ae8e3263aa31b040c1f9c7f1e1843a56" -SRC_URI[sha256sum] = "f8239b2d47fa1d40bc27efd231dc7083695d10c1c2ac51a99380360741e0362d" - -inherit pypi ptest - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS_${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} - -RDEPENDS_${PN}_class-target += "\ -" diff --git a/meta-python/recipes-devtools/python/python-scrypt/0001-py-scrypt-remove-the-hard-coded-include-paths.patch b/meta-python/recipes-devtools/python/python3-scrypt/0001-py-scrypt-remove-the-hard-coded-include-paths.patch similarity index 100% rename from meta-python/recipes-devtools/python/python-scrypt/0001-py-scrypt-remove-the-hard-coded-include-paths.patch rename to meta-python/recipes-devtools/python/python3-scrypt/0001-py-scrypt-remove-the-hard-coded-include-paths.patch diff --git a/meta-python/recipes-devtools/python/python3-scrypt_0.8.6.bb b/meta-python/recipes-devtools/python/python3-scrypt_0.8.6.bb index f49665322..7588fc54b 100644 --- a/meta-python/recipes-devtools/python/python3-scrypt_0.8.6.bb +++ b/meta-python/recipes-devtools/python/python3-scrypt_0.8.6.bb @@ -1,3 +1,24 @@ -inherit setuptools3 python3-dir -require python-scrypt.inc +DESCRIPTION = "Bindings for the scrypt key derivation function library" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=168ff75417f75a83e63c8875292d44dc" +HOMEPAGE="https://bitbucket.org/mhallin/py-scrypt/overview" +SRC_URI += "file://0001-py-scrypt-remove-the-hard-coded-include-paths.patch" + +SRC_URI[md5sum] = "ae8e3263aa31b040c1f9c7f1e1843a56" +SRC_URI[sha256sum] = "f8239b2d47fa1d40bc27efd231dc7083695d10c1c2ac51a99380360741e0362d" + +inherit pypi ptest setuptools3 + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +}