summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2017-09-18 16:54:42 +1200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-09-21 09:23:59 +0100
commit927b3b05a7f6b85967f7375b1942605fe8d37d0c (patch)
tree01872f368554dbe64b56f7dddb26be7f6c9bbe4a
parent752a8a02d52cf868d1c182672d6ceb3d455dfa1e (diff)
downloadopenembedded-core-contrib-927b3b05a7f6b85967f7375b1942605fe8d37d0c.tar.gz
openembedded-core-contrib-927b3b05a7f6b85967f7375b1942605fe8d37d0c.tar.bz2
openembedded-core-contrib-927b3b05a7f6b85967f7375b1942605fe8d37d0c.zip
classes/externalsrc: delete symlinks at start of do_buildclean
To help users find the work and log directories (especially within the eSDK) we create symlinks to these from the source tree. However during do_buildclean we call "make clean", and some project Makefiles which delete something like "*/*/lib" which will match files underneath the oe-workdir symlink and fail. do_buildclean is called from do_clean which is in turn called by devtool reset by default, and thus devtool reset is blocked. An example of a recipe where this is visible is the openssl-qat recipe in meta-intel. In order to fix this, delete the symlinks at the start of do_buildclean since we shouldn't need them at that point anyway, and thus make clean won't be able to trip over them. Fixes [YOCTO #11036]. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/classes/externalsrc.bbclass1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass
index 8141f25e04..08e6e47901 100644
--- a/meta/classes/externalsrc.bbclass
+++ b/meta/classes/externalsrc.bbclass
@@ -172,6 +172,7 @@ do_buildclean[nostamp] = "1"
do_buildclean[doc] = "Call 'make clean' or equivalent in ${B}"
externalsrc_do_buildclean() {
if [ -e Makefile -o -e makefile -o -e GNUmakefile ]; then
+ rm -f ${@' '.join([x.split(':')[0] for x in (d.getVar('EXTERNALSRC_SYMLINKS') or '').split()])}
oe_runmake clean || die "make failed"
else
bbnote "nothing to do - no makefile found"