diff options
author | Tomasz Dziendzielski <tomasz.dziendzielski@gmail.com> | 2021-01-21 23:31:53 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-21 23:25:53 +0000 |
commit | dbdf5e69a82789e2be358bfaa17e212a3a688cd9 (patch) | |
tree | a7c2c080b0424311b54f2ebbd85bed315b810be8 | |
parent | 73ea47a3142c59d09f9ff959e47506bc10e2bed3 (diff) | |
download | poky-dbdf5e69a82789e2be358bfaa17e212a3a688cd9.tar.gz |
devtool: Fix file:// fetcher symlink directory structure
Add relative path if file is under directory.
[YOCTO #13738]
(From OE-Core rev: 193f7a951f29cfcfa04595e5185eea57522debf4)
Signed-off-by: Tomasz Dziendzielski <tomasz.dziendzielski@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | scripts/lib/devtool/standard.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index f7d8a82117..7b62b7e7b8 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py | |||
@@ -474,7 +474,11 @@ def symlink_oelocal_files_srctree(rd,srctree): | |||
474 | destpth = os.path.join(srctree, relpth, fn) | 474 | destpth = os.path.join(srctree, relpth, fn) |
475 | if os.path.exists(destpth): | 475 | if os.path.exists(destpth): |
476 | os.unlink(destpth) | 476 | os.unlink(destpth) |
477 | os.symlink('oe-local-files/%s' % fn, destpth) | 477 | if relpth != '.': |
478 | back_relpth = os.path.relpath(local_files_dir, root) | ||
479 | os.symlink('%s/oe-local-files/%s/%s' % (back_relpth, relpth, fn), destpth) | ||
480 | else: | ||
481 | os.symlink('oe-local-files/%s' % fn, destpth) | ||
478 | addfiles.append(os.path.join(relpth, fn)) | 482 | addfiles.append(os.path.join(relpth, fn)) |
479 | if addfiles: | 483 | if addfiles: |
480 | bb.process.run('git add %s' % ' '.join(addfiles), cwd=srctree) | 484 | bb.process.run('git add %s' % ' '.join(addfiles), cwd=srctree) |