summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-27 13:19:33 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-27 14:21:45 +0100
commitfd35017edf5ce338640fe10edbc94d2e58c0628c (patch)
tree6576dadc4d9079a01807adcd8cfa8768e46af750 /meta/recipes-devtools
parente07aa344ee9545edca3cf251c641c6539a2302f7 (diff)
downloadpoky-fd35017edf5ce338640fe10edbc94d2e58c0628c.tar.gz
dpkg: Fix tarfix.patch
Accidentally forgot to merge the backport changes into the commit. Fix so the patch applies correctly. (From OE-Core rev: 5f50f90ed824ea6a8d1d1b41a5345f51a15c443f) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/tarfix.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg/tarfix.patch b/meta/recipes-devtools/dpkg/dpkg/tarfix.patch
index 50e0bb4069..0c05fcd032 100644
--- a/meta/recipes-devtools/dpkg/dpkg/tarfix.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/tarfix.patch
@@ -30,16 +30,16 @@ Upstream-Status: Submitted [have mailed dpkg maintainer about this]
30RP 30RP
312015/7/13 312015/7/13
32 32
33Index: dpkg-1.17.25/dpkg-deb/build.c 33Index: dpkg-1.17.4/dpkg-deb/build.c
34=================================================================== 34===================================================================
35--- dpkg-1.17.25.orig/dpkg-deb/build.c 35--- dpkg-1.17.4.orig/dpkg-deb/build.c
36+++ dpkg-1.17.25/dpkg-deb/build.c 36+++ dpkg-1.17.4/dpkg-deb/build.c
37@@ -560,7 +560,7 @@ do_build(const char *const *argv) 37@@ -598,7 +598,7 @@ do_build(const char *const *argv)
38 m_dup2(p2[1],1); close(p2[0]); close(p2[1]);
38 if (chdir(dir)) 39 if (chdir(dir))
39 ohshite(_("failed to chdir to `%.255s'"), dir); 40 ohshite(_("failed to chdir to `%.255s'"), dir);
40 execlp(TAR, "tar", "-cf", "-", "--format=gnu", "--null", "--no-unquote", 41- execlp(TAR, "tar", "-cf", "-", "--format=gnu", "--null", "-T", "-", "--no-recursion", NULL);
41- "-T", "-", "--no-recursion", NULL); 42+ execlp(TAR, "tar", "-cf", "-", "--format=gnu", "--null", "--no-recursion", "-T", "-", NULL);
42+ "--no-recursion", "-T", "-", NULL);
43 ohshite(_("unable to execute %s (%s)"), "tar -cf", TAR); 43 ohshite(_("unable to execute %s (%s)"), "tar -cf", TAR);
44 } 44 }
45 close(p1[0]); 45 close(p1[0]);