[oe-commits] Phil Blundell : package: Keep global pkgfiles[] up to date when snapping library symlinks

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: bdad58c51dfdda5253933c3e371a7d526cdbb67e
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=bdad58c51dfdda5253933c3e371a7d526cdbb67e

Author: Phil Blundell <pb at pbcl.net>
Date:   Fri Jan 10 14:38:32 2014 +0000

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 at pbcl.net>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/package.bbclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 9b4f11a..768047c 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):