]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commit
devtool: fix handling of oe-local-files when source is in a subdirectory
authorPaul Eggleton <paul.eggleton@linux.intel.com>
Fri, 29 Sep 2017 02:26:22 +0000 (15:26 +1300)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 11 Nov 2017 12:14:27 +0000 (12:14 +0000)
commit1d31cee42d7fdd0f7881a44447492efc2db3c95a
tree3c7b8415aa1b343f69a3abee3320704e9143ca22
parent7bab0de6cb9c973a96b9bd8ab55b8f50a1087f34
devtool: fix handling of oe-local-files when source is in a subdirectory

If S points to a subdirectory of the source rather than the "base" of
the source tree then we weren't handling the oe-local-files directory
properly - it got extracted to the base of the tree but devtool
update-recipe and devtool finish assumed it would be under S which would
be the subdirectory, thus it would be missing and devtool would assume
the files had been deleted and remove them from the recipe. Record the
base of the source tree in the bbappend and read it into the in-memory
workspace so we can use that to find out where oe-local-files should be
found.

(From OE-Core rev: 30d2ea67b2c4727e23d06a35745b1afa64b130cc)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
scripts/devtool
scripts/lib/devtool/standard.py