diff options
| author | Lianhao Lu <lianhao.lu@intel.com> | 2011-01-30 12:04:46 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-31 16:58:15 +0000 |
| commit | 5b7e96d852778f1164198040cbd165241ea51e40 (patch) | |
| tree | 15ba66b3f8d919f8411e73233c246482de5dba42 /meta/classes/package_deb.bbclass | |
| parent | 21f2dae46b481dbf34f6874ae814dcd23fc86d54 (diff) | |
| download | poky-5b7e96d852778f1164198040cbd165241ea51e40.tar.gz | |
image/package_xx/rootfs_xx.bbclass: move rootfs_xx_log_check().
Move function rootfs_xx_log_check() from rootfs_xx.bbclass to relevant
package_xx.bbclass. (Where xx is rpm/ipk/deb).
Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Diffstat (limited to 'meta/classes/package_deb.bbclass')
| -rw-r--r-- | meta/classes/package_deb.bbclass | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index 29dcc5c457..2181ce7c22 100644 --- a/meta/classes/package_deb.bbclass +++ b/meta/classes/package_deb.bbclass | |||
| @@ -67,6 +67,26 @@ python do_package_deb_install () { | |||
| 67 | os.putenv('PATH', path) | 67 | os.putenv('PATH', path) |
| 68 | } | 68 | } |
| 69 | 69 | ||
| 70 | deb_log_check() { | ||
| 71 | target="$1" | ||
| 72 | lf_path="$2" | ||
| 73 | |||
| 74 | lf_txt="`cat $lf_path`" | ||
| 75 | for keyword_die in "E:" | ||
| 76 | do | ||
| 77 | if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1 | ||
| 78 | then | ||
| 79 | echo "log_check: There were error messages in the logfile" | ||
| 80 | echo -e "log_check: Matched keyword: [$keyword_die]\n" | ||
| 81 | echo "$lf_txt" | grep -v log_check | grep -C 5 -i "$keyword_die" | ||
| 82 | echo "" | ||
| 83 | do_exit=1 | ||
| 84 | fi | ||
| 85 | done | ||
| 86 | test "$do_exit" = 1 && exit 1 | ||
| 87 | true | ||
| 88 | } | ||
| 89 | |||
| 70 | python do_package_deb () { | 90 | python do_package_deb () { |
| 71 | import re, copy | 91 | import re, copy |
| 72 | import textwrap | 92 | import textwrap |
