[oe-commits] Richard Purdie : package.bbclass: Fix populate_packages for glob expansion issues

[git at git.openembedded.org]

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

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Wed Apr 17 14:06:24 2013 +0000

package.bbclass: Fix populate_packages for glob expansion issues

If we put a valid glob like "*/foo/*" into FILES, populate_packages
breaks with a "file exists" message. This is because the glob expansion
does not have "./" prefix however there may already be an entry in
the seen list which does have such a prefix. The easiest/simplest fix
right now is to add the prefix if it doesn't exist which only happens
for certain globs.

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/package.bbclass |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 4e9b79e..5765e12 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -946,6 +946,8 @@ python populate_packages () {
         for file in files:
             if os.path.isabs(file):
                 file = '.' + file
+            if not file.startswith("./"):
+                file = './' + file
             if not cpath.islink(file):
                 if cpath.isdir(file):
                     newfiles =  [ os.path.join(file,x) for x in os.listdir(file) ]