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_ipk.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_ipk.bbclass')
-rw-r--r-- | meta/classes/rootfs_ipk.bbclass | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass index 593a4032f0..07c114e3ab 100644 --- a/meta/classes/rootfs_ipk.bbclass +++ b/meta/classes/rootfs_ipk.bbclass | |||
@@ -82,26 +82,6 @@ fakeroot rootfs_ipk_do_rootfs () { | |||
82 | log_check rootfs | 82 | log_check rootfs |
83 | } | 83 | } |
84 | 84 | ||
85 | rootfs_ipk_log_check() { | ||
86 | target="$1" | ||
87 | lf_path="$2" | ||
88 | |||
89 | lf_txt="`cat $lf_path`" | ||
90 | for keyword_die in "exit 1" "Collected errors" ERR Fail | ||
91 | do | ||
92 | if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1 | ||
93 | then | ||
94 | echo "log_check: There were error messages in the logfile" | ||
95 | echo -e "log_check: Matched keyword: [$keyword_die]\n" | ||
96 | echo "$lf_txt" | grep -v log_check | grep -C 5 -i "$keyword_die" | ||
97 | echo "" | ||
98 | do_exit=1 | ||
99 | fi | ||
100 | done | ||
101 | test "$do_exit" = 1 && exit 1 | ||
102 | true | ||
103 | } | ||
104 | |||
105 | rootfs_ipk_write_manifest() { | 85 | rootfs_ipk_write_manifest() { |
106 | manifest=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.manifest | 86 | manifest=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.manifest |
107 | cp ${IMAGE_ROOTFS}${opkglibdir}/status $manifest | 87 | cp ${IMAGE_ROOTFS}${opkglibdir}/status $manifest |