summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/gzip/gzip-1.9
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 /meta/recipes-extended/gzip/gzip-1.9
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>
Diffstat (limited to 'meta/recipes-extended/gzip/gzip-1.9')
-rw-r--r--meta/recipes-extended/gzip/gzip-1.9/wrong-path-fix.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-extended/gzip/gzip-1.9/wrong-path-fix.patch b/meta/recipes-extended/gzip/gzip-1.9/wrong-path-fix.patch
new file mode 100644
index 0000000000..7c37bc8d2d
--- /dev/null
+++ b/meta/recipes-extended/gzip/gzip-1.9/wrong-path-fix.patch
@@ -0,0 +1,36 @@
1fix MakeMaker issues with using wrong SHELL/GREP
2
3A set of substitution is being processed to all target scripts with sed by
4replacing some key words with the detected values at configure time, this
5is exactly not compliant with cross compling, and will cause missing path
6errors at run time like:
7"/usr/bin/zgrep: line 230: /usr/bin/grep: No such file or directory"
8
9Fixed by removing unneeded substitution and using real runtime paths
10instead.
11
12Signed-off-by: Ming Liu <ming.liu@windriver.com>
13
14Upstream-Status: Pending
15
16---
17 Makefile.am | 3 +--
18 1 file changed, 1 insertion(+), 2 deletions(-)
19
20diff --git a/Makefile.am b/Makefile.am
21index d4ecc3f..e4657d2 100644
22--- a/Makefile.am
23+++ b/Makefile.am
24@@ -82,8 +82,7 @@ SUFFIXES = .in
25 .in:
26 $(AM_V_GEN)rm -f $@-t $@ \
27 && sed \
28- -e 's|/bin/sh|$(SHELL)|g' \
29- -e 's|[@]GREP@|$(GREP)|g' \
30+ -e 's|[@]GREP@|$(base_bindir)/grep|g' \
31 -e 's|[@]VERSION@|$(VERSION)|g' \
32 $(srcdir)/$@.in >$@-t \
33 && chmod a=rx $@-t \
34--
352.7.4
36