[oe-commits] [openembedded-core] 04/13: recipetool: create: fix mapping python dependencies to python-dbg package

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 94675f3b607f07c5a5c4549b37f8f56dae49cb11
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
AuthorDate: Tue Sep 6 22:03:25 2016 +1200

    recipetool: create: fix mapping python dependencies to python-dbg package
    
    When trying to map python module dependencies to the packages that
    provide them, if we're looking for .so files that satisfy
    dependencies then we need to exclude files found under the .debug
    directory, otherwise the dependency will get mapped to the python-dbg
    package which isn't correct.
    
    For example, this fixes creating a recipe for pyserial and not getting
    python-fcntl in RDEPENDS_${PN}, leading to errors when trying to use the
    serial module on the target.
    
    Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 scripts/lib/recipetool/create_buildsys_python.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/lib/recipetool/create_buildsys_python.py b/scripts/lib/recipetool/create_buildsys_python.py
index aff13cf..fb9806d 100644
--- a/scripts/lib/recipetool/create_buildsys_python.py
+++ b/scripts/lib/recipetool/create_buildsys_python.py
@@ -504,8 +504,10 @@ class PythonRecipeHandler(RecipeHandler):
         for dep in scanned_deps:
             mapped = provided_packages.get(dep)
             if mapped:
+                logger.debug('Mapped %s to %s' % (dep, mapped))
                 mapped_deps.add(mapped)
             else:
+                logger.debug('Could not map %s' % dep)
                 unmapped_deps.add(dep)
         return mapped_deps, unmapped_deps
 
@@ -566,6 +568,8 @@ class PythonRecipeHandler(RecipeHandler):
                     continue
 
                 if fn.startswith(dynload_dir + os.sep):
+                    if '/.debug/' in fn:
+                        continue
                     base = os.path.basename(fn)
                     provided = base.split('.', 1)[0]
                     packages[provided] = os.path.basename(pkgdatafile)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.