[poky] [PATCH 4/6] classes/populate_sdk_*: remove blanks.
Lianhao Lu
lianhao.lu at intel.com
Wed Jan 26 18:51:32 PST 2011
From: Lianhao Lu <lianhao.lu at intel.com>
Remove unnecessary blanks introduced in commit
2fc923582dbf15d1a694c0f7764f48e97b30116a and
6af64af67102945a08e640e1100ea14831c6d794.
Signed-off-by: Lianhao Lu <lianhao.lu at intel.com>
---
meta/classes/populate_sdk_deb.bbclass | 22 +++++++++++-----------
meta/classes/populate_sdk_ipk.bbclass | 6 +++---
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/meta/classes/populate_sdk_deb.bbclass b/meta/classes/populate_sdk_deb.bbclass
index 356f409..abcb000 100644
--- a/meta/classes/populate_sdk_deb.bbclass
+++ b/meta/classes/populate_sdk_deb.bbclass
@@ -2,7 +2,7 @@ do_populate_sdk[depends] += "dpkg-native:do_populate_sysroot apt-native:do_popul
do_populate_sdk[recrdeptask] += "do_package_write_deb"
generate_generate_deb_conf () {
-
+
rootfs=$1
dpkg_arch=$2
shift
@@ -22,7 +22,7 @@ generate_generate_deb_conf () {
if [ ! -d ${DEPLOY_DIR_DEB}/$arch ]; then
continue;
fi
-
+
echo "deb file:${DEPLOY_DIR_DEB}/$arch/ ./" >> ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev
(echo "Package: *"
echo "Pin: release l=$arch"
@@ -79,9 +79,9 @@ populate_sdk_post_deb () {
}
fakeroot populate_sdk_deb () {
-
+
package_update_index_deb
-
+
set -x
#install target
generate_generate_deb_conf ${SDK_OUTPUT}/${SDKTARGETSYSROOT} ${DPKG_ARCH} ${PACKAGE_ARCHS}
@@ -100,13 +100,13 @@ fakeroot populate_sdk_deb () {
generate_generate_deb_conf ${SDK_OUTPUT} ${SDK_ARCH} ${sdkarchs}
populate_sdk_deb_internal ${SDK_OUTPUT} ${TOOLCHAIN_HOST_TASK}
populate_sdk_post_deb ${SDK_OUTPUT}/${SDKPATHNATIVE}
-
+
#move remainings
- install -d ${SDK_OUTPUT}/${SDKPATHNATIVE}/var/dpkg
+ install -d ${SDK_OUTPUT}/${SDKPATHNATIVE}/var/dpkg
mv ${SDK_OUTPUT}/var/dpkg/* ${SDK_OUTPUT}/${SDKPATHNATIVE}/var/dpkg
- rm -rf ${SDK_OUTPUT}/var
-
- populate_sdk_log_check
+ rm -rf ${SDK_OUTPUT}/var
+
+ populate_sdk_log_check
}
populate_sdk_deb_log_check() {
@@ -114,7 +114,7 @@ populate_sdk_deb_log_check() {
lf_txt="`cat $lf_path`"
for keyword_die in "E:"
- do
+ 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"
@@ -124,6 +124,6 @@ populate_sdk_deb_log_check() {
do_exit=1
fi
done
- test "$do_exit" = 1 && exit 1
+ test "$do_exit" = 1 && exit 1
true
}
diff --git a/meta/classes/populate_sdk_ipk.bbclass b/meta/classes/populate_sdk_ipk.bbclass
index 45b59f0..57502ec 100644
--- a/meta/classes/populate_sdk_ipk.bbclass
+++ b/meta/classes/populate_sdk_ipk.bbclass
@@ -33,7 +33,7 @@ fakeroot populate_sdk_ipk() {
install -d ${SDK_OUTPUT}/${SDKPATHNATIVE}/${sysconfdir}
install -m 0644 ${IPKGCONF_SDK} ${SDK_OUTPUT}/${SDKPATHNATIVE}/${sysconfdir}/
- populate_sdk_log_check
+ populate_sdk_log_check
}
populate_sdk_ipk_log_check() {
@@ -42,14 +42,14 @@ populate_sdk_ipk_log_check() {
lf_txt="`cat $lf_path`"
for keyword_die in "exit 1" "Collected errors" ERR Fail
- do
+ 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
+ do_exit=1
fi
done
test "$do_exit" = 1 && exit 1
--
1.7.0.4
More information about the poky
mailing list