From cb3e4746dc3c1252cfb309326f89fcba06b6727f Mon Sep 17 00:00:00 2001 From: Derek Straka Date: Sat, 4 Apr 2020 13:12:51 -0400 Subject: 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 ---------------------- ...crypt-remove-the-hard-coded-include-paths.patch | 26 ------------------- ...crypt-remove-the-hard-coded-include-paths.patch | 26 +++++++++++++++++++ .../python/python3-scrypt_0.8.6.bb | 25 +++++++++++++++++-- 4 files changed, 49 insertions(+), 57 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python-scrypt.inc delete mode 100644 meta-python/recipes-devtools/python/python-scrypt/0001-py-scrypt-remove-the-hard-coded-include-paths.patch create mode 100644 meta-python/recipes-devtools/python/python3-scrypt/0001-py-scrypt-remove-the-hard-coded-include-paths.patch (limited to 'meta-python/recipes-devtools/python') 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 aa9d7b8d4d..0000000000 --- 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/python-scrypt/0001-py-scrypt-remove-the-hard-coded-include-paths.patch deleted file mode 100644 index d535e43261..0000000000 --- a/meta-python/recipes-devtools/python/python-scrypt/0001-py-scrypt-remove-the-hard-coded-include-paths.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d8db473ce9346cd6254c90e13ac45b3bbde494c4 Mon Sep 17 00:00:00 2001 -From: Derek Straka -Date: Sun, 11 Mar 2018 19:55:38 -0400 -Subject: [PATCH] py-scrypt: remove the hard coded include paths - -Upstream-Status: Pending - -Signed-off-by: Derek Straka ---- - setup.py | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/setup.py b/setup.py -index e36adc4..2ebfbf1 100644 ---- a/setup.py -+++ b/setup.py -@@ -24,7 +24,6 @@ if sys.platform.startswith('linux'): - ('HAVE_SYS_SYSINFO_H', '1'), - ('_FILE_OFFSET_BITS', '64')] - libraries = ['crypto', 'rt'] -- includes = ['/usr/local/include', '/usr/include'] - CFLAGS.append('-O2') - elif sys.platform.startswith('win32'): - define_macros = [('inline', '__inline')] --- -2.7.4 diff --git a/meta-python/recipes-devtools/python/python3-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 new file mode 100644 index 0000000000..d535e43261 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-scrypt/0001-py-scrypt-remove-the-hard-coded-include-paths.patch @@ -0,0 +1,26 @@ +From d8db473ce9346cd6254c90e13ac45b3bbde494c4 Mon Sep 17 00:00:00 2001 +From: Derek Straka +Date: Sun, 11 Mar 2018 19:55:38 -0400 +Subject: [PATCH] py-scrypt: remove the hard coded include paths + +Upstream-Status: Pending + +Signed-off-by: Derek Straka +--- + setup.py | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/setup.py b/setup.py +index e36adc4..2ebfbf1 100644 +--- a/setup.py ++++ b/setup.py +@@ -24,7 +24,6 @@ if sys.platform.startswith('linux'): + ('HAVE_SYS_SYSINFO_H', '1'), + ('_FILE_OFFSET_BITS', '64')] + libraries = ['crypto', 'rt'] +- includes = ['/usr/local/include', '/usr/include'] + CFLAGS.append('-O2') + elif sys.platform.startswith('win32'): + define_macros = [('inline', '__inline')] +-- +2.7.4 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 f49665322e..7588fc54ba 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/ +} -- cgit v1.2.3-54-g00ecf