summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-12 10:21:02 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-15 08:35:03 +0100
commit099f026bd7a1b3d8fd30fe83f838e5877f4ced7b (patch)
tree72c034b7d986131ad3491b6e111a8a6fc1fc4c72 /meta
parent3274e76fe40609ce407d3f7308b9752de0d40de2 (diff)
downloadpoky-099f026bd7a1b3d8fd30fe83f838e5877f4ced7b.tar.gz
gzip: upgrade to 1.8
Drop the do_install musl append since the charset file is no longer installed. Refresh the patch. Also update the PREFERRED_VERSION. (From OE-Core rev: c57ab66984bff1ea5596ffe592a0ca1e9ba82ab0) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/tcmode-default.inc2
-rw-r--r--meta/recipes-extended/gzip/gzip-1.8/wrong-path-fix.patch (renamed from meta/recipes-extended/gzip/gzip-1.6/wrong-path-fix.patch)10
-rw-r--r--meta/recipes-extended/gzip/gzip.inc5
-rw-r--r--meta/recipes-extended/gzip/gzip_1.8.bb (renamed from meta/recipes-extended/gzip/gzip_1.6.bb)5
4 files changed, 8 insertions, 14 deletions
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index d3a43519d9..3085ec0d52 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -68,7 +68,7 @@ PREFERRED_VERSION_uclibc ?= "${UCLIBCVERSION}"
68PREFERRED_VERSION_uclibc-initial ?= "${UCLIBCVERSION}" 68PREFERRED_VERSION_uclibc-initial ?= "${UCLIBCVERSION}"
69# don't use version earlier than 1.4 for gzip-native, as it's necessary for 69# don't use version earlier than 1.4 for gzip-native, as it's necessary for
70# some packages using an archive format incompatible with earlier gzip 70# some packages using an archive format incompatible with earlier gzip
71PREFERRED_VERSION_gzip-native ?= "1.6" 71PREFERRED_VERSION_gzip-native ?= "1.8"
72 72
73# Setup suitable toolchain flags 73# Setup suitable toolchain flags
74require conf/distro/include/as-needed.inc 74require conf/distro/include/as-needed.inc
diff --git a/meta/recipes-extended/gzip/gzip-1.6/wrong-path-fix.patch b/meta/recipes-extended/gzip/gzip-1.8/wrong-path-fix.patch
index 92863d6c4b..4dc10002ed 100644
--- a/meta/recipes-extended/gzip/gzip-1.6/wrong-path-fix.patch
+++ b/meta/recipes-extended/gzip/gzip-1.8/wrong-path-fix.patch
@@ -13,17 +13,15 @@ Signed-off-by: Ming Liu <ming.liu@windriver.com>
13 13
14Upstream-Status: Pending 14Upstream-Status: Pending
15 15
16Index: gzip-1.3.12/Makefile.am 16Index: gzip-1.8/Makefile.am
17=================================================================== 17===================================================================
18diff -urpN a/Makefile.am b/Makefile.am 18--- gzip-1.8.orig/Makefile.am
19--- a/Makefile.am 2013-11-30 10:06:09.402234871 +0800 19+++ gzip-1.8/Makefile.am
20+++ b/Makefile.am 2013-11-30 10:13:42.952236025 +0800 20@@ -81,8 +81,7 @@ gzip.doc.gz: gzip.doc $(bin_PROGRAMS)
21@@ -81,9 +81,8 @@ gzip.doc.gz: gzip.doc $(bin_PROGRAMS)
22 SUFFIXES = .in 21 SUFFIXES = .in
23 .in: 22 .in:
24 $(AM_V_GEN)sed \ 23 $(AM_V_GEN)sed \
25- -e 's|/bin/sh|$(SHELL)|g' \ 24- -e 's|/bin/sh|$(SHELL)|g' \
26 -e 's|[@]bindir@|'\''$(bindir)'\''|g' \
27- -e 's|[@]GREP@|$(GREP)|g' \ 25- -e 's|[@]GREP@|$(GREP)|g' \
28+ -e 's|[@]GREP@|$(base_bindir)/grep|g' \ 26+ -e 's|[@]GREP@|$(base_bindir)/grep|g' \
29 -e 's|[@]VERSION@|$(VERSION)|g' \ 27 -e 's|[@]VERSION@|$(VERSION)|g' \
diff --git a/meta/recipes-extended/gzip/gzip.inc b/meta/recipes-extended/gzip/gzip.inc
index 6e81883472..04f8f95dd5 100644
--- a/meta/recipes-extended/gzip/gzip.inc
+++ b/meta/recipes-extended/gzip/gzip.inc
@@ -22,11 +22,6 @@ do_install_append () {
22 fi 22 fi
23} 23}
24 24
25do_install_append_libc-musl () {
26 rm ${D}${libdir}/charset.alias
27 rmdir ${D}${libdir}
28}
29
30inherit update-alternatives 25inherit update-alternatives
31 26
32ALTERNATIVE_PRIORITY = "100" 27ALTERNATIVE_PRIORITY = "100"
diff --git a/meta/recipes-extended/gzip/gzip_1.6.bb b/meta/recipes-extended/gzip/gzip_1.8.bb
index b347f0bb8d..a19b965399 100644
--- a/meta/recipes-extended/gzip/gzip_1.6.bb
+++ b/meta/recipes-extended/gzip/gzip_1.8.bb
@@ -13,5 +13,6 @@ NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}"
13 13
14BBCLASSEXTEND = "native" 14BBCLASSEXTEND = "native"
15 15
16SRC_URI[md5sum] = "38603cb2843bf5681ff41aab3bcd6a20" 16SRC_URI[md5sum] = "732553152814b22dc35aa0267df5286c"
17SRC_URI[sha256sum] = "97eb83b763d9e5ad35f351fe5517e6b71521d7aac7acf3e3cacdb6b1496d8f7e" 17SRC_URI[sha256sum] = "1ff7aedb3d66a0d73f442f6261e4b3860df6fd6c94025c2cb31a202c9c60fe0e"
18