diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-02-25 22:55:05 -0500 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-03-15 14:22:49 +0000 |
commit | d7bf8c17eca8f8c89898a7794462c773c449e983 (patch) | |
tree | d18618fca85ca5f0c077032cc7b009344b60f663 /import-layers/yocto-poky/meta/recipes-extended/gzip | |
parent | e2b5abdc9f28cdf8578e5b9be803c8e697443c20 (diff) | |
download | talos-openbmc-d7bf8c17eca8f8c89898a7794462c773c449e983.tar.gz talos-openbmc-d7bf8c17eca8f8c89898a7794462c773c449e983.zip |
Yocto 2.4
Move OpenBMC to Yocto 2.4(rocko)
Tested: Built and verified Witherspoon and Palmetto images
Change-Id: I12057b18610d6fb0e6903c60213690301e9b0c67
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-extended/gzip')
3 files changed, 88 insertions, 1 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-extended/gzip/files/0001-gzip-port-zdiff-zless-to-Busybox.patch b/import-layers/yocto-poky/meta/recipes-extended/gzip/files/0001-gzip-port-zdiff-zless-to-Busybox.patch new file mode 100644 index 000000000..20d5a19f7 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-extended/gzip/files/0001-gzip-port-zdiff-zless-to-Busybox.patch @@ -0,0 +1,59 @@ +From 5f712621829ed81a758077431226a86df37fbc3b Mon Sep 17 00:00:00 2001 +From: Denys Zagorui <denys.zagorui@globallogic.com> +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 <denys.zagorui@globallogic.com> + +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 <<EOF > exp + 1c1 +@@ -31,7 +30,10 @@ cat <<EOF > 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/import-layers/yocto-poky/meta/recipes-extended/gzip/files/run-ptest b/import-layers/yocto-poky/meta/recipes-extended/gzip/files/run-ptest new file mode 100644 index 000000000..cf7c64949 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-extended/gzip/files/run-ptest @@ -0,0 +1,6 @@ +#!/bin/sh + +cd src/tests + +make check + diff --git a/import-layers/yocto-poky/meta/recipes-extended/gzip/gzip_1.8.bb b/import-layers/yocto-poky/meta/recipes-extended/gzip/gzip_1.8.bb index 11be846b2..d0932071c 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/gzip/gzip_1.8.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/gzip/gzip_1.8.bb @@ -2,7 +2,9 @@ require gzip.inc LICENSE = "GPLv3+" -SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz" +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 \ @@ -12,6 +14,26 @@ 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" |