summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHuang Qiyu <huangqy.fnst@cn.fujitsu.com>2018-01-25 16:13:37 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-29 08:49:50 +0000
commit5442688efe20d1cb7f33fd02e47cfe3d89014df6 (patch)
treeb04d520a56b68c31aadce378c1125902e15d77da
parent78cbfd2b5bc0df463933992d9028ecf85eb5c8b3 (diff)
downloadpoky-5442688efe20d1cb7f33fd02e47cfe3d89014df6.tar.gz
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>
-rw-r--r--meta/recipes-extended/gzip/files/0001-gzip-port-zdiff-zless-to-Busybox.patch59
-rw-r--r--meta/recipes-extended/gzip/gzip-1.9/wrong-path-fix.patch (renamed from meta/recipes-extended/gzip/gzip-1.8/wrong-path-fix.patch)23
-rw-r--r--meta/recipes-extended/gzip/gzip_1.9.bb (renamed from meta/recipes-extended/gzip/gzip_1.8.bb)5
3 files changed, 17 insertions, 70 deletions
diff --git a/meta/recipes-extended/gzip/files/0001-gzip-port-zdiff-zless-to-Busybox.patch b/meta/recipes-extended/gzip/files/0001-gzip-port-zdiff-zless-to-Busybox.patch
deleted file mode 100644
index 20d5a19f76..0000000000
--- a/meta/recipes-extended/gzip/files/0001-gzip-port-zdiff-zless-to-Busybox.patch
+++ /dev/null
@@ -1,59 +0,0 @@
1From 5f712621829ed81a758077431226a86df37fbc3b Mon Sep 17 00:00:00 2001
2From: Denys Zagorui <denys.zagorui@globallogic.com>
3Date: Thu, 8 Jun 2017 16:05:50 +0300
4Subject: [PATCH] gzip: port zdiff, zless to Busybox
5
6Problem reported by Denys Zagorui (Bug#26088).
7* tests/zdiff: Check that diff uses POSIX-format output.
8* zless.in (less_version): Don't exit merely because 'less -V'
9fails; instead, assume 'less' is compatible with an old version of
10the original 'less'. Busybox 'less -V' fails, but apparently its
11'less' works anyway somehow.
12
13Signed-off-by: Denys Zagorui <denys.zagorui@globallogic.com>
14
15Upstream-Status: Accepted
16---
17 tests/zdiff | 4 +++-
18 zless.in | 2 +-
19 2 files changed, 4 insertions(+), 2 deletions(-)
20
21diff --git a/tests/zdiff b/tests/zdiff
22index 0bb7c7d..9cd4fd4 100755
23--- a/tests/zdiff
24+++ b/tests/zdiff
25@@ -22,7 +22,6 @@
26
27 echo a > a || framework_failure_
28 echo b > b || framework_failure_
29-gzip a b || framework_failure_
30
31 cat <<EOF > exp
32 1c1
33@@ -31,7 +30,10 @@ cat <<EOF > exp
34 > b
35 EOF
36
37+diff a b | diff exp - || skip_ "diff output format is incompatible with POSIX"
38+
39 fail=0
40+gzip a b || fail=1
41 zdiff a.gz b.gz > out 2>&1
42 test $? = 1 || fail=1
43
44diff --git a/zless.in b/zless.in
45index e634af6..9759ae6 100644
46--- a/zless.in
47+++ b/zless.in
48@@ -47,7 +47,7 @@ if test "${LESSMETACHARS+set}" != set; then
49 export LESSMETACHARS
50 fi
51
52-less_version=`less -V` || exit
53+less_version=`less -V 2>/dev/null`
54 case $less_version in
55 less' '45[1-9]* | \
56 less' '4[6-9][0-9]* | \
57--
581.9.1
59
diff --git a/meta/recipes-extended/gzip/gzip-1.8/wrong-path-fix.patch b/meta/recipes-extended/gzip/gzip-1.9/wrong-path-fix.patch
index 4dc10002ed..7c37bc8d2d 100644
--- a/meta/recipes-extended/gzip/gzip-1.8/wrong-path-fix.patch
+++ b/meta/recipes-extended/gzip/gzip-1.9/wrong-path-fix.patch
@@ -13,17 +13,24 @@ Signed-off-by: Ming Liu <ming.liu@windriver.com>
13 13
14Upstream-Status: Pending 14Upstream-Status: Pending
15 15
16Index: gzip-1.8/Makefile.am 16---
17=================================================================== 17 Makefile.am | 3 +--
18--- gzip-1.8.orig/Makefile.am 18 1 file changed, 1 insertion(+), 2 deletions(-)
19+++ gzip-1.8/Makefile.am 19
20@@ -81,8 +81,7 @@ gzip.doc.gz: gzip.doc $(bin_PROGRAMS) 20diff --git a/Makefile.am b/Makefile.am
21 SUFFIXES = .in 21index d4ecc3f..e4657d2 100644
22--- a/Makefile.am
23+++ b/Makefile.am
24@@ -82,8 +82,7 @@ SUFFIXES = .in
22 .in: 25 .in:
23 $(AM_V_GEN)sed \ 26 $(AM_V_GEN)rm -f $@-t $@ \
27 && sed \
24- -e 's|/bin/sh|$(SHELL)|g' \ 28- -e 's|/bin/sh|$(SHELL)|g' \
25- -e 's|[@]GREP@|$(GREP)|g' \ 29- -e 's|[@]GREP@|$(GREP)|g' \
26+ -e 's|[@]GREP@|$(base_bindir)/grep|g' \ 30+ -e 's|[@]GREP@|$(base_bindir)/grep|g' \
27 -e 's|[@]VERSION@|$(VERSION)|g' \ 31 -e 's|[@]VERSION@|$(VERSION)|g' \
28 $(srcdir)/$@.in >$@-t \ 32 $(srcdir)/$@.in >$@-t \
29 && chmod a+x $@-t \ 33 && chmod a=rx $@-t \
34--
352.7.4
36
diff --git a/meta/recipes-extended/gzip/gzip_1.8.bb b/meta/recipes-extended/gzip/gzip_1.9.bb
index d0932071c9..a8eeba1380 100644
--- a/meta/recipes-extended/gzip/gzip_1.8.bb
+++ b/meta/recipes-extended/gzip/gzip_1.9.bb
@@ -3,7 +3,6 @@ require gzip.inc
3LICENSE = "GPLv3+" 3LICENSE = "GPLv3+"
4 4
5SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz \ 5SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz \
6 file://0001-gzip-port-zdiff-zless-to-Busybox.patch \
7 file://run-ptest" 6 file://run-ptest"
8SRC_URI_append_class-target = " file://wrong-path-fix.patch" 7SRC_URI_append_class-target = " file://wrong-path-fix.patch"
9 8
@@ -34,6 +33,6 @@ do_install_ptest() {
34 ${B}/tests/Makefile > ${D}${PTEST_PATH}/src/tests/Makefile 33 ${B}/tests/Makefile > ${D}${PTEST_PATH}/src/tests/Makefile
35} 34}
36 35
37SRC_URI[md5sum] = "732553152814b22dc35aa0267df5286c" 36SRC_URI[md5sum] = "929d6a6b832f75b28e3eeeafb30c1d9b"
38SRC_URI[sha256sum] = "1ff7aedb3d66a0d73f442f6261e4b3860df6fd6c94025c2cb31a202c9c60fe0e" 37SRC_URI[sha256sum] = "5d2d3a3432ef32f24cdb060d278834507b481a75adeca18850c73592f778f6ad"
39 38