mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00
Code Issues Projects Releases Wiki Activity

autotools: Fix find races on source directory

Browse Source 
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]

(From OE-Core rev: 79770ca14a0cc2f4112fb4d8dc2d8832701b6d5d)

(From OE-Core rev: 699e1570e66cb28e4bfd0eb15d41f3af2bed5b62)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2015-04-28 11:51:12 +01:00
parent 6504fa687a
commit 67d83673ea
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/autotools.bbclass
+4 -4
View File
@@ -114,7 +114,7 @@ autotools_preconfigure() {
echo "Running \"${MAKE} clean\" in ${S}" echo "Running \"${MAKE} clean\" in ${S}"
${MAKE} clean ${MAKE} clean
fi fi
find ${S} -name \*.la -delete find ${S} -ignore_readdir_race -name \*.la -delete
fi fi
fi 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 # 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 # config.sub does not support. Work around this by installing them manually
# regardless. # 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 rm -f `dirname $ac`/configure
done ) done )
if [ -e ${S}/configure.in -o -e ${S}/configure.ac ]; then if [ -e ${S}/configure.in -o -e ${S}/configure.ac ]; then
@@ -234,7 +234,7 @@ autotools_do_configure() {
ACLOCAL="aclocal --system-acdir=${ACLOCALDIR}/" ACLOCAL="aclocal --system-acdir=${ACLOCALDIR}/"
if [ x"${acpaths}" = xdefault ]; then if [ x"${acpaths}" = xdefault ]; then
acpaths= 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 grep -v 'acinclude.m4' | grep -v 'aclocal-copy' | sed -e 's,\(.*/\).*$,\1,'|sort -u`; do
acpaths="$acpaths -I $i" acpaths="$acpaths -I $i"
done done
@@ -275,7 +275,7 @@ autotools_do_configure() {
fi fi
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 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 rm $j
done done
done done