On 9/25/20 7:23 AM, Leon Anavi wrote:
Consolidate inc and bb files into a single bb file.
Signed-off-by: Leon Anavi <leon.an...@konsulko.com>
Acked-by: Trevor Gamblin <trevor.gamb...@windriver.com>
---
.../python/python-pycrypto.inc | 21 ----------------
.../CVE-2013-7459.patch | 0
.../cross-compiling.patch | 0
.../python/python3-pycrypto_2.6.1.bb | 24 ++++++++++++++++---
4 files changed, 21 insertions(+), 24 deletions(-)
delete mode 100644 meta-python/recipes-devtools/python/python-pycrypto.inc
rename meta-python/recipes-devtools/python/{python-pycrypto =>
python3-pycrypto}/CVE-2013-7459.patch (100%)
rename meta-python/recipes-devtools/python/{python-pycrypto =>
python3-pycrypto}/cross-compiling.patch (100%)
diff --git a/meta-python/recipes-devtools/python/python-pycrypto.inc
b/meta-python/recipes-devtools/python/python-pycrypto.inc
deleted file mode 100644
index 232cdb7116..0000000000
--- a/meta-python/recipes-devtools/python/python-pycrypto.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "Cryptographic modules for Python."
-HOMEPAGE = "http://www.pycrypto.org/";
-LICENSE = "PSFv2"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=35f354d199e8cb7667b059a23578e63d"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/python-pycrypto:"
-
-DEPENDS += " gmp"
-
-inherit pypi autotools-brokensep
-
-SRC_URI += "file://cross-compiling.patch \
- file://CVE-2013-7459.patch \
- "
-
-SRC_URI[md5sum] = "55a61a054aa66812daf5161a0d5d7eda"
-SRC_URI[sha256sum] =
"f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c"
-
-do_compile[noexec] = "1"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git
a/meta-python/recipes-devtools/python/python-pycrypto/CVE-2013-7459.patch
b/meta-python/recipes-devtools/python/python3-pycrypto/CVE-2013-7459.patch
similarity index 100%
rename from
meta-python/recipes-devtools/python/python-pycrypto/CVE-2013-7459.patch
rename to
meta-python/recipes-devtools/python/python3-pycrypto/CVE-2013-7459.patch
diff --git
a/meta-python/recipes-devtools/python/python-pycrypto/cross-compiling.patch
b/meta-python/recipes-devtools/python/python3-pycrypto/cross-compiling.patch
similarity index 100%
rename from
meta-python/recipes-devtools/python/python-pycrypto/cross-compiling.patch
rename to
meta-python/recipes-devtools/python/python3-pycrypto/cross-compiling.patch
diff --git a/meta-python/recipes-devtools/python/python3-pycrypto_2.6.1.bb
b/meta-python/recipes-devtools/python/python3-pycrypto_2.6.1.bb
index a20eafec43..78a1ef2ac0 100644
--- a/meta-python/recipes-devtools/python/python3-pycrypto_2.6.1.bb
+++ b/meta-python/recipes-devtools/python/python3-pycrypto_2.6.1.bb
@@ -1,7 +1,23 @@
-inherit distutils3
-require python-pycrypto.inc
+DESCRIPTION = "Cryptographic modules for Python."
+HOMEPAGE = "http://www.pycrypto.org/";
+LICENSE = "PSFv2"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=35f354d199e8cb7667b059a23578e63d"
-SRC_URI += "file://0001-Replace-time.clock-with-time.process_time.patch"
+DEPENDS += " gmp"
+
+export HOST_SYS
+
+inherit pypi autotools-brokensep distutils3
+
+SRC_URI += "file://cross-compiling.patch \
+ file://CVE-2013-7459.patch \
+ file://0001-Replace-time.clock-with-time.process_time.patch \
+ "
+
+SRC_URI[md5sum] = "55a61a054aa66812daf5161a0d5d7eda"
+SRC_URI[sha256sum] =
"f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c"
+
+do_compile[noexec] = "1"
# 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
@@ -9,3 +25,5 @@ SRC_URI +=
"file://0001-Replace-time.clock-with-time.process_time.patch"
do_install() {
distutils3_do_install
}
+
+BBCLASSEXTEND = "native nativesdk"
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#87298):
https://lists.openembedded.org/g/openembedded-devel/message/87298
Mute This Topic: https://lists.openembedded.org/mt/77077311/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
