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_rpm.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_rpm.bbclass')
-rw-r--r-- | meta/classes/rootfs_rpm.bbclass | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass index 0cea3945ad..26aaa1f8c3 100644 --- a/meta/classes/rootfs_rpm.bbclass +++ b/meta/classes/rootfs_rpm.bbclass | |||
@@ -231,26 +231,6 @@ EOF | |||
231 | fi | 231 | fi |
232 | } | 232 | } |
233 | 233 | ||
234 | rootfs_rpm_log_check() { | ||
235 | target="$1" | ||
236 | lf_path="$2" | ||
237 | |||
238 | lf_txt="`cat $lf_path`" | ||
239 | for keyword_die in "Cannot find package" "exit 1" ERR Fail | ||
240 | do | ||
241 | if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1 | ||
242 | then | ||
243 | echo "log_check: There were error messages in the logfile" | ||
244 | echo -e "log_check: Matched keyword: [$keyword_die]\n" | ||
245 | echo "$lf_txt" | grep -v log_check | grep -C 5 -i "$keyword_die" | ||
246 | echo "" | ||
247 | do_exit=1 | ||
248 | fi | ||
249 | done | ||
250 | test "$do_exit" = 1 && exit 1 | ||
251 | true | ||
252 | } | ||
253 | |||
254 | remove_packaging_data_files() { | 234 | remove_packaging_data_files() { |
255 | rm -rf ${IMAGE_ROOTFS}${rpmlibdir} | 235 | rm -rf ${IMAGE_ROOTFS}${rpmlibdir} |
256 | rm -rf ${IMAGE_ROOTFS}${opkglibdir} | 236 | rm -rf ${IMAGE_ROOTFS}${opkglibdir} |