Signed-off-by: Richard Purdie <[email protected]> --- .../0001-build.c-ignore-return-of-1-from-tar-cf.patch | 9 +++++---- .../dpkg/{dpkg_1.20.0.bb => dpkg_1.20.5.bb} | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) rename meta/recipes-devtools/dpkg/{dpkg_1.20.0.bb => dpkg_1.20.5.bb} (95%)
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 7c354073648..ffe520c5130 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 @@ -From 450fece894fce750502be8accabfd88c585bda4c Mon Sep 17 00:00:00 2001 +From 15b081cc8bead80c493ab83369ecb3345a24a3dc Mon Sep 17 00:00:00 2001 From: Paul Eggleton <[email protected]> Date: Tue, 16 Jun 2020 03:57:25 +0000 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 Signed-off-by: Paul Eggleton <[email protected]> + --- dpkg-deb/build.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 +++ 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]; 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. */ 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. */ close(pipe_filenames[1]); 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 similarity index 95% rename from meta/recipes-devtools/dpkg/dpkg_1.20.0.bb rename to meta/recipes-devtools/dpkg/dpkg_1.20.5.bb index 334294e6f88..d97b69c0b97 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 \ SRC_URI_append_class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch" -SRCREV = "314ac02663c5bd1a82b34745150bf13a39a549a3" +SRCREV = "823a67d67538b1b403a32d1fef40e6e228265566" S = "${WORKDIR}/git" -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#140727): https://lists.openembedded.org/g/openembedded-core/message/140727 Mute This Topic: https://lists.openembedded.org/mt/75550926/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
