summaryrefslogtreecommitdiffstats
path: root/scripts/lib
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-09-01 14:25:04 +1200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-08 00:36:48 +0100
commit9885a9dd3167670f4716991a39aed1b04e274c87 (patch)
tree44c648980bada4f9a3ca8e243a5bebbb900c08ea /scripts/lib
parent4da96ce61f92cfa22f85ae38435cbb57bce17dd6 (diff)
downloadpoky-9885a9dd3167670f4716991a39aed1b04e274c87.tar.gz
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>
Diffstat (limited to 'scripts/lib')
-rw-r--r--scripts/lib/recipetool/create_buildsys_python.py4
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 aff13cf1d2..fb9806d318 100644
--- a/scripts/lib/recipetool/create_buildsys_python.py
+++ b/scripts/lib/recipetool/create_buildsys_python.py
@@ -504,8 +504,10 @@ class PythonRecipeHandler(RecipeHandler):
504 for dep in scanned_deps: 504 for dep in scanned_deps:
505 mapped = provided_packages.get(dep) 505 mapped = provided_packages.get(dep)
506 if mapped: 506 if mapped:
507 logger.debug('Mapped %s to %s' % (dep, mapped))
507 mapped_deps.add(mapped) 508 mapped_deps.add(mapped)
508 else: 509 else:
510 logger.debug('Could not map %s' % dep)
509 unmapped_deps.add(dep) 511 unmapped_deps.add(dep)
510 return mapped_deps, unmapped_deps 512 return mapped_deps, unmapped_deps
511 513
@@ -566,6 +568,8 @@ class PythonRecipeHandler(RecipeHandler):
566 continue 568 continue
567 569
568 if fn.startswith(dynload_dir + os.sep): 570 if fn.startswith(dynload_dir + os.sep):
571 if '/.debug/' in fn:
572 continue
569 base = os.path.basename(fn) 573 base = os.path.basename(fn)
570 provided = base.split('.', 1)[0] 574 provided = base.split('.', 1)[0]
571 packages[provided] = os.path.basename(pkgdatafile) 575 packages[provided] = os.path.basename(pkgdatafile)