From 099f026bd7a1b3d8fd30fe83f838e5877f4ced7b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 12 Jun 2016 10:21:02 +0800 Subject: 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 --- meta/conf/distro/include/tcmode-default.inc | 2 +- .../gzip/gzip-1.6/wrong-path-fix.patch | 31 ---------------------- .../gzip/gzip-1.8/wrong-path-fix.patch | 29 ++++++++++++++++++++ meta/recipes-extended/gzip/gzip.inc | 5 ---- meta/recipes-extended/gzip/gzip_1.6.bb | 17 ------------ meta/recipes-extended/gzip/gzip_1.8.bb | 18 +++++++++++++ 6 files changed, 48 insertions(+), 54 deletions(-) delete mode 100644 meta/recipes-extended/gzip/gzip-1.6/wrong-path-fix.patch create mode 100644 meta/recipes-extended/gzip/gzip-1.8/wrong-path-fix.patch delete mode 100644 meta/recipes-extended/gzip/gzip_1.6.bb create mode 100644 meta/recipes-extended/gzip/gzip_1.8.bb (limited to 'meta') 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.6/wrong-path-fix.patch deleted file mode 100644 index 92863d6c4b..0000000000 --- a/meta/recipes-extended/gzip/gzip-1.6/wrong-path-fix.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 - -Upstream-Status: Pending - -Index: gzip-1.3.12/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) - 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' \ - $(srcdir)/$@.in >$@-t \ - && chmod a+x $@-t \ diff --git a/meta/recipes-extended/gzip/gzip-1.8/wrong-path-fix.patch b/meta/recipes-extended/gzip/gzip-1.8/wrong-path-fix.patch new file mode 100644 index 0000000000..4dc10002ed --- /dev/null +++ b/meta/recipes-extended/gzip/gzip-1.8/wrong-path-fix.patch @@ -0,0 +1,29 @@ +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 + +Upstream-Status: Pending + +Index: gzip-1.8/Makefile.am +=================================================================== +--- 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|[@]GREP@|$(GREP)|g' \ ++ -e 's|[@]GREP@|$(base_bindir)/grep|g' \ + -e 's|[@]VERSION@|$(VERSION)|g' \ + $(srcdir)/$@.in >$@-t \ + && chmod a+x $@-t \ 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.6.bb deleted file mode 100644 index b347f0bb8d..0000000000 --- a/meta/recipes-extended/gzip/gzip_1.6.bb +++ /dev/null @@ -1,17 +0,0 @@ -require gzip.inc - -LICENSE = "GPLv3+" - -SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz" -SRC_URI_append_class-target = " file://wrong-path-fix.patch" - -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://gzip.h;beginline=8;endline=20;md5=6e47caaa630e0c8bf9f1bc8d94a8ed0e" - -PROVIDES_append_class-native = " gzip-replacement-native" -NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" - -BBCLASSEXTEND = "native" - -SRC_URI[md5sum] = "38603cb2843bf5681ff41aab3bcd6a20" -SRC_URI[sha256sum] = "97eb83b763d9e5ad35f351fe5517e6b71521d7aac7acf3e3cacdb6b1496d8f7e" diff --git a/meta/recipes-extended/gzip/gzip_1.8.bb b/meta/recipes-extended/gzip/gzip_1.8.bb new file mode 100644 index 0000000000..a19b965399 --- /dev/null +++ b/meta/recipes-extended/gzip/gzip_1.8.bb @@ -0,0 +1,18 @@ +require gzip.inc + +LICENSE = "GPLv3+" + +SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz" +SRC_URI_append_class-target = " file://wrong-path-fix.patch" + +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://gzip.h;beginline=8;endline=20;md5=6e47caaa630e0c8bf9f1bc8d94a8ed0e" + +PROVIDES_append_class-native = " gzip-replacement-native" +NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" + +BBCLASSEXTEND = "native" + +SRC_URI[md5sum] = "732553152814b22dc35aa0267df5286c" +SRC_URI[sha256sum] = "1ff7aedb3d66a0d73f442f6261e4b3860df6fd6c94025c2cb31a202c9c60fe0e" + -- cgit v1.2.3-54-g00ecf