summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Blundell <pb@pbcl.net>2014-01-10 14:38:32 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-10 15:16:51 +0000
commitfef870956cb7446c93901d457d0026202c2a6317 (patch)
treeef9b160b74219d71760f3342c641a6ba6f55d3ff
parent7ef0f55a95e8bcb1f5c7190305672fcff3c72d90 (diff)
downloadpoky-fef870956cb7446c93901d457d0026202c2a6317.tar.gz
package: Keep global pkgfiles[] up to date when snapping library symlinks
Since ca86603607a69a17cc5540d69de0e242b33382d3 we are now calling stat() on all the pkgfiles[] during emit_pkgdata(). If symlink snapping has removed some of the files then we will blow up trying to stat a path that no longer exists. Fix that by ensuring that pkgfiles[] is updated when we process the list of library renames. (From OE-Core rev: bdad58c51dfdda5253933c3e371a7d526cdbb67e) Signed-off-by: Phil Blundell <pb@pbcl.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/package.bbclass2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 9b4f11aa30..768047caf3 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1475,6 +1475,8 @@ python package_do_shlibs() {
1475 for (old, new) in renames: 1475 for (old, new) in renames:
1476 bb.note("Renaming %s to %s" % (old, new)) 1476 bb.note("Renaming %s to %s" % (old, new))
1477 os.rename(old, new) 1477 os.rename(old, new)
1478 pkgfiles[pkg].remove(old)
1479
1478 shlibs_file = os.path.join(shlibswork_dir, pkg + ".list") 1480 shlibs_file = os.path.join(shlibswork_dir, pkg + ".list")
1479 shver_file = os.path.join(shlibswork_dir, pkg + ".ver") 1481 shver_file = os.path.join(shlibswork_dir, pkg + ".ver")
1480 if len(sonames): 1482 if len(sonames):