summaryrefslogtreecommitdiff
path: root/meta
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:14:02 +0000
commitbdad58c51dfdda5253933c3e371a7d526cdbb67e (patch)
tree5baaedf2b182b70d5b03b00ca3fde69a8950e486 /meta
parent507199e57acfcc99639dc2c53abe194d77d60866 (diff)
downloadopenembedded-core-bdad58c51dfdda5253933c3e371a7d526cdbb67e.tar.gz
openembedded-core-bdad58c51dfdda5253933c3e371a7d526cdbb67e.tar.bz2
openembedded-core-bdad58c51dfdda5253933c3e371a7d526cdbb67e.zip
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. Signed-off-by: Phil Blundell <pb@pbcl.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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() {
for (old, new) in renames:
bb.note("Renaming %s to %s" % (old, new))
os.rename(old, new)
+ pkgfiles[pkg].remove(old)
+
shlibs_file = os.path.join(shlibswork_dir, pkg + ".list")
shver_file = os.path.join(shlibswork_dir, pkg + ".ver")
if len(sonames):