summaryrefslogtreecommitdiffstats
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-14 13:01:58 +0100
commitc57ab66984bff1ea5596ffe592a0ca1e9ba82ab0 (patch)
tree19e459220842acf79d366803223c1780bbf1854f
parent1ac29df99c5533c7d6752b5756e9f0b43e2d9b64 (diff)
downloadopenembedded-core-contrib-c57ab66984bff1ea5596ffe592a0ca1e9ba82ab0.tar.gz
openembedded-core-contrib-c57ab66984bff1ea5596ffe592a0ca1e9ba82ab0.tar.bz2
openembedded-core-contrib-c57ab66984bff1ea5596ffe592a0ca1e9ba82ab0.zip
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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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}"
PREFERRED_VERSION_uclibc-initial ?= "${UCLIBCVERSION}"
# don't use version earlier than 1.4 for gzip-native, as it's necessary for
# some packages using an archive format incompatible with earlier gzip
-PREFERRED_VERSION_gzip-native ?= "1.6"
+PREFERRED_VERSION_gzip-native ?= "1.8"
# Setup suitable toolchain flags
require 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>
Upstream-Status: Pending
-Index: gzip-1.3.12/Makefile.am
+Index: gzip-1.8/Makefile.am
===================================================================
-diff -urpN a/Makefile.am b/Makefile.am
---- a/Makefile.am 2013-11-30 10:06:09.402234871 +0800
-+++ b/Makefile.am 2013-11-30 10:13:42.952236025 +0800
-@@ -81,9 +81,8 @@ gzip.doc.gz: gzip.doc $(bin_PROGRAMS)
+--- gzip-1.8.orig/Makefile.am
++++ gzip-1.8/Makefile.am
+@@ -81,8 +81,7 @@ gzip.doc.gz: gzip.doc $(bin_PROGRAMS)
SUFFIXES = .in
.in:
$(AM_V_GEN)sed \
- -e 's|/bin/sh|$(SHELL)|g' \
- -e 's|[@]bindir@|'\''$(bindir)'\''|g' \
- -e 's|[@]GREP@|$(GREP)|g' \
+ -e 's|[@]GREP@|$(base_bindir)/grep|g' \
-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 () {
fi
}
-do_install_append_libc-musl () {
- rm ${D}${libdir}/charset.alias
- rmdir ${D}${libdir}
-}
-
inherit update-alternatives
ALTERNATIVE_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}"
BBCLASSEXTEND = "native"
-SRC_URI[md5sum] = "38603cb2843bf5681ff41aab3bcd6a20"
-SRC_URI[sha256sum] = "97eb83b763d9e5ad35f351fe5517e6b71521d7aac7acf3e3cacdb6b1496d8f7e"
+SRC_URI[md5sum] = "732553152814b22dc35aa0267df5286c"
+SRC_URI[sha256sum] = "1ff7aedb3d66a0d73f442f6261e4b3860df6fd6c94025c2cb31a202c9c60fe0e"
+