From a5c7c4746ee6f12f925039ef88a73737e30942b8 Mon Sep 17 00:00:00 2001 From: Ricardo Silva Date: Thu, 4 Jan 2018 15:35:20 +0000 Subject: pyinotify: Fix support for different python versions The runtime dependencies for pyinotify are defined in python-pyinotify.inc file, which gets included from both the python2 and the python3 recipes for pyinotify. Since the include file is used for both python2 and python3 recipes, it must use the '${PYTHON_PN}-' prefix instead of just 'python-' for listing the dependencies in RDEPENDS, otherwise it is forcing python2 modules to be selected from a python3 recipe, so fix that. For example, use '${PYTHON_PN}-threading' instead of 'python-threading' for specifying a dependency from the 'threading' module. While at it, also use line separation and indentation on RDEPENDS for better readability. Signed-off-by: Ricardo Silva Signed-off-by: Armin Kuster --- meta-python/recipes-devtools/python/python-pyinotify.inc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta-python/recipes-devtools/python/python-pyinotify.inc b/meta-python/recipes-devtools/python/python-pyinotify.inc index 0168f1a870..7fcbb1850f 100644 --- a/meta-python/recipes-devtools/python/python-pyinotify.inc +++ b/meta-python/recipes-devtools/python/python-pyinotify.inc @@ -2,7 +2,13 @@ DESCRIPTION = "Python pyinotify: Linux filesystem events monitoring" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=ab173cade7965b411528464589a08382" -RDEPENDS_${PN} += "python-threading python-io python-subprocess python-misc python-shell" +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-threading \ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-subprocess \ + ${PYTHON_PN}-misc \ + ${PYTHON_PN}-shell \ +" SRC_URI[md5sum] = "8e580fa1ff3971f94a6f81672b76c406" SRC_URI[sha256sum] = "9c998a5d7606ca835065cdabc013ae6c66eb9ea76a00a1e3bc6e0cfe2b4f71f4" -- cgit 1.2.3-korg