summaryrefslogtreecommitdiff
path: root/meta/classes/image-swab.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-20 16:52:21 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-21 11:37:01 +0100
commit8385d6d74624000d68814f4e3266d47bc8885942 (patch)
treeb5936e4a38273c8b2f830c9b7ddfdde729b3d9c2 /meta/classes/image-swab.bbclass
parent04568d1f18250d531aad5d286157d2d559083520 (diff)
downloadopenembedded-core-8385d6d74624000d68814f4e3266d47bc8885942.tar.gz
openembedded-core-8385d6d74624000d68814f4e3266d47bc8885942.tar.bz2
openembedded-core-8385d6d74624000d68814f4e3266d47bc8885942.zip
meta/classes: Various python whitespace fixes
It was pointed out we have a number of weird indentations in the python functions. This patch cleans up 3, 7 and other weird indentations for the core bbclass files. It also fixes some wierd (odd) shell function indentation which my searches picked up. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/image-swab.bbclass')
-rw-r--r--meta/classes/image-swab.bbclass38
1 files changed, 19 insertions, 19 deletions
diff --git a/meta/classes/image-swab.bbclass b/meta/classes/image-swab.bbclass
index 0414653f72..37d75355bf 100644
--- a/meta/classes/image-swab.bbclass
+++ b/meta/classes/image-swab.bbclass
@@ -51,13 +51,13 @@ python() {
# and cross packages which aren't swabber-native or one of its dependencies
# I have ignored them for now...
if not bb.data.inherits_class('native', d) and not bb.data.inherits_class('nativesdk', d) and not bb.data.inherits_class('cross', d):
- deps = (d.getVarFlag('do_setscene', 'depends') or "").split()
- deps.append('strace-native:do_populate_sysroot')
- d.setVarFlag('do_setscene', 'depends', " ".join(deps))
- logdir = d.expand("${TRACE_LOGDIR}")
- bb.utils.mkdirhier(logdir)
+ deps = (d.getVarFlag('do_setscene', 'depends') or "").split()
+ deps.append('strace-native:do_populate_sysroot')
+ d.setVarFlag('do_setscene', 'depends', " ".join(deps))
+ logdir = d.expand("${TRACE_LOGDIR}")
+ bb.utils.mkdirhier(logdir)
else:
- d.setVar('STRACEFUNC', '')
+ d.setVar('STRACEFUNC', '')
}
STRACEPID = "${@os.getpid()}"
@@ -76,23 +76,23 @@ imageswab_attachstrace () {
do_generate_swabber_report () {
- update_distro ${HOST_DATA}
+ update_distro ${HOST_DATA}
- # Swabber can't create the directory for us
- mkdir -p ${SWABBER_REPORT}
+ # Swabber can't create the directory for us
+ mkdir -p ${SWABBER_REPORT}
- REPORTSTAMP=${SWAB_ORIG_TASK}-`date +%2m%2d%2H%2M%Y`
+ REPORTSTAMP=${SWAB_ORIG_TASK}-`date +%2m%2d%2H%2M%Y`
- if [ `which ccache` ] ; then
- CCACHE_DIR=`( ccache -s | grep "cache directory" | grep -o '[^ ]*$' 2> /dev/null )`
- fi
+ if [ `which ccache` ] ; then
+ CCACHE_DIR=`( ccache -s | grep "cache directory" | grep -o '[^ ]*$' 2> /dev/null )`
+ fi
- if [ "$(ls -A ${HOST_DATA})" ]; then
- echo "Generating swabber report"
- swabber -d ${HOST_DATA} -l ${SWABBER_LOGS} -o ${SWABBER_REPORT}/report-${REPORTSTAMP}.txt -r ${SWABBER_REPORT}/extra_report-${REPORTSTAMP}.txt -c all -p ${TOPDIR} -f ${OEROOT}/meta/conf/swabber ${TOPDIR} ${OEROOT} ${CCACHE_DIR}
- else
- echo "No host data, cannot generate swabber report."
- fi
+ if [ "$(ls -A ${HOST_DATA})" ]; then
+ echo "Generating swabber report"
+ swabber -d ${HOST_DATA} -l ${SWABBER_LOGS} -o ${SWABBER_REPORT}/report-${REPORTSTAMP}.txt -r ${SWABBER_REPORT}/extra_report-${REPORTSTAMP}.txt -c all -p ${TOPDIR} -f ${OEROOT}/meta/conf/swabber ${TOPDIR} ${OEROOT} ${CCACHE_DIR}
+ else
+ echo "No host data, cannot generate swabber report."
+ fi
}
addtask generate_swabber_report after do_${SWAB_ORIG_TASK}
do_generate_swabber_report[depends] = "swabber-native:do_populate_sysroot"