summaryrefslogtreecommitdiffstats
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 12:15:30 +0100
commit48619958d53cbec888a0a6806c5e494291e9e227 (patch)
tree0618ff69a32566be156b0f7e5d7a06cce350e033 /meta/classes/image-swab.bbclass
parent7c40daab587306da25c8d8f566392ee1f57bbef4 (diff)
downloadpoky-48619958d53cbec888a0a6806c5e494291e9e227.tar.gz
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. (From OE-Core rev: 8385d6d74624000d68814f4e3266d47bc8885942) 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() {
51 # and cross packages which aren't swabber-native or one of its dependencies 51 # and cross packages which aren't swabber-native or one of its dependencies
52 # I have ignored them for now... 52 # I have ignored them for now...
53 if not bb.data.inherits_class('native', d) and not bb.data.inherits_class('nativesdk', d) and not bb.data.inherits_class('cross', d): 53 if not bb.data.inherits_class('native', d) and not bb.data.inherits_class('nativesdk', d) and not bb.data.inherits_class('cross', d):
54 deps = (d.getVarFlag('do_setscene', 'depends') or "").split() 54 deps = (d.getVarFlag('do_setscene', 'depends') or "").split()
55 deps.append('strace-native:do_populate_sysroot') 55 deps.append('strace-native:do_populate_sysroot')
56 d.setVarFlag('do_setscene', 'depends', " ".join(deps)) 56 d.setVarFlag('do_setscene', 'depends', " ".join(deps))
57 logdir = d.expand("${TRACE_LOGDIR}") 57 logdir = d.expand("${TRACE_LOGDIR}")
58 bb.utils.mkdirhier(logdir) 58 bb.utils.mkdirhier(logdir)
59 else: 59 else:
60 d.setVar('STRACEFUNC', '') 60 d.setVar('STRACEFUNC', '')
61} 61}
62 62
63STRACEPID = "${@os.getpid()}" 63STRACEPID = "${@os.getpid()}"
@@ -76,23 +76,23 @@ imageswab_attachstrace () {
76 76
77do_generate_swabber_report () { 77do_generate_swabber_report () {
78 78
79 update_distro ${HOST_DATA} 79 update_distro ${HOST_DATA}
80 80
81 # Swabber can't create the directory for us 81 # Swabber can't create the directory for us
82 mkdir -p ${SWABBER_REPORT} 82 mkdir -p ${SWABBER_REPORT}
83 83
84 REPORTSTAMP=${SWAB_ORIG_TASK}-`date +%2m%2d%2H%2M%Y` 84 REPORTSTAMP=${SWAB_ORIG_TASK}-`date +%2m%2d%2H%2M%Y`
85 85
86 if [ `which ccache` ] ; then 86 if [ `which ccache` ] ; then
87 CCACHE_DIR=`( ccache -s | grep "cache directory" | grep -o '[^ ]*$' 2> /dev/null )` 87 CCACHE_DIR=`( ccache -s | grep "cache directory" | grep -o '[^ ]*$' 2> /dev/null )`
88 fi 88 fi
89 89
90 if [ "$(ls -A ${HOST_DATA})" ]; then 90 if [ "$(ls -A ${HOST_DATA})" ]; then
91 echo "Generating swabber report" 91 echo "Generating swabber report"
92 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} 92 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}
93 else 93 else
94 echo "No host data, cannot generate swabber report." 94 echo "No host data, cannot generate swabber report."
95 fi 95 fi
96} 96}
97addtask generate_swabber_report after do_${SWAB_ORIG_TASK} 97addtask generate_swabber_report after do_${SWAB_ORIG_TASK}
98do_generate_swabber_report[depends] = "swabber-native:do_populate_sysroot" 98do_generate_swabber_report[depends] = "swabber-native:do_populate_sysroot"