diff options
| -rw-r--r-- | meta/recipes-extended/pigz/files/0001-Fix-bug-when-combining-l-with-d.patch | 50 | ||||
| -rw-r--r-- | meta/recipes-extended/pigz/pigz_2.7.bb (renamed from meta/recipes-extended/pigz/pigz_2.6.bb) | 5 |
2 files changed, 2 insertions, 53 deletions
diff --git a/meta/recipes-extended/pigz/files/0001-Fix-bug-when-combining-l-with-d.patch b/meta/recipes-extended/pigz/files/0001-Fix-bug-when-combining-l-with-d.patch deleted file mode 100644 index 9c301f2054..0000000000 --- a/meta/recipes-extended/pigz/files/0001-Fix-bug-when-combining-l-with-d.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 65986f3d12d434b9bc428ceb6fcb1f6eeeb2c47d Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Mon, 17 Jan 2022 15:36:56 +0800 -Subject: [PATCH] Fix bug when combining -l with -d. - -Though it makes no sense to do pigz -ld, that is implicit when -doing unpigz -l. This commit fixes a bug for that combination. - -Upstream-Status: Backport [https://github.com/madler/pigz/commit/326bba44aa102c707dd6ebcd2fc3f413b3119db0] - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - pigz.c | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/pigz.c b/pigz.c -index f90157f..d648216 100644 ---- a/pigz.c -+++ b/pigz.c -@@ -4007,6 +4007,13 @@ local void process(char *path) { - } - SET_BINARY_MODE(g.ind); - -+ // if requested, just list information about the input file -+ if (g.list && g.decode != 2) { -+ list_info(); -+ load_end(); -+ return; -+ } -+ - // if decoding or testing, try to read gzip header - if (g.decode) { - in_init(); -@@ -4048,13 +4055,6 @@ local void process(char *path) { - } - } - -- // if requested, just list information about input file -- if (g.list) { -- list_info(); -- load_end(); -- return; -- } -- - // create output file out, descriptor outd - if (path == NULL || g.pipeout) { - // write to stdout --- -2.17.1 - diff --git a/meta/recipes-extended/pigz/pigz_2.6.bb b/meta/recipes-extended/pigz/pigz_2.7.bb index d490a6a722..9a1c591b27 100644 --- a/meta/recipes-extended/pigz/pigz_2.6.bb +++ b/meta/recipes-extended/pigz/pigz_2.7.bb @@ -8,9 +8,8 @@ SECTION = "console/utils" LICENSE = "Zlib & Apache-2.0" LIC_FILES_CHKSUM = "file://pigz.c;md5=9ae6dee8ceba9610596ed0ada493d142;beginline=7;endline=21" -SRC_URI = "http://zlib.net/${BPN}/fossils/${BP}.tar.gz \ - file://0001-Fix-bug-when-combining-l-with-d.patch" -SRC_URI[sha256sum] = "2eed7b0d7449d1d70903f2a62cd6005d262eb3a8c9e98687bc8cbb5809db2a7d" +SRC_URI = "http://zlib.net/${BPN}/fossils/${BP}.tar.gz" +SRC_URI[sha256sum] = "b4c9e60344a08d5db37ca7ad00a5b2c76ccb9556354b722d56d55ca7e8b1c707" PROVIDES:class-native += "gzip-native" # Point this at the homepage in case /fossils/ isn't updated |