As there's just a single user of the include, merge them. Signed-off-by: Ross Burton <[email protected]> --- .../recipes-devtools/python/python-pyasn1.inc | 31 ------------------ .../python/python3-pyasn1_0.6.0.bb | 32 +++++++++++++++++-- 2 files changed, 30 insertions(+), 33 deletions(-) delete mode 100644 meta/recipes-devtools/python/python-pyasn1.inc
diff --git a/meta/recipes-devtools/python/python-pyasn1.inc b/meta/recipes-devtools/python/python-pyasn1.inc deleted file mode 100644 index 7b269f2940f..00000000000 --- a/meta/recipes-devtools/python/python-pyasn1.inc +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Python library implementing ASN.1 types." -HOMEPAGE = "http://pyasn1.sourceforge.net/"; -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=190f79253908c986e6cacf380c3a5f6d" - -SRC_URI[sha256sum] = "3a35ab2c4b5ef98e17dfdec8ab074046fbda76e281c5a706ccd82328cfc8f64c" - -RDEPENDS:${PN}:class-target += " \ - python3-codecs \ - python3-logging \ - python3-math \ - python3-shell \ -" - -BBCLASSEXTEND = "native nativesdk" - -inherit ptest - -SRC_URI += " \ - file://run-ptest \ - " - -RDEPENDS:${PN}-ptest += " \ - python3-pytest \ - python3-unittest-automake-output \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} diff --git a/meta/recipes-devtools/python/python3-pyasn1_0.6.0.bb b/meta/recipes-devtools/python/python3-pyasn1_0.6.0.bb index 0519ba5edb0..c321f4e58e5 100644 --- a/meta/recipes-devtools/python/python3-pyasn1_0.6.0.bb +++ b/meta/recipes-devtools/python/python3-pyasn1_0.6.0.bb @@ -1,3 +1,31 @@ -inherit pypi setuptools3 -require python-pyasn1.inc +SUMMARY = "Python library implementing ASN.1 types." +HOMEPAGE = "http://pyasn1.sourceforge.net/"; +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=190f79253908c986e6cacf380c3a5f6d" +SRC_URI[sha256sum] = "3a35ab2c4b5ef98e17dfdec8ab074046fbda76e281c5a706ccd82328cfc8f64c" + +inherit pypi setuptools3 pytest + +RDEPENDS:${PN}:class-target += " \ + python3-codecs \ + python3-logging \ + python3-math \ + python3-shell \ +" + +SRC_URI += " \ + file://run-ptest \ + " + +RDEPENDS:${PN}-ptest += " \ + python3-pytest \ + python3-unittest-automake-output \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} + +BBCLASSEXTEND = "native nativesdk" -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#202388): https://lists.openembedded.org/g/openembedded-core/message/202388 Mute This Topic: https://lists.openembedded.org/mt/107505902/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
