[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2323/8267] recipetool: create: fix mapping python dependencies to python-dbg package



commit 9885a9dd3167670f4716991a39aed1b04e274c87
Author: Paul Eggleton <paul eggleton linux intel com>
Date:   Thu Sep 1 14:25:04 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.
    
    (From OE-Core rev: 46a068ca35975988a8e9c0310f71fdcee55937a4)
    
    Signed-off-by: Paul Eggleton <paul eggleton linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/recipetool/create_buildsys_python.py |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
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)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]