On 6/15/20 8:38 AM, Leon Anavi wrote:
Consolidate inc and bb files into a single bb file.

Signed-off-by: Leon Anavi <[email protected]>
Acked-by: Trevor Gamblin <[email protected]>
---
  .../recipes-devtools/python/python-psutil.inc | 22 ----------------
  .../python/python3-psutil_5.7.0.bb            | 25 +++++++++++++++++--
  2 files changed, 23 insertions(+), 24 deletions(-)
  delete mode 100644 meta-python/recipes-devtools/python/python-psutil.inc

diff --git a/meta-python/recipes-devtools/python/python-psutil.inc 
b/meta-python/recipes-devtools/python/python-psutil.inc
deleted file mode 100644
index dfb33e8dc..000000000
--- a/meta-python/recipes-devtools/python/python-psutil.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-SUMMARY = "A cross-platform process and system utilities module for Python"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=e35fd9f271d19d5f742f20a9d1f8bb8b"
-
-SRC_URI[md5sum] = "ed7b0f11ed214bcabbe76b7cf52f3ae3"
-SRC_URI[sha256sum] = 
"685ec16ca14d079455892f25bd124df26ff9137664af445563c1bd36629b5e0e"
-
-PACKAGES =+ "${PN}-tests"
-
-FILES_${PN}-tests += " \
-    ${PYTHON_SITEPACKAGES_DIR}/psutil/test* \
-    ${PYTHON_SITEPACKAGES_DIR}/psutil/__pycache__/test* \
-"
-
-
-RDEPENDS_${PN} += " \
-    ${PYTHON_PN}-shell \
-    ${PYTHON_PN}-threading \
-    ${PYTHON_PN}-xml \
-"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-python/recipes-devtools/python/python3-psutil_5.7.0.bb 
b/meta-python/recipes-devtools/python/python3-psutil_5.7.0.bb
index c1969ea65..170819d59 100644
--- a/meta-python/recipes-devtools/python/python3-psutil_5.7.0.bb
+++ b/meta-python/recipes-devtools/python/python3-psutil_5.7.0.bb
@@ -1,4 +1,25 @@
+SUMMARY = "A cross-platform process and system utilities module for Python"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=e35fd9f271d19d5f742f20a9d1f8bb8b"
+
+SRC_URI[md5sum] = "ed7b0f11ed214bcabbe76b7cf52f3ae3"
+SRC_URI[sha256sum] = 
"685ec16ca14d079455892f25bd124df26ff9137664af445563c1bd36629b5e0e"
+
  inherit pypi setuptools3
-require python-psutil.inc
-RDEPENDS_${PN} += "${PYTHON_PN}-netclient"
+PACKAGES =+ "${PN}-tests"
+
+FILES_${PN}-tests += " \
+    ${PYTHON_SITEPACKAGES_DIR}/psutil/test* \
+    ${PYTHON_SITEPACKAGES_DIR}/psutil/__pycache__/test* \
+"
+
+
+RDEPENDS_${PN} += " \
+    ${PYTHON_PN}-shell \
+    ${PYTHON_PN}-threading \
+    ${PYTHON_PN}-xml \
+    ${PYTHON_PN}-netclient \
+"
+
+BBCLASSEXTEND = "native nativesdk"


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#85160): 
https://lists.openembedded.org/g/openembedded-devel/message/85160
Mute This Topic: https://lists.openembedded.org/mt/74893263/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub  
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to