From 02b236c6406c51cc34736a7a51b0d8ccd16b3ab8 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 17 Apr 2013 14:06:24 +0000 Subject: 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 --- meta/classes/package.bbclass | 2 ++ 1 file changed, 2 insertions(+) (limited to 'meta') 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) ] -- cgit v1.2.3-54-g00ecf