From 36443f882b5390b8a80c808198d508d586f343de Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 5 Dec 2006 11:10:28 +0000 Subject: [PATCH] rootfs_(deb|ipk).bbclass: Fix bashism so works on dash git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1002 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/classes/rootfs_deb.bbclass | 2 +- meta/classes/rootfs_ipk.bbclass | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass index 533eaab..59909d6 100644 --- a/meta/classes/rootfs_deb.bbclass +++ b/meta/classes/rootfs_deb.bbclass @@ -121,7 +121,7 @@ rootfs_deb_log_check() { lf_txt="`cat $lf_path`" for keyword_die in "E:" do - if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") &>/dev/null + if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1 then echo "log_check: There were error messages in the logfile" echo -e "log_check: Matched keyword: [$keyword_die]\n" diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass index 42c50d3..8929b73 100644 --- a/meta/classes/rootfs_ipk.bbclass +++ b/meta/classes/rootfs_ipk.bbclass @@ -70,8 +70,7 @@ rootfs_ipk_log_check() { lf_txt="`cat $lf_path`" for keyword_die in "Cannot find package" "exit 1" ERR Fail do - - if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") &>/dev/null + if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1 then echo "log_check: There were error messages in the logfile" echo -e "log_check: Matched keyword: [$keyword_die]\n" -- 2.7.4