[oe-commits] Richard Purdie : base: Avoid find race
git at git.openembedded.org
git at git.openembedded.org
Sun Jun 28 08:46:34 UTC 2015
Module: openembedded-core.git
Branch: fido
Commit: 220141c63161f7c4f4112ac8b95bf44775843a9f
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=220141c63161f7c4f4112ac8b95bf44775843a9f
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date: Thu May 14 15:20:30 2015 +0100
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 at linuxfoundation.org>
---
meta/classes/base.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 3d9235e..42f1402 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -255,7 +255,7 @@ base_do_configure() {
if [ "${CLEANBROKEN}" != "1" -a \( -e Makefile -o -e makefile -o -e GNUmakefile \) ]; then
oe_runmake clean
fi
- find ${B} -name \*.la -delete
+ find ${B} -ignore_readdir_race -name \*.la -delete
fi
fi
if [ -n "${CONFIGURESTAMPFILE}" ]; then
More information about the Openembedded-commits
mailing list