diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-27 13:19:33 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-27 14:20:50 +0100 |
| commit | 5f50f90ed824ea6a8d1d1b41a5345f51a15c443f (patch) | |
| tree | 27e18c64ca0d9829843ec2443a1ea9d7644bca63 | |
| parent | 386898afde40971653af646d55e64aef65807e3b (diff) | |
| download | openembedded-core-5f50f90ed824ea6a8d1d1b41a5345f51a15c443f.tar.gz | |
dpkg: Fix tarfix.patch
Accidentally forgot to merge the backport changes into the commit. Fix
so the patch applies correctly.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/dpkg/dpkg/tarfix.patch | 14 |
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] RP 2015/7/13 -Index: dpkg-1.17.25/dpkg-deb/build.c +Index: dpkg-1.17.4/dpkg-deb/build.c =================================================================== ---- dpkg-1.17.25.orig/dpkg-deb/build.c -+++ dpkg-1.17.25/dpkg-deb/build.c -@@ -560,7 +560,7 @@ do_build(const char *const *argv) +--- dpkg-1.17.4.orig/dpkg-deb/build.c ++++ dpkg-1.17.4/dpkg-deb/build.c +@@ -598,7 +598,7 @@ do_build(const char *const *argv) + m_dup2(p2[1],1); close(p2[0]); close(p2[1]); if (chdir(dir)) ohshite(_("failed to chdir to `%.255s'"), dir); - execlp(TAR, "tar", "-cf", "-", "--format=gnu", "--null", "--no-unquote", -- "-T", "-", "--no-recursion", NULL); -+ "--no-recursion", "-T", "-", NULL); +- execlp(TAR, "tar", "-cf", "-", "--format=gnu", "--null", "-T", "-", "--no-recursion", NULL); ++ execlp(TAR, "tar", "-cf", "-", "--format=gnu", "--null", "--no-recursion", "-T", "-", NULL); ohshite(_("unable to execute %s (%s)"), "tar -cf", TAR); } close(p1[0]); |