gzip: 1.8 -> 1.9

1.Upgrade gzip from 1.8 to 1.9.
2.Delete 0001-gzip-port-zdiff-zless-to-Busybox.patch, since it is integrated upstream.
3.Modify wrong-path-fix.patch, since it is changed upstream.

(From OE-Core rev: db59381121d564a1ba5d199a8099d120620f0527)

Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Huang Qiyu
2018-01-25 16:13:37 +08:00
committed by Richard Purdie
parent 78cbfd2b5b
commit 5442688efe
3 changed files with 17 additions and 70 deletions

View File

@@ -1,59 +0,0 @@
From 5f712621829ed81a758077431226a86df37fbc3b Mon Sep 17 00:00:00 2001
From: Denys Zagorui <denys.zagorui@globallogic.com>
Date: Thu, 8 Jun 2017 16:05:50 +0300
Subject: [PATCH] gzip: port zdiff, zless to Busybox
Problem reported by Denys Zagorui (Bug#26088).
* tests/zdiff: Check that diff uses POSIX-format output.
* zless.in (less_version): Don't exit merely because 'less -V'
fails; instead, assume 'less' is compatible with an old version of
the original 'less'. Busybox 'less -V' fails, but apparently its
'less' works anyway somehow.
Signed-off-by: Denys Zagorui <denys.zagorui@globallogic.com>
Upstream-Status: Accepted
---
tests/zdiff | 4 +++-
zless.in | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/tests/zdiff b/tests/zdiff
index 0bb7c7d..9cd4fd4 100755
--- a/tests/zdiff
+++ b/tests/zdiff
@@ -22,7 +22,6 @@
echo a > a || framework_failure_
echo b > b || framework_failure_
-gzip a b || framework_failure_
cat <<EOF > exp
1c1
@@ -31,7 +30,10 @@ cat <<EOF > exp
> b
EOF
+diff a b | diff exp - || skip_ "diff output format is incompatible with POSIX"
+
fail=0
+gzip a b || fail=1
zdiff a.gz b.gz > out 2>&1
test $? = 1 || fail=1
diff --git a/zless.in b/zless.in
index e634af6..9759ae6 100644
--- a/zless.in
+++ b/zless.in
@@ -47,7 +47,7 @@ if test "${LESSMETACHARS+set}" != set; then
export LESSMETACHARS
fi
-less_version=`less -V` || exit
+less_version=`less -V 2>/dev/null`
case $less_version in
less' '45[1-9]* | \
less' '4[6-9][0-9]* | \
--
1.9.1

View File

@@ -13,17 +13,24 @@ Signed-off-by: Ming Liu <ming.liu@windriver.com>
Upstream-Status: Pending
Index: gzip-1.8/Makefile.am
===================================================================
--- gzip-1.8.orig/Makefile.am
+++ gzip-1.8/Makefile.am
@@ -81,8 +81,7 @@ gzip.doc.gz: gzip.doc $(bin_PROGRAMS)
SUFFIXES = .in
---
Makefile.am | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index d4ecc3f..e4657d2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -82,8 +82,7 @@ SUFFIXES = .in
.in:
$(AM_V_GEN)sed \
$(AM_V_GEN)rm -f $@-t $@ \
&& sed \
- -e 's|/bin/sh|$(SHELL)|g' \
- -e 's|[@]GREP@|$(GREP)|g' \
+ -e 's|[@]GREP@|$(base_bindir)/grep|g' \
-e 's|[@]VERSION@|$(VERSION)|g' \
$(srcdir)/$@.in >$@-t \
&& chmod a+x $@-t \
&& chmod a=rx $@-t \
--
2.7.4

View File

@@ -3,7 +3,6 @@ require gzip.inc
LICENSE = "GPLv3+"
SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz \
file://0001-gzip-port-zdiff-zless-to-Busybox.patch \
file://run-ptest"
SRC_URI_append_class-target = " file://wrong-path-fix.patch"
@@ -34,6 +33,6 @@ do_install_ptest() {
${B}/tests/Makefile > ${D}${PTEST_PATH}/src/tests/Makefile
}
SRC_URI[md5sum] = "732553152814b22dc35aa0267df5286c"
SRC_URI[sha256sum] = "1ff7aedb3d66a0d73f442f6261e4b3860df6fd6c94025c2cb31a202c9c60fe0e"
SRC_URI[md5sum] = "929d6a6b832f75b28e3eeeafb30c1d9b"
SRC_URI[sha256sum] = "5d2d3a3432ef32f24cdb060d278834507b481a75adeca18850c73592f778f6ad"