sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Richard Purdie 2016-06-12 10:21:02 +08:00
parent 3274e76fe4
commit 099f026bd7
4 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/conf/distro/include/tcmode-default.inc
View File

@ -68,7 +68,7 @@ PREFERRED_VERSION_uclibc ?= "${UCLIBCVERSION}"
PREFERRED_VERSION_uclibc-initial ?= "${UCLIBCVERSION}" PREFERRED_VERSION_uclibc-initial ?= "${UCLIBCVERSION}"
# don't use version earlier than 1.4 for gzip-native, as it's necessary for # 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 # 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 # Setup suitable toolchain flags
require conf/distro/include/as-needed.inc require conf/distro/include/as-needed.inc

10
meta/recipes-extended/gzip/gzip-1.6/wrong-path-fix.patch → meta/recipes-extended/gzip/gzip-1.8/wrong-path-fix.patch
View File

@ -13,17 +13,15 @@ Signed-off-by: Ming Liu <ming.liu@windriver.com>
Upstream-Status: Pending Upstream-Status: Pending
Index: gzip-1.3.12/Makefile.am Index: gzip-1.8/Makefile.am
=================================================================== ===================================================================
diff -urpN a/Makefile.am b/Makefile.am --- gzip-1.8.orig/Makefile.am
--- a/Makefile.am 2013-11-30 10:06:09.402234871 +0800 +++ gzip-1.8/Makefile.am
+++ b/Makefile.am 2013-11-30 10:13:42.952236025 +0800 @@ -81,8 +81,7 @@ gzip.doc.gz: gzip.doc $(bin_PROGRAMS)
@@ -81,9 +81,8 @@ gzip.doc.gz: gzip.doc $(bin_PROGRAMS)
SUFFIXES = .in SUFFIXES = .in
.in: .in:
$(AM_V_GEN)sed \ $(AM_V_GEN)sed \
- -e 's|/bin/sh|$(SHELL)|g' \ - -e 's|/bin/sh|$(SHELL)|g' \
-e 's|[@]bindir@|'\''$(bindir)'\''|g' \
- -e 's|[@]GREP@|$(GREP)|g' \ - -e 's|[@]GREP@|$(GREP)|g' \
+ -e 's|[@]GREP@|$(base_bindir)/grep|g' \ + -e 's|[@]GREP@|$(base_bindir)/grep|g' \
-e 's|[@]VERSION@|$(VERSION)|g' \ -e 's|[@]VERSION@|$(VERSION)|g' \

5
meta/recipes-extended/gzip/gzip.inc
View File

@ -22,11 +22,6 @@ do_install_append () {
fi fi
} }
do_install_append_libc-musl () {
rm ${D}${libdir}/charset.alias
rmdir ${D}${libdir}
}
inherit update-alternatives inherit update-alternatives
ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_PRIORITY = "100"

5
meta/recipes-extended/gzip/gzip_1.6.bb → meta/recipes-extended/gzip/gzip_1.8.bb
View File

@ -13,5 +13,6 @@ NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}"
BBCLASSEXTEND = "native" BBCLASSEXTEND = "native"
SRC_URI[md5sum] = "38603cb2843bf5681ff41aab3bcd6a20" SRC_URI[md5sum] = "732553152814b22dc35aa0267df5286c"
SRC_URI[sha256sum] = "97eb83b763d9e5ad35f351fe5517e6b71521d7aac7acf3e3cacdb6b1496d8f7e" SRC_URI[sha256sum] = "1ff7aedb3d66a0d73f442f6261e4b3860df6fd6c94025c2cb31a202c9c60fe0e"