diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-17 14:06:24 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-17 16:18:19 +0100 |
commit | 138c5f3af892e33f576fc7dd268e122b179f82a1 (patch) | |
tree | 22d8d6b8969dfa68c128aae4325156703221507f | |
parent | 82320d2074572477f26887eddc51dc2a1dfea403 (diff) | |
download | openembedded-core-138c5f3af892e33f576fc7dd268e122b179f82a1.tar.gz openembedded-core-138c5f3af892e33f576fc7dd268e122b179f82a1.tar.bz2 openembedded-core-138c5f3af892e33f576fc7dd268e122b179f82a1.zip |
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>
-rw-r--r-- | 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 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) ] |