diff options
| author |   Huang Qiyu <huangqy.fnst@cn.fujitsu.com> | 2018-01-25 16:13:37 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-29 08:49:43 +0000 |
| commit | db59381121d564a1ba5d199a8099d120620f0527 (patch) | |
| tree | e5bdb0abe82c9018ca0897b540c156dac7107711 /meta/recipes-extended/gzip/gzip-1.9/wrong-path-fix.patch | |
| parent | f818d257ebd80714c5fcb243284188f6ec5c5daa (diff) | |
| download | openembedded-core-db59381121d564a1ba5d199a8099d120620f0527.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.
Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-extended/gzip/gzip-1.9/wrong-path-fix.patch')
| -rw-r--r-- | meta/recipes-extended/gzip/gzip-1.9/wrong-path-fix.patch | 36 |
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 @@ +fix MakeMaker issues with using wrong SHELL/GREP + +A set of substitution is being processed to all target scripts with sed by +replacing some key words with the detected values at configure time, this +is exactly not compliant with cross compling, and will cause missing path +errors at run time like: +"/usr/bin/zgrep: line 230: /usr/bin/grep: No such file or directory" + +Fixed by removing unneeded substitution and using real runtime paths +instead. + +Signed-off-by: Ming Liu <ming.liu@windriver.com> + +Upstream-Status: Pending + +--- + 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)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=rx $@-t \ +-- +2.7.4 + |