From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Wed, 17 Apr 2013 14:06:24 +0000 (+0000)
Subject: package.bbclass: Fix populate_packages for glob expansion issues
X-Git-Tag: 2015-4~6800
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=138c5f3af892e33f576fc7dd268e122b179f82a1;p=openembedded-core.git

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@linuxfoundation.org>
---

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 4e9b79efe2..5765e127d0 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) ]