diff options
author | Tomasz Dziendzielski <tomasz.dziendzielski@gmail.com> | 2021-01-20 15:55:25 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-05 23:35:18 +0000 |
commit | c35cb3135e9bf8e93010fa49cdabf6a26f6c54ce (patch) | |
tree | 3220cc7b588fdf1afe146b3df31ec99d2c53ddd0 /meta/lib | |
parent | 18ca369a5dddc7de7d762003c526acaebe1bf3ef (diff) | |
download | poky-c35cb3135e9bf8e93010fa49cdabf6a26f6c54ce.tar.gz |
externalsrc: Fix parsing error with devtool non-git sources
If srcdir is under poky directory (e.g. devtool poky/build/workspace/sources)
and is not a git repository then ${@srctree_hash_files(d)} will run "git
rev-parse --git-dir" and detect poky directory as git-dir and run "'git', 'add',
'-A', '.'], cwd=s_dir" trying to add srcdir but build dir is in .gitignore and
latest git will fail with "The following paths are ignored by one of your
.gitignore files: build" which will end with "ExpansionError during parsing".
In this commit I added a check if git_dir is the same as git-dir from
TOPDIR (which will detect poky directory) and if yes, then treat srcdir
as non-git sources.
(From OE-Core rev: 95fbac8dcad6c93f4c9737e9fe13e92ab6befa09)
(From OE-Core rev: 1da57e92812a1025d975204797b761a3be3998aa)
Signed-off-by: Tomasz Dziendzielski <tomasz.dziendzielski@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 28bdfe0066cb3c41d6471af75dabcc573e319688)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
0 files changed, 0 insertions, 0 deletions