aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Orling <ticotimo@gmail.com>2020-04-25 23:20:38 -0700
committerTim Orling <ticotimo@gmail.com>2020-04-25 23:21:46 -0700
commit68aa04b0cd44a65539a15159568b969d87338834 (patch)
tree81e9541da45025f25e84f1e08bcd9529b089ec23
parent29ef6907646479ecca565c98668c5b1a378caecc (diff)
downloadmeta-openembedded-contrib-timo/py_inc_merge.tar.gz
meta-openembedded-contrib-timo/py_inc_merge.tar.bz2
meta-openembedded-contrib-timo/py_inc_merge.zip
python3-cryptography-vectors: merge bb and inctimo/py_inc_merge
Signed-off-by: Tim Orling <ticotimo@gmail.com>
-rw-r--r--meta-python/recipes-devtools/python/python-cryptography-vectors.inc18
-rw-r--r--meta-python/recipes-devtools/python/python3-cryptography-vectors_2.8.bb21
2 files changed, 20 insertions, 19 deletions
diff --git a/meta-python/recipes-devtools/python/python-cryptography-vectors.inc b/meta-python/recipes-devtools/python/python-cryptography-vectors.inc
deleted file mode 100644
index 10af48c9fb..0000000000
--- a/meta-python/recipes-devtools/python/python-cryptography-vectors.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-SUMMARY = "Test vectors for the cryptography package."
-HOMEPAGE = "https://cryptography.io/"
-SECTION = "devel/python"
-LICENSE = "Apache-2.0 | BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4"
-
-DEPENDS += " \
- ${PYTHON_PN}-cryptography \
-"
-
-SRC_URI[md5sum] = "a744ed29bb9ef56b3a50317fea3b218e"
-SRC_URI[sha256sum] = "6cd32174c56a3eca72f64af43c1daacaae758cfa5ff9d280dfcf818fa11ef116"
-
-PYPI_PACKAGE = "cryptography_vectors"
-
-BBCLASSEXTEND = "native nativesdk"
-
-UPSTREAM_CHECK_REGEX = ""
diff --git a/meta-python/recipes-devtools/python/python3-cryptography-vectors_2.8.bb b/meta-python/recipes-devtools/python/python3-cryptography-vectors_2.8.bb
index 58994ffffa..49a5664dcd 100644
--- a/meta-python/recipes-devtools/python/python3-cryptography-vectors_2.8.bb
+++ b/meta-python/recipes-devtools/python/python3-cryptography-vectors_2.8.bb
@@ -1,2 +1,21 @@
-inherit pypi setuptools3
require python-cryptography-vectors.inc
+SUMMARY = "Test vectors for the cryptography package."
+HOMEPAGE = "https://cryptography.io/"
+SECTION = "devel/python"
+LICENSE = "Apache-2.0 | BSD"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4"
+
+SRC_URI[md5sum] = "a744ed29bb9ef56b3a50317fea3b218e"
+SRC_URI[sha256sum] = "6cd32174c56a3eca72f64af43c1daacaae758cfa5ff9d280dfcf818fa11ef116"
+
+PYPI_PACKAGE = "cryptography_vectors"
+
+inherit pypi setuptools3
+
+DEPENDS += " \
+ ${PYTHON_PN}-cryptography \
+"
+
+BBCLASSEXTEND = "native nativesdk"
+
+UPSTREAM_CHECK_REGEX = ""