diff options
author | Tomasz Dziendzielski <tomasz.dziendzielski@gmail.com> | 2021-01-21 23:31:53 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-05 23:37:03 +0000 |
commit | 2e07b7d3829a3013afad04db7a3a28ab31cdeef6 (patch) | |
tree | f5ffd3f6abd770217b478a8b7dd03cd02af18f9f /scripts/lib | |
parent | c604b510f4050f1434797bec860a9bd30c74a66e (diff) | |
download | poky-2e07b7d3829a3013afad04db7a3a28ab31cdeef6.tar.gz |
devtool: Fix file:// fetcher symlink directory structure
Add relative path if file is under directory.
[YOCTO #13738]
(From OE-Core rev: cd9cee29b656e4c8642971cb87154cc4d5fda599)
Signed-off-by: Tomasz Dziendzielski <tomasz.dziendzielski@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 19ddacc1b38f9ebb86a9359963ccc3c707f7125e)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib')
-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) |