summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-14 15:20:30 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-14 15:22:52 +0100
commit534da08bfc1601ba3360ad19c2d09eae93fd3ac8 (patch)
tree659fdc10b26bf332efd051f37612c0fd4c5543c3 /meta
parentcf8c2e3c2e774f1d736bd572def99d6e6eb0dd32 (diff)
downloadpoky-534da08bfc1601ba3360ad19c2d09eae93fd3ac8.tar.gz
base: Avoid find race
In a similar way to http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=aa1438b56f30515f9c31b306decef7f562dda81f and http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=527b28c10955daf0387597020d69593ce24bcaa4 there is a find race in base.bbclass. For recipes with PACKAGES_remove = "${PN}", the find which removes .la files can race against deletion of other directories in WORKDIR e.g.: find: '/home/autobuilder/yocto-autobuilder/yocto-worker/nightly-oe-selftest/build/build/tmp/work/qemux86_64-poky-linux/init-ifupdown/1.0-r7/sstate-build-populate_lic': No such file or directory | WARNING: /home/autobuilder/yocto-autobuilder/yocto-worker/nightly-oe-selftest/build/build/tmp/work/qemux86_64-poky-linux/init-ifupdown/1.0-r7/temp/run.do_configure.6558:1 exit 1 from | find /home/autobuilder/yocto-autobuilder/yocto-worker/nightly-oe-selftest/build/build/tmp/work/qemux86_64-poky-linux/init-ifupdown/1.0-r7 -name \*.la -delete Fix the race in the same way. [YOCTO #7522] (From OE-Core rev: 90861b8908d254154f4d1d613471070df8013da8) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/base.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index d19d9e1d99..2822a688f2 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -255,7 +255,7 @@ base_do_configure() {
255 if [ "${CLEANBROKEN}" != "1" -a \( -e Makefile -o -e makefile -o -e GNUmakefile \) ]; then 255 if [ "${CLEANBROKEN}" != "1" -a \( -e Makefile -o -e makefile -o -e GNUmakefile \) ]; then
256 oe_runmake clean 256 oe_runmake clean
257 fi 257 fi
258 find ${B} -name \*.la -delete 258 find ${B} -ignore_readdir_race -name \*.la -delete
259 fi 259 fi
260 fi 260 fi
261 if [ -n "${CONFIGURESTAMPFILE}" ]; then 261 if [ -n "${CONFIGURESTAMPFILE}" ]; then