summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-17 14:06:24 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-18 00:37:57 +0100
commit79a205be0dae01c68a81b3a992193a71f666844e (patch)
treeacf9fef936524652ddc0036a3ac1c0bdc0d0d918
parentef0e1cc32d19390626a9da6a948632ffacb242ac (diff)
downloadpoky-79a205be0dae01c68a81b3a992193a71f666844e.tar.gz
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. (From OE-Core rev: 138c5f3af892e33f576fc7dd268e122b179f82a1) 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 4e9b79efe2..5765e127d0 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -946,6 +946,8 @@ python populate_packages () {
946 for file in files: 946 for file in files:
947 if os.path.isabs(file): 947 if os.path.isabs(file):
948 file = '.' + file 948 file = '.' + file
949 if not file.startswith("./"):
950 file = './' + file
949 if not cpath.islink(file): 951 if not cpath.islink(file):
950 if cpath.isdir(file): 952 if cpath.isdir(file):
951 newfiles = [ os.path.join(file,x) for x in os.listdir(file) ] 953 newfiles = [ os.path.join(file,x) for x in os.listdir(file) ]