diff options
| author | Richard Purdie <richard@openedhand.com> | 2006-12-05 11:10:28 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2006-12-05 11:10:28 +0000 |
| commit | 4cf2d71a16081bb27552e69ce483c0762b726b66 (patch) | |
| tree | 6420ace1ee5aa52602b3a67ab723fbd434d1631b /meta | |
| parent | c30cb8c7aae27d7c3967a5bb168e684381fc662a (diff) | |
| download | poky-4cf2d71a16081bb27552e69ce483c0762b726b66.tar.gz | |
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
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/rootfs_deb.bbclass | 2 | ||||
| -rw-r--r-- | 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 533eaab4d1..59909d6852 100644 --- a/meta/classes/rootfs_deb.bbclass +++ b/meta/classes/rootfs_deb.bbclass | |||
| @@ -121,7 +121,7 @@ rootfs_deb_log_check() { | |||
| 121 | lf_txt="`cat $lf_path`" | 121 | lf_txt="`cat $lf_path`" |
| 122 | for keyword_die in "E:" | 122 | for keyword_die in "E:" |
| 123 | do | 123 | do |
| 124 | if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") &>/dev/null | 124 | if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1 |
| 125 | then | 125 | then |
| 126 | echo "log_check: There were error messages in the logfile" | 126 | echo "log_check: There were error messages in the logfile" |
| 127 | echo -e "log_check: Matched keyword: [$keyword_die]\n" | 127 | echo -e "log_check: Matched keyword: [$keyword_die]\n" |
diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass index 42c50d35f8..8929b736ff 100644 --- a/meta/classes/rootfs_ipk.bbclass +++ b/meta/classes/rootfs_ipk.bbclass | |||
| @@ -70,8 +70,7 @@ rootfs_ipk_log_check() { | |||
| 70 | lf_txt="`cat $lf_path`" | 70 | lf_txt="`cat $lf_path`" |
| 71 | for keyword_die in "Cannot find package" "exit 1" ERR Fail | 71 | for keyword_die in "Cannot find package" "exit 1" ERR Fail |
| 72 | do | 72 | do |
| 73 | 73 | if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1 | |
| 74 | if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") &>/dev/null | ||
| 75 | then | 74 | then |
| 76 | echo "log_check: There were error messages in the logfile" | 75 | echo "log_check: There were error messages in the logfile" |
| 77 | echo -e "log_check: Matched keyword: [$keyword_die]\n" | 76 | echo -e "log_check: Matched keyword: [$keyword_die]\n" |