devtool: Fix file:// fetcher symlink directory structure

Add relative path if file is under directory.

[YOCTO #13738]

(From OE-Core rev: 19ddacc1b38f9ebb86a9359963ccc3c707f7125e)

(From OE-Core rev: a6a4e1350c6c8170648a9e910b06e6534d11f926)

Signed-off-by: Tomasz Dziendzielski <tomasz.dziendzielski@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 3a220f1e41)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Tomasz Dziendzielski
2021-01-21 23:31:53 +01:00
committed by Richard Purdie
parent 558a9149e0
commit 8e23c6ec37

View File

@@ -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)