diff options
| author |   Roxana <roxana.ciobanu@intel.com> | 2014-07-31 13:29:24 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-29 12:07:47 +0100 |
| commit | 836a986b365eb9798563ec08d90b346596de7791 (patch) | |
| tree | d77f84ddf295d58682e884826e8d9749500c88c3 | |
| parent | ca93bc84ee5fb94a50c11c47e4d212d7da649e24 (diff) | |
| download | bitbake-836a986b365eb9798563ec08d90b346596de7791.tar.gz | |
fetch: SRC_URI parameter "subdir" does not work for local files
Check if the 'subdir' parameter exists and assign it to 'destdir' so that
files are copied in ${WORKDIR}/destdir. This fixes urls that are of the form
file://a;subdir=b.
Signed-off-by: Roxana Ciobanu <roxana.ciobanu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | lib/bb/fetch2/__init__.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index df2f2b056..68c8329e2 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -1265,7 +1265,10 @@ class FetchMethod(object): if urldata.type == "file" and urldata.path.find("/") != -1: destdir = urldata.path.rsplit("/", 1)[0] else: - destdir = "." + if urldata.parm.get('subdir') != None: + destdir = urldata.parm.get('subdir') + else: + destdir = "." bb.utils.mkdirhier("%s/%s" % (rootdir, destdir)) cmd = 'cp -f %s %s/%s/' % (file, rootdir, destdir) |