From 5c9d583d6d764a68f3174f62e3838318568ea418 Mon Sep 17 00:00:00 2001 From: Derek Straka Date: Sat, 4 Apr 2020 13:12:45 -0400 Subject: python-sh: consolidate inc and bb files into a single bb file Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-sh.inc | 32 ---------------------- .../recipes-devtools/python/python3-sh_1.12.14.bb | 23 ++++++++++++++-- 2 files changed, 21 insertions(+), 34 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python-sh.inc (limited to 'meta-python/recipes-devtools/python') diff --git a/meta-python/recipes-devtools/python/python-sh.inc b/meta-python/recipes-devtools/python/python-sh.inc deleted file mode 100644 index f2fd562bb5..0000000000 --- a/meta-python/recipes-devtools/python/python-sh.inc +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "Python subprocess replacement" -HOMEPAGE = "https://github.com/amoffat/sh" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=5317094292296f03405f59ae5f6544b6" - -SRC_URI[md5sum] = "a8351aef25d25f707c17e0a7a6280251" -SRC_URI[sha256sum] = "b52bf5833ed01c7b5c5fb73a7f71b3d98d48e9b9b8764236237bdc7ecae850fc" - -PYPI_PACKAGE = "sh" - -inherit pypi - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-codecs \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-resource \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-terminal \ - ${PYTHON_PN}-tests \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-unixadmin \ -" - -# WARNING: We were unable to map the following python package/module -# dependencies to the bitbake packages which include them: -# coverage - only used in test and there is a check to see if it is -# available before importing. -# queue - part of threading -# signal - part of core in python3. not sure how it is imported in python2. -# No complants in compiling. diff --git a/meta-python/recipes-devtools/python/python3-sh_1.12.14.bb b/meta-python/recipes-devtools/python/python3-sh_1.12.14.bb index 812bd4b1ac..b7858734b2 100644 --- a/meta-python/recipes-devtools/python/python3-sh_1.12.14.bb +++ b/meta-python/recipes-devtools/python/python3-sh_1.12.14.bb @@ -1,5 +1,24 @@ -require python-sh.inc -inherit setuptools3 +SUMMARY = "Python subprocess replacement" +HOMEPAGE = "https://github.com/amoffat/sh" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=5317094292296f03405f59ae5f6544b6" + +SRC_URI[md5sum] = "a8351aef25d25f707c17e0a7a6280251" +SRC_URI[sha256sum] = "b52bf5833ed01c7b5c5fb73a7f71b3d98d48e9b9b8764236237bdc7ecae850fc" + +PYPI_PACKAGE = "sh" + +inherit pypi setuptools3 RDEPENDS_${PN} += " \ + ${PYTHON_PN}-codecs \ + ${PYTHON_PN}-core \ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-resource \ + ${PYTHON_PN}-shell \ + ${PYTHON_PN}-terminal \ + ${PYTHON_PN}-tests \ + ${PYTHON_PN}-threading \ + ${PYTHON_PN}-unixadmin \ " -- cgit v1.2.3-54-g00ecf