summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-29 13:28:48 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-30 11:20:52 +0100
commit0f81fbc0df73675aeb79c724858799a3b6a02f85 (patch)
tree077f26321c4559cff9013dc241fc34cb42bbc94e
parentda98266f3a228cf65f279db9810a5326c8bd5422 (diff)
downloadopenembedded-core-0f81fbc0df73675aeb79c724858799a3b6a02f85.tar.gz
openembedded-core-0f81fbc0df73675aeb79c724858799a3b6a02f85.tar.bz2
openembedded-core-0f81fbc0df73675aeb79c724858799a3b6a02f85.zip
scripts/cp-noerror: Add a special copy function to fix autotools issues
Currently we copy the aclocal directory to the build so that autotools doesn't see .m4 files disappear when its processing them. This can happen if for example, package X is being rebuilt at the same time as Y and it gets uninstalled from sstate (assuming there are no dependencies between X and Y). This code making the copy was added to avoid races but introduces a race of its own, namely that the files can disappear during the copy. This patch adds a cp-noerror script which silently ignores such errors and gives the behaviour we need in this case. It hence fixes issues which crop up for users and the autobuilder occasionally. [YOCTO #2485] Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/autotools.bbclass3
-rwxr-xr-xscripts/cp-noerror15
2 files changed, 16 insertions, 2 deletions
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index 941c06d032..9b36f3c7b6 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -124,10 +124,9 @@ autotools_do_configure() {
# uninstalling data from the sysroot. See Yocto #861 for details.
# We avoid this by taking a copy here and then files cannot disappear.
if [ -d ${STAGING_DATADIR}/aclocal ]; then
- mkdir -p ${B}/aclocal-copy/
# for scratch build this directory can be empty
# so avoid cp's no files to copy error
- cp -r ${STAGING_DATADIR}/aclocal/. ${B}/aclocal-copy/
+ cp-noerror ${STAGING_DATADIR}/aclocal ${B}/aclocal-copy/
acpaths="$acpaths -I ${B}/aclocal-copy/"
fi
# autoreconf is too shy to overwrite aclocal.m4 if it doesn't look
diff --git a/scripts/cp-noerror b/scripts/cp-noerror
new file mode 100755
index 0000000000..fdb3d2d19a
--- /dev/null
+++ b/scripts/cp-noerror
@@ -0,0 +1,15 @@
+#!/usr/bin/env python
+#
+# Allow copying of $1 to $2 but if files in $1 disappear during the copy operation,
+# don't error.
+#
+
+import sys
+import shutil
+
+try:
+ shutil.copytree(sys.argv[1], sys.argv[2])
+except shutil.Error:
+ pass
+
+