]> code.ossystems Code Review - openembedded-core.git/commitdiff
sstate.bbclass: ignore the tar failure.
authorRoy Li <rongqing.li@windriver.com>
Sun, 22 Sep 2013 08:25:55 +0000 (08:25 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 24 Sep 2013 10:46:07 +0000 (11:46 +0100)
sstate_package creates hardlink from sysroot to SSTATE_BUILDDIR, and
sstate_create_package stores SSTATE_BUILDDIR into a archive file by
tar, these two task can be run simultaneously for different packages,
and make a hardlink for a file will lead to the change of the links
number of file, and if tar is reading this file, it will fail with exit
code 1, and report "file changed as we read it":

    DEBUG: Executing shell function sstate_create_package
    tar: x86_64-linux/usr/share/aclocal/xorg-macros.m4: file changed as we read it

4b3e353a5[sstate.bbclass: fix parallel building issue] tries to use the
tar parameter --ignore-failed-read to fix, but it does not work, and
tar parameter --warning=no-file-changed can close the warning, but can
not change the exit code. so close shell immediate exit, only fail
if tar returns not 1 and 0.

Exit codes of tar:
    http://www.gnu.org/software/tar/manual/html_section/Synopsis.html

Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/sstate.bbclass

index 37ade3f7a6e21d2e9df3e6b3805f181612ef8ad9..517c1001d29d2b0f6c868fd2df431a1782f12fd8 100644 (file)
@@ -566,7 +566,12 @@ sstate_create_package () {
        TFILE=`mktemp ${SSTATE_PKG}.XXXXXXXX`
        # Need to handle empty directories
        if [ "$(ls -A)" ]; then
-               tar --ignore-failed-read -czf $TFILE *
+               set +e
+               tar -czf $TFILE *
+               if [ $? -ne 0 ] && [ $? -ne 1 ]; then
+                       exit 1
+               fi
+               set -e
        else
                tar -cz --file=$TFILE --files-from=/dev/null
        fi