From 5b7e96d852778f1164198040cbd165241ea51e40 Mon Sep 17 00:00:00 2001 From: Lianhao Lu Date: Sun, 30 Jan 2011 12:04:46 +0800 Subject: 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 --- meta/classes/rootfs_rpm.bbclass | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'meta/classes/rootfs_rpm.bbclass') 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 fi } -rootfs_rpm_log_check() { - target="$1" - lf_path="$2" - - 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 2>&1 - then - echo "log_check: There were error messages in the logfile" - echo -e "log_check: Matched keyword: [$keyword_die]\n" - echo "$lf_txt" | grep -v log_check | grep -C 5 -i "$keyword_die" - echo "" - do_exit=1 - fi - done - test "$do_exit" = 1 && exit 1 - true -} - remove_packaging_data_files() { rm -rf ${IMAGE_ROOTFS}${rpmlibdir} rm -rf ${IMAGE_ROOTFS}${opkglibdir} -- cgit v1.2.3-54-g00ecf