diff options
Diffstat (limited to 'meta/classes/image-swab.bbclass')
-rw-r--r-- | meta/classes/image-swab.bbclass | 38 |
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 | ||
63 | STRACEPID = "${@os.getpid()}" | 63 | STRACEPID = "${@os.getpid()}" |
@@ -76,23 +76,23 @@ imageswab_attachstrace () { | |||
76 | 76 | ||
77 | do_generate_swabber_report () { | 77 | do_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 | } |
97 | addtask generate_swabber_report after do_${SWAB_ORIG_TASK} | 97 | addtask generate_swabber_report after do_${SWAB_ORIG_TASK} |
98 | do_generate_swabber_report[depends] = "swabber-native:do_populate_sysroot" | 98 | do_generate_swabber_report[depends] = "swabber-native:do_populate_sysroot" |