diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-28 11:51:12 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-29 10:39:40 +0100 |
| commit | 79770ca14a0cc2f4112fb4d8dc2d8832701b6d5d (patch) | |
| tree | 70d1ce73263fa0a8baf7f889dcf10927e5225054 | |
| parent | ffd84177c68a6c86e654a9ba2512c299b40ec5e9 (diff) | |
| download | openembedded-core-79770ca14a0cc2f4112fb4d8dc2d8832701b6d5d.tar.gz openembedded-core-79770ca14a0cc2f4112fb4d8dc2d8832701b6d5d.tar.bz2 openembedded-core-79770ca14a0cc2f4112fb4d8dc2d8832701b6d5d.zip | |
autotools: Fix find races on source directory
In a similar way to http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=aa1438b56f30515f9c31b306decef7f562dda81f
there are more find races in the autotools class.
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 remaining races in the same way.
[YOCTO #7522]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/autotools.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass index bb129fb245..f213e893df 100644 --- a/meta/classes/autotools.bbclass +++ b/meta/classes/autotools.bbclass @@ -114,7 +114,7 @@ autotools_preconfigure() { echo "Running \"${MAKE} clean\" in ${S}" ${MAKE} clean fi - find ${S} -name \*.la -delete + find ${S} -ignore_readdir_race -name \*.la -delete fi fi fi @@ -225,7 +225,7 @@ autotools_do_configure() { # for a package whose autotools are old, on an x86_64 machine, which the old # config.sub does not support. Work around this by installing them manually # regardless. - ( for ac in `find ${S} -name configure.in -o -name configure.ac`; do + ( for ac in `find ${S} -ignore_readdir_race -name configure.in -o -name configure.ac`; do rm -f `dirname $ac`/configure done ) if [ -e ${S}/configure.in -o -e ${S}/configure.ac ]; then @@ -234,7 +234,7 @@ autotools_do_configure() { ACLOCAL="aclocal --system-acdir=${ACLOCALDIR}/" if [ x"${acpaths}" = xdefault ]; then acpaths= - for i in `find ${S} -maxdepth 2 -name \*.m4|grep -v 'aclocal.m4'| \ + for i in `find ${S} -ignore_readdir_race -maxdepth 2 -name \*.m4|grep -v 'aclocal.m4'| \ grep -v 'acinclude.m4' | grep -v 'aclocal-copy' | sed -e 's,\(.*/\).*$,\1,'|sort -u`; do acpaths="$acpaths -I $i" done @@ -275,7 +275,7 @@ autotools_do_configure() { fi fi for i in gettext.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4; do - for j in `find ${S} -name $i | grep -v aclocal-copy`; do + for j in `find ${S} -ignore_readdir_race -name $i | grep -v aclocal-copy`; do rm $j done done |