summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/tar-error-code.patch27
1 files changed, 14 insertions, 13 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg/tar-error-code.patch b/meta/recipes-devtools/dpkg/dpkg/tar-error-code.patch
index 7be2090206..235f878aad 100644
--- a/meta/recipes-devtools/dpkg/dpkg/tar-error-code.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/tar-error-code.patch
@@ -16,11 +16,13 @@ place to avoid that kind of issue).
16Upsteam-Status: Inappropriate 16Upsteam-Status: Inappropriate
17RP 2015/3/27 17RP 2015/3/27
18 18
19Index: dpkg-1.17.21/dpkg-deb/build.c 19Signed-off-by: Saul Wold <sgw@linux.intel.com>
20
21Index: dpkg-1.17.4/dpkg-deb/build.c
20=================================================================== 22===================================================================
21--- dpkg-1.17.21.orig/dpkg-deb/build.c 23--- dpkg-1.17.4.orig/dpkg-deb/build.c
22+++ dpkg-1.17.21/dpkg-deb/build.c 24+++ dpkg-1.17.4/dpkg-deb/build.c
23@@ -398,7 +398,7 @@ do_build(const char *const *argv) 25@@ -443,7 +443,7 @@ do_build(const char *const *argv)
24 bool subdir; 26 bool subdir;
25 char *tfbuf; 27 char *tfbuf;
26 int arfd; 28 int arfd;
@@ -29,26 +31,25 @@ Index: dpkg-1.17.21/dpkg-deb/build.c
29 pid_t c1, c2; 31 pid_t c1, c2;
30 32
31 /* Decode our arguments. */ 33 /* Decode our arguments. */
32@@ -493,7 +493,9 @@ do_build(const char *const *argv) 34@@ -536,7 +536,9 @@ do_build(const char *const *argv)
33 } 35 }
34 close(p1[0]); 36 close(p1[0]);
35 subproc_reap(c2, "gzip -9c", 0); 37 subproc_wait_check(c2, "gzip -9c", 0);
36- subproc_reap(c1, "tar -cf", 0); 38- subproc_wait_check(c1, "tar -cf", 0);
37+ rc = subproc_reap(c1, "tar -cf", SUBPROC_RETERROR); 39+ rc = subproc_wait_check(c1, "tar -cf", PROCNOERR);
38+ if (rc && rc != 1) 40+ if (rc && rc != 1)
39+ ohshite(_("subprocess %s returned error exit status %d"), "tar -cf", rc); 41+ ohshite(_("subprocess %s returned error exit status %d"), "tar -cf", rc);
40 42
41 if (lseek(gzfd, 0, SEEK_SET)) 43 if (lseek(gzfd, 0, SEEK_SET))
42 ohshite(_("failed to rewind temporary file (%s)"), _("control member")); 44 ohshite(_("failed to rewind temporary file (%s)"), _("control member"));
43@@ -581,7 +583,10 @@ do_build(const char *const *argv) 45@@ -619,7 +621,9 @@ do_build(const char *const *argv)
44 /* All done, clean up wait for tar and gzip to finish their job. */ 46 /* All done, clean up wait for tar and gzip to finish their job. */
45 close(p1[1]); 47 close(p1[1]);
46 subproc_reap(c2, _("<compress> from tar -cf"), 0); 48 subproc_wait_check(c2, _("<compress> from tar -cf"), 0);
47- subproc_reap(c1, "tar -cf", 0); 49- subproc_wait_check(c1, "tar -cf", 0);
48+ rc = subproc_reap(c1, "tar -cf", SUBPROC_RETERROR); 50+ rc = subproc_wait_check(c1, "tar -cf", PROCNOERR);
49+ if (rc && rc != 1) 51+ if (rc && rc != 1)
50+ ohshite(_("subprocess %s returned error exit status %d"), "tar -cf", rc); 52+ ohshite(_("subprocess %s returned error exit status %d"), "tar -cf", rc);
51+
52 /* Okay, we have data.tar as well now, add it to the ar wrapper. */ 53 /* Okay, we have data.tar as well now, add it to the ar wrapper. */
53 if (deb_format.major == 2) { 54 if (deb_format.major == 2) {
54 char datamember[16 + 1]; 55 char datamember[16 + 1];