[oe-commits] [openembedded-core] 08/20: classes/externalsrc: delete symlinks at start of do_buildclean

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 927b3b05a7f6b85967f7375b1942605fe8d37d0c
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
AuthorDate: Mon Sep 18 16:54:42 2017 +1200

    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 at linux.intel.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/classes/externalsrc.bbclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass
index 8141f25..08e6e47 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"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.