summaryrefslogtreecommitdiffstats
path: root/scripts/lib/devtool/standard.py
diff options
context:
space:
mode:
authorTomasz Dziendzielski <tomasz.dziendzielski@gmail.com>2021-01-21 23:31:53 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-01-23 17:08:54 +0000
commit3a220f1e411767cbf9e7099c18d94a12171c1093 (patch)
tree00807ba2f130d540ba9ed5afd2afb3e64c31e325 /scripts/lib/devtool/standard.py
parent1d803b70e599521ad0c743f49007e6fc5c055d1c (diff)
downloadpoky-3a220f1e411767cbf9e7099c18d94a12171c1093.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>
Diffstat (limited to 'scripts/lib/devtool/standard.py')
-rw-r--r--scripts/lib/devtool/standard.py6
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)