summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-07-15 04:41:07 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-07-18 11:06:32 +0100
commitd5ac587d6cc154ec13f1f65385c539df6e95e47f (patch)
treec6b88ec95fe483524fb30932b16e0e07bf1e5b22 /meta
parenta5bd13395c3b14f88bb849c5b7de6e73111ff4ce (diff)
downloadpoky-d5ac587d6cc154ec13f1f65385c539df6e95e47f.tar.gz
dpkg: upgrade 1.20.0 -> 1.20.5
(From OE-Core rev: 3aa7081ae85b84deb7e3fe49babc48c5d9919dc6) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch9
-rw-r--r--meta/recipes-devtools/dpkg/dpkg_1.20.5.bb (renamed from meta/recipes-devtools/dpkg/dpkg_1.20.0.bb)2
2 files changed, 6 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 7c35407364..ffe520c513 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 450fece894fce750502be8accabfd88c585bda4c Mon Sep 17 00:00:00 2001 1From 15b081cc8bead80c493ab83369ecb3345a24a3dc 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,15 +23,16 @@ 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
26--- 27---
27 dpkg-deb/build.c | 5 ++++- 28 dpkg-deb/build.c | 5 ++++-
28 1 file changed, 4 insertions(+), 1 deletion(-) 29 1 file changed, 4 insertions(+), 1 deletion(-)
29 30
30diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c 31diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c
31index a3d1912..1de7f9c 100644 32index 8436839cd..6b44a36f7 100644
32--- a/dpkg-deb/build.c 33--- a/dpkg-deb/build.c
33+++ b/dpkg-deb/build.c 34+++ b/dpkg-deb/build.c
34@@ -427,6 +427,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, 35@@ -434,6 +434,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder,
35 { 36 {
36 int pipe_filenames[2], pipe_tarball[2]; 37 int pipe_filenames[2], pipe_tarball[2];
37 pid_t pid_tar, pid_comp; 38 pid_t pid_tar, pid_comp;
@@ -39,7 +40,7 @@ index a3d1912..1de7f9c 100644
39 40
40 /* Fork off a tar. We will feed it a list of filenames on stdin later. */ 41 /* Fork off a tar. We will feed it a list of filenames on stdin later. */
41 m_pipe(pipe_filenames); 42 m_pipe(pipe_filenames);
42@@ -477,7 +478,9 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, 43@@ -486,7 +487,9 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder,
43 /* All done, clean up wait for tar and <compress> to finish their job. */ 44 /* All done, clean up wait for tar and <compress> to finish their job. */
44 close(pipe_filenames[1]); 45 close(pipe_filenames[1]);
45 subproc_reap(pid_comp, _("<compress> from tar -cf"), 0); 46 subproc_reap(pid_comp, _("<compress> from tar -cf"), 0);
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.20.0.bb b/meta/recipes-devtools/dpkg/dpkg_1.20.5.bb
index 334294e6f8..d97b69c0b9 100644
--- a/meta/recipes-devtools/dpkg/dpkg_1.20.0.bb
+++ b/meta/recipes-devtools/dpkg/dpkg_1.20.5.bb
@@ -18,6 +18,6 @@ SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https \
18 18
19SRC_URI_append_class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch" 19SRC_URI_append_class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch"
20 20
21SRCREV = "314ac02663c5bd1a82b34745150bf13a39a549a3" 21SRCREV = "823a67d67538b1b403a32d1fef40e6e228265566"
22 22
23S = "${WORKDIR}/git" 23S = "${WORKDIR}/git"