summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/fetch2
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2014-04-08 15:03:09 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-08 18:05:26 +0100
commit991af87183719bc3920e4edef38d5c75ac6824df (patch)
treec4765a956d5a69a769d097ae5c453f7caf658b0b /bitbake/lib/bb/fetch2
parent5dd1d7566964c90d33c0c44f569d9336fb0724ce (diff)
downloadpoky-991af87183719bc3920e4edef38d5c75ac6824df.tar.gz
bitbake: fetch2: handle wildcards correctly when recording file checksums
The Local fetcher's localpath is returning the parent directory for a wildcard match; we need to handle this and add the wildcard specification so that we checksum the correct files. Fixes [YOCTO #6127]. (Bitbake rev: 4a90edd62c16cbf41b5b93280e155077564c774a) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/fetch2')
-rw-r--r--bitbake/lib/bb/fetch2/__init__.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index 150f864fe4..a9ab75ee41 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -932,6 +932,9 @@ def get_checksum_file_list(d):
932 if ud and isinstance(ud.method, local.Local): 932 if ud and isinstance(ud.method, local.Local):
933 ud.setup_localpath(d) 933 ud.setup_localpath(d)
934 f = ud.localpath 934 f = ud.localpath
935 pth = ud.decodedurl
936 if '*' in pth:
937 f = os.path.join(os.path.abspath(f), pth)
935 if f.startswith(dl_dir): 938 if f.startswith(dl_dir):
936 # The local fetcher's behaviour is to return a path under DL_DIR if it couldn't find the file anywhere else 939 # The local fetcher's behaviour is to return a path under DL_DIR if it couldn't find the file anywhere else
937 if os.path.exists(f): 940 if os.path.exists(f):