summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch')
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch9
1 files changed, 4 insertions, 5 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch b/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch
index f2367c95e9..95a49053e8 100644
--- a/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch
@@ -1,4 +1,4 @@
1From e3ade3464b8a1129a55c2790cf114d9ae01e3cda Mon Sep 17 00:00:00 2001 1From 4c5e6c280a2ab4d2009d3264e94286f5fe244d0b Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.microsoft.com> 2From: Paul Eggleton <paul.eggleton@linux.microsoft.com>
3Date: Tue, 16 Jun 2020 03:57:25 +0000 3Date: Tue, 16 Jun 2020 03:57:25 +0000
4Subject: [PATCH] build.c: ignore return of 1 from tar -cf 4Subject: [PATCH] build.c: ignore return of 1 from tar -cf
@@ -23,16 +23,15 @@ Upstream-Status: Inappropriate [OE specific]
23Original patch by RP 2015/3/27, rebased by Paul Eggleton 23Original patch by RP 2015/3/27, rebased by Paul Eggleton
24 24
25Signed-off-by: Paul Eggleton <paul.eggleton@microsoft.com> 25Signed-off-by: Paul Eggleton <paul.eggleton@microsoft.com>
26
27--- 26---
28 src/deb/build.c | 5 ++++- 27 src/deb/build.c | 5 ++++-
29 1 file changed, 4 insertions(+), 1 deletion(-) 28 1 file changed, 4 insertions(+), 1 deletion(-)
30 29
31diff --git a/src/deb/build.c b/src/deb/build.c 30diff --git a/src/deb/build.c b/src/deb/build.c
32index 76613adec..7c216d1a9 100644 31index 92aba9553..6436b33da 100644
33--- a/src/deb/build.c 32--- a/src/deb/build.c
34+++ b/src/deb/build.c 33+++ b/src/deb/build.c
35@@ -482,6 +482,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, 34@@ -481,6 +481,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder,
36 { 35 {
37 int pipe_filenames[2], pipe_tarball[2]; 36 int pipe_filenames[2], pipe_tarball[2];
38 pid_t pid_tar, pid_comp; 37 pid_t pid_tar, pid_comp;
@@ -40,7 +39,7 @@ index 76613adec..7c216d1a9 100644
40 39
41 /* Fork off a tar. We will feed it a list of filenames on stdin later. */ 40 /* Fork off a tar. We will feed it a list of filenames on stdin later. */
42 m_pipe(pipe_filenames); 41 m_pipe(pipe_filenames);
43@@ -534,7 +535,9 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, 42@@ -533,7 +534,9 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder,
44 /* All done, clean up wait for tar and <compress> to finish their job. */ 43 /* All done, clean up wait for tar and <compress> to finish their job. */
45 close(pipe_filenames[1]); 44 close(pipe_filenames[1]);
46 subproc_reap(pid_comp, _("<compress> from tar -cf"), 0); 45 subproc_reap(pid_comp, _("<compress> from tar -cf"), 0);