diff options
| author | Paul Eggleton <bluelightning@bluelightning.org> | 2008-09-22 23:45:44 +0000 |
|---|---|---|
| committer | Paul Eggleton <bluelightning@bluelightning.org> | 2008-09-22 23:45:44 +0000 |
| commit | 798a9f55d1989df4039d1f25a5d0a5ed4f54ea4c (patch) | |
| tree | 899140509b81cfcfc2b13024498dc8fdeb1bc019 /classes | |
| parent | 81036f22323d2e6d13c6f1ed6a04959303b0aae5 (diff) | |
| parent | a16bdbd12e3f49da4d6f4e8da25e14dd93df7417 (diff) | |
merge of '9ed842c8829018871f79ce96e77189742d9b7c6b'
and 'ba6a6901de641366d142b6f40df71611efb5ff81'
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/oestats-client.bbclass | 8 | ||||
| -rw-r--r-- | classes/pkgconfig.bbclass | 11 |
2 files changed, 18 insertions, 1 deletions
diff --git a/classes/oestats-client.bbclass b/classes/oestats-client.bbclass index 94fdbf41c4..6d348d3ded 100644 --- a/classes/oestats-client.bbclass +++ b/classes/oestats-client.bbclass @@ -108,6 +108,7 @@ def oestats_stop(server, d, failures): def oestats_task(server, d, task, status): import bb import glob + import os.path import time # retrieve build id @@ -130,6 +131,13 @@ def oestats_task(server, d, task, status): 'filename': 'log.txt', 'content': file(log).read(), 'content-type': 'text/plain'} + if task == 'do_package': + qalog = "%s/log.qa_package" % bb.data.getVar('T', d, True) + if os.path.exists(qalog): + files['qalog'] = { + 'filename': 'qalog.txt', + 'content': file(qalog).read(), + 'content-type': 'text/plain'} # prepare report vars = { diff --git a/classes/pkgconfig.bbclass b/classes/pkgconfig.bbclass index d65f8a6253..4192a04a0e 100644 --- a/classes/pkgconfig.bbclass +++ b/classes/pkgconfig.bbclass @@ -2,9 +2,18 @@ inherit base DEPENDS_prepend = "pkgconfig-native " +FILES_${PN}-dev += "${libdir}/pkgconfig" + +do_install_append () { + +for i in `find ${D}/ -name "*.pc"` ; do \ + sed -i -e 's:-L${STAGING_LIBDIR}::g' $i + done +} + do_stage_append () { install -d ${PKG_CONFIG_DIR} - for pc in `find ${S} -name '*.pc' -type f | grep -v -- '-uninstalled.pc$'`; do + for pc in `find ${D} -name '*.pc' -type f | grep -v -- '-uninstalled.pc$'`; do pcname=`basename $pc` cat $pc > ${PKG_CONFIG_DIR}/$pcname done |