summaryrefslogtreecommitdiffstats
path: root/meta/classes/package_rpm.bbclass
diff options
context:
space:
mode:
authorLianhao Lu <lianhao.lu@intel.com>2011-01-30 12:04:46 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-31 16:58:15 +0000
commit5b7e96d852778f1164198040cbd165241ea51e40 (patch)
tree15ba66b3f8d919f8411e73233c246482de5dba42 /meta/classes/package_rpm.bbclass
parent21f2dae46b481dbf34f6874ae814dcd23fc86d54 (diff)
downloadpoky-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_rpm.bbclass')
-rw-r--r--meta/classes/package_rpm.bbclass20
1 files changed, 20 insertions, 0 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 031374c0fc..8891f06ffa 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -70,6 +70,26 @@ package_generate_rpm_conf () {
70 printf "\n" >> ${DEPLOY_DIR_RPM}/solvedb.macro 70 printf "\n" >> ${DEPLOY_DIR_RPM}/solvedb.macro
71} 71}
72 72
73rpm_log_check() {
74 target="$1"
75 lf_path="$2"
76
77 lf_txt="`cat $lf_path`"
78 for keyword_die in "Cannot find package" "exit 1" ERR Fail
79 do
80 if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1
81 then
82 echo "log_check: There were error messages in the logfile"
83 echo -e "log_check: Matched keyword: [$keyword_die]\n"
84 echo "$lf_txt" | grep -v log_check | grep -C 5 -i "$keyword_die"
85 echo ""
86 do_exit=1
87 fi
88 done
89 test "$do_exit" = 1 && exit 1
90 true
91}
92
73python write_specfile () { 93python write_specfile () {
74 import textwrap 94 import textwrap
75 95