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/rootfs_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/rootfs_deb.bbclass')
-rw-r--r-- | meta/classes/rootfs_deb.bbclass | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass index f579b53a82..1335e719f4 100644 --- a/meta/classes/rootfs_deb.bbclass +++ b/meta/classes/rootfs_deb.bbclass | |||
@@ -136,26 +136,6 @@ fakeroot rootfs_deb_do_rootfs () { | |||
136 | log_check rootfs | 136 | log_check rootfs |
137 | } | 137 | } |
138 | 138 | ||
139 | rootfs_deb_log_check() { | ||
140 | target="$1" | ||
141 | lf_path="$2" | ||
142 | |||
143 | lf_txt="`cat $lf_path`" | ||
144 | for keyword_die in "E:" | ||
145 | do | ||
146 | if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1 | ||
147 | then | ||
148 | echo "log_check: There were error messages in the logfile" | ||
149 | echo -e "log_check: Matched keyword: [$keyword_die]\n" | ||
150 | echo "$lf_txt" | grep -v log_check | grep -C 5 -i "$keyword_die" | ||
151 | echo "" | ||
152 | do_exit=1 | ||
153 | fi | ||
154 | done | ||
155 | test "$do_exit" = 1 && exit 1 | ||
156 | true | ||
157 | } | ||
158 | |||
159 | remove_packaging_data_files() { | 139 | remove_packaging_data_files() { |
160 | rm -rf ${IMAGE_ROOTFS}${opkglibdir} | 140 | rm -rf ${IMAGE_ROOTFS}${opkglibdir} |
161 | rm -rf ${IMAGE_ROOTFS}/usr/dpkg/ | 141 | rm -rf ${IMAGE_ROOTFS}/usr/dpkg/ |