From b803944ce6e942c5a42da4bc67ba3f96c13ab8e3 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 28 Mar 2015 08:50:27 +0000 Subject: dpkg-native: Avoid 'file changed' errors from tar Hardlink count duing do_package_write_deb can change causing dpkg-deb failures. We don't care about this error case so avoid it by checking the tar exit code. [YOCTO #7529] (From OE-Core rev: 77e077a57536c764034f06723edd0749dc578626) Signed-off-by: Richard Purdie --- .../dpkg/dpkg/tar-error-code.patch | 54 ++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 meta/recipes-devtools/dpkg/dpkg/tar-error-code.patch (limited to 'meta/recipes-devtools/dpkg/dpkg') diff --git a/meta/recipes-devtools/dpkg/dpkg/tar-error-code.patch b/meta/recipes-devtools/dpkg/dpkg/tar-error-code.patch new file mode 100644 index 0000000..7be2090 --- /dev/null +++ b/meta/recipes-devtools/dpkg/dpkg/tar-error-code.patch @@ -0,0 +1,54 @@ +When running do_package_write_deb, we have trees of hardlinked files +such as the dbg source files in ${PN}-dbg. If something makes another +copy of one of those files (or deletes one), the number of links a file +has changes and tar can notice this, e.g.: + +| DEBUG: Executing python function do_package_deb +| dpkg-deb: building package `sed-ptest' in `/media/build1/poky/build/tmp/work/i586-poky-linux/sed/4.2.2-r0/deploy-debs/i586/sed-ptest_4.2.2-r0.3_i386.deb'. +| tar: ./usr/lib/sed/ptest/testsuite/tst-regex2: file changed as we read it +| dpkg-deb: error: subprocess tar -cf returned error exit status 1 + +Tar returns an error of 1 when files 'change' and other errors codes +in other error cases. We tweak dpkg-deb here so that it ignores an exit +code of 1 from tar. The files don't really change (and we have locking in +place to avoid that kind of issue). + +Upsteam-Status: Inappropriate +RP 2015/3/27 + +Index: dpkg-1.17.21/dpkg-deb/build.c +=================================================================== +--- dpkg-1.17.21.orig/dpkg-deb/build.c ++++ dpkg-1.17.21/dpkg-deb/build.c +@@ -398,7 +398,7 @@ do_build(const char *const *argv) + bool subdir; + char *tfbuf; + int arfd; +- int p1[2], p2[2], gzfd; ++ int p1[2], p2[2], gzfd, rc; + pid_t c1, c2; + + /* Decode our arguments. */ +@@ -493,7 +493,9 @@ do_build(const char *const *argv) + } + close(p1[0]); + subproc_reap(c2, "gzip -9c", 0); +- subproc_reap(c1, "tar -cf", 0); ++ rc = subproc_reap(c1, "tar -cf", SUBPROC_RETERROR); ++ if (rc && rc != 1) ++ ohshite(_("subprocess %s returned error exit status %d"), "tar -cf", rc); + + if (lseek(gzfd, 0, SEEK_SET)) + ohshite(_("failed to rewind temporary file (%s)"), _("control member")); +@@ -581,7 +583,10 @@ do_build(const char *const *argv) + /* All done, clean up wait for tar and gzip to finish their job. */ + close(p1[1]); + subproc_reap(c2, _(" from tar -cf"), 0); +- subproc_reap(c1, "tar -cf", 0); ++ rc = subproc_reap(c1, "tar -cf", SUBPROC_RETERROR); ++ if (rc && rc != 1) ++ ohshite(_("subprocess %s returned error exit status %d"), "tar -cf", rc); ++ + /* Okay, we have data.tar as well now, add it to the ar wrapper. */ + if (deb_format.major == 2) { + char datamember[16 + 1]; -- cgit v1.1