From db59381121d564a1ba5d199a8099d120620f0527 Mon Sep 17 00:00:00 2001 From: Huang Qiyu Date: Thu, 25 Jan 2018 16:13:37 +0800 Subject: 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 Signed-off-by: Ross Burton --- .../0001-gzip-port-zdiff-zless-to-Busybox.patch | 59 ---------------------- .../gzip/gzip-1.8/wrong-path-fix.patch | 29 ----------- .../gzip/gzip-1.9/wrong-path-fix.patch | 36 +++++++++++++ meta/recipes-extended/gzip/gzip_1.8.bb | 39 -------------- meta/recipes-extended/gzip/gzip_1.9.bb | 38 ++++++++++++++ 5 files changed, 74 insertions(+), 127 deletions(-) delete mode 100644 meta/recipes-extended/gzip/files/0001-gzip-port-zdiff-zless-to-Busybox.patch delete mode 100644 meta/recipes-extended/gzip/gzip-1.8/wrong-path-fix.patch create mode 100644 meta/recipes-extended/gzip/gzip-1.9/wrong-path-fix.patch delete mode 100644 meta/recipes-extended/gzip/gzip_1.8.bb create mode 100644 meta/recipes-extended/gzip/gzip_1.9.bb (limited to 'meta/recipes-extended') diff --git a/meta/recipes-extended/gzip/files/0001-gzip-port-zdiff-zless-to-Busybox.patch b/meta/recipes-extended/gzip/files/0001-gzip-port-zdiff-zless-to-Busybox.patch deleted file mode 100644 index 20d5a19f76..0000000000 --- a/meta/recipes-extended/gzip/files/0001-gzip-port-zdiff-zless-to-Busybox.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 5f712621829ed81a758077431226a86df37fbc3b Mon Sep 17 00:00:00 2001 -From: Denys Zagorui -Date: Thu, 8 Jun 2017 16:05:50 +0300 -Subject: [PATCH] gzip: port zdiff, zless to Busybox - -Problem reported by Denys Zagorui (Bug#26088). -* tests/zdiff: Check that diff uses POSIX-format output. -* zless.in (less_version): Don't exit merely because 'less -V' -fails; instead, assume 'less' is compatible with an old version of -the original 'less'. Busybox 'less -V' fails, but apparently its -'less' works anyway somehow. - -Signed-off-by: Denys Zagorui - -Upstream-Status: Accepted ---- - tests/zdiff | 4 +++- - zless.in | 2 +- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/tests/zdiff b/tests/zdiff -index 0bb7c7d..9cd4fd4 100755 ---- a/tests/zdiff -+++ b/tests/zdiff -@@ -22,7 +22,6 @@ - - echo a > a || framework_failure_ - echo b > b || framework_failure_ --gzip a b || framework_failure_ - - cat < exp - 1c1 -@@ -31,7 +30,10 @@ cat < exp - > b - EOF - -+diff a b | diff exp - || skip_ "diff output format is incompatible with POSIX" -+ - fail=0 -+gzip a b || fail=1 - zdiff a.gz b.gz > out 2>&1 - test $? = 1 || fail=1 - -diff --git a/zless.in b/zless.in -index e634af6..9759ae6 100644 ---- a/zless.in -+++ b/zless.in -@@ -47,7 +47,7 @@ if test "${LESSMETACHARS+set}" != set; then - export LESSMETACHARS - fi - --less_version=`less -V` || exit -+less_version=`less -V 2>/dev/null` - case $less_version in - less' '45[1-9]* | \ - less' '4[6-9][0-9]* | \ --- -1.9.1 - 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 deleted file mode 100644 index 4dc10002ed..0000000000 --- a/meta/recipes-extended/gzip/gzip-1.8/wrong-path-fix.patch +++ /dev/null @@ -1,29 +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.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-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 + +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 + diff --git a/meta/recipes-extended/gzip/gzip_1.8.bb b/meta/recipes-extended/gzip/gzip_1.8.bb deleted file mode 100644 index d0932071c9..0000000000 --- a/meta/recipes-extended/gzip/gzip_1.8.bb +++ /dev/null @@ -1,39 +0,0 @@ -require gzip.inc - -LICENSE = "GPLv3+" - -SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz \ - file://0001-gzip-port-zdiff-zless-to-Busybox.patch \ - file://run-ptest" -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" - -BBCLASSEXTEND = "native" - -inherit ptest - -do_install_ptest() { - mkdir -p ${D}${PTEST_PATH}/src/build-aux - cp ${S}/build-aux/test-driver ${D}${PTEST_PATH}/src/build-aux/ - mkdir -p ${D}${PTEST_PATH}/src/tests - cp -r ${S}/tests/* ${D}${PTEST_PATH}/src/tests - sed -e 's/^abs_srcdir = ..*/abs_srcdir = \.\./' \ - -e 's/^top_srcdir = ..*/top_srcdir = \.\./' \ - -e 's/^GREP = ..*/GREP = grep/' \ - -e 's/^AWK = ..*/AWK = awk/' \ - -e 's/^srcdir = ..*/srcdir = \./' \ - -e 's/^Makefile: ..*/Makefile: /' \ - -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ - -e 's|${DEBUG_PREFIX_MAP}||g' \ - -e 's:${HOSTTOOLS_DIR}/::g' \ - -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ - ${B}/tests/Makefile > ${D}${PTEST_PATH}/src/tests/Makefile -} - -SRC_URI[md5sum] = "732553152814b22dc35aa0267df5286c" -SRC_URI[sha256sum] = "1ff7aedb3d66a0d73f442f6261e4b3860df6fd6c94025c2cb31a202c9c60fe0e" - diff --git a/meta/recipes-extended/gzip/gzip_1.9.bb b/meta/recipes-extended/gzip/gzip_1.9.bb new file mode 100644 index 0000000000..a8eeba1380 --- /dev/null +++ b/meta/recipes-extended/gzip/gzip_1.9.bb @@ -0,0 +1,38 @@ +require gzip.inc + +LICENSE = "GPLv3+" + +SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz \ + file://run-ptest" +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" + +BBCLASSEXTEND = "native" + +inherit ptest + +do_install_ptest() { + mkdir -p ${D}${PTEST_PATH}/src/build-aux + cp ${S}/build-aux/test-driver ${D}${PTEST_PATH}/src/build-aux/ + mkdir -p ${D}${PTEST_PATH}/src/tests + cp -r ${S}/tests/* ${D}${PTEST_PATH}/src/tests + sed -e 's/^abs_srcdir = ..*/abs_srcdir = \.\./' \ + -e 's/^top_srcdir = ..*/top_srcdir = \.\./' \ + -e 's/^GREP = ..*/GREP = grep/' \ + -e 's/^AWK = ..*/AWK = awk/' \ + -e 's/^srcdir = ..*/srcdir = \./' \ + -e 's/^Makefile: ..*/Makefile: /' \ + -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ + -e 's|${DEBUG_PREFIX_MAP}||g' \ + -e 's:${HOSTTOOLS_DIR}/::g' \ + -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ + ${B}/tests/Makefile > ${D}${PTEST_PATH}/src/tests/Makefile +} + +SRC_URI[md5sum] = "929d6a6b832f75b28e3eeeafb30c1d9b" +SRC_URI[sha256sum] = "5d2d3a3432ef32f24cdb060d278834507b481a75adeca18850c73592f778f6ad" + -- cgit 1.2.3-korg