diff options
| author |   Tomasz Dziendzielski <tomasz.dziendzielski@gmail.com> | 2021-01-21 23:31:53 +0100 |
|---|---|---|
| committer |   Anuj Mittal <anuj.mittal@intel.com> | 2021-02-01 12:48:14 +0800 |
| commit | a6a4e1350c6c8170648a9e910b06e6534d11f926 (patch) | |
| tree | 2a8ba5b83774546c01aab121fad66e5735e473a2 /scripts | |
| parent | c925b83cbd31345f788515ca8b642b14e5e11898 (diff) | |
| download | openembedded-core-a6a4e1350c6c8170648a9e910b06e6534d11f926.tar.gz | |
devtool: Fix file:// fetcher symlink directory structure
Add relative path if file is under directory.
[YOCTO #13738]
(From OE-Core rev: 19ddacc1b38f9ebb86a9359963ccc3c707f7125e)
Signed-off-by: Tomasz Dziendzielski <tomasz.dziendzielski@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 3a220f1e411767cbf9e7099c18d94a12171c1093)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'scripts')
| -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): destpth = os.path.join(srctree, relpth, fn) if os.path.exists(destpth): os.unlink(destpth) - os.symlink('oe-local-files/%s' % fn, destpth) + if relpth != '.': + back_relpth = os.path.relpath(local_files_dir, root) + os.symlink('%s/oe-local-files/%s/%s' % (back_relpth, relpth, fn), destpth) + else: + os.symlink('oe-local-files/%s' % fn, destpth) addfiles.append(os.path.join(relpth, fn)) if addfiles: bb.process.run('git add %s' % ' '.join(addfiles), cwd=srctree) |