mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 13:09:50 +00:00
Code Issues Projects Releases Wiki Activity

dpkg: upgrade 1.20.0 -> 1.20.5

Browse Source 
(From OE-Core rev: 3aa7081ae85b84deb7e3fe49babc48c5d9919dc6)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2020-07-15 04:41:07 +00:00
parent a5bd13395c
commit d5ac587d6c
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch
+5 -4
View File
@@ -1,4 +1,4 @@
From 450fece894fce750502be8accabfd88c585bda4c Mon Sep 17 00:00:00 2001 From 15b081cc8bead80c493ab83369ecb3345a24a3dc Mon Sep 17 00:00:00 2001
From: Paul Eggleton <paul.eggleton@linux.microsoft.com> From: Paul Eggleton <paul.eggleton@linux.microsoft.com>
Date: Tue, 16 Jun 2020 03:57:25 +0000 Date: Tue, 16 Jun 2020 03:57:25 +0000
Subject: [PATCH] build.c: ignore return of 1 from tar -cf Subject: [PATCH] build.c: ignore return of 1 from tar -cf
@@ -23,15 +23,16 @@ Upstream-Status: Inappropriate [OE specific]
Original patch by RP 2015/3/27, rebased by Paul Eggleton Original patch by RP 2015/3/27, rebased by Paul Eggleton
Signed-off-by: Paul Eggleton <paul.eggleton@microsoft.com> Signed-off-by: Paul Eggleton <paul.eggleton@microsoft.com>
--- ---
dpkg-deb/build.c | 5 ++++- dpkg-deb/build.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-) 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c
index a3d1912..1de7f9c 100644 index 8436839cd..6b44a36f7 100644
--- a/dpkg-deb/build.c --- a/dpkg-deb/build.c
+++ b/dpkg-deb/build.c +++ b/dpkg-deb/build.c
@@ -427,6 +427,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, @@ -434,6 +434,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder,
{ {
int pipe_filenames[2], pipe_tarball[2]; int pipe_filenames[2], pipe_tarball[2];
pid_t pid_tar, pid_comp; pid_t pid_tar, pid_comp;
@@ -39,7 +40,7 @@ index a3d1912..1de7f9c 100644
/* Fork off a tar. We will feed it a list of filenames on stdin later. */ /* Fork off a tar. We will feed it a list of filenames on stdin later. */
m_pipe(pipe_filenames); m_pipe(pipe_filenames);
@@ -477,7 +478,9 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, @@ -486,7 +487,9 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder,
/* All done, clean up wait for tar and <compress> to finish their job. */ /* All done, clean up wait for tar and <compress> to finish their job. */
close(pipe_filenames[1]); close(pipe_filenames[1]);
subproc_reap(pid_comp, _("<compress> from tar -cf"), 0); subproc_reap(pid_comp, _("<compress> from tar -cf"), 0);
meta/recipes-devtools/dpkg/dpkg_1.20.0.bb → meta/recipes-devtools/dpkg/dpkg_1.20.5.bb
+1 -1
View File
@@ -18,6 +18,6 @@ SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https \
SRC_URI_append_class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch" SRC_URI_append_class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch"
SRCREV = "314ac02663c5bd1a82b34745150bf13a39a549a3" SRCREV = "823a67d67538b1b403a32d1fef40e6e228265566"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"