diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-09-24 19:39:46 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-09-24 19:39:46 +0000 |
| commit | ffdc33ee9f98213b0206cbbd8496ec3b48ae1c8f (patch) | |
| tree | b83355fd177bb16b3309ba991b02d2815c42d7c1 /classes | |
| parent | 4f7b18b2325b460f224f13ad1f562ee4489e9e56 (diff) | |
| parent | 1afd7b0bd9371f8bb52f7f63edcbca4e4e2af998 (diff) | |
merge of '2e75cbd37f40c36e60bc1e60a02e967304b6b338'
and '887e1a4016c96ca69eca2047591511a955459515'
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/oestats-client.bbclass | 8 | ||||
| -rw-r--r-- | classes/pkgconfig.bbclass | 7 |
2 files changed, 15 insertions, 0 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..2a8199d135 100644 --- a/classes/pkgconfig.bbclass +++ b/classes/pkgconfig.bbclass @@ -2,6 +2,13 @@ inherit base DEPENDS_prepend = "pkgconfig-native " +do_install_prepend () { + +for i in `find ${S}/ -name "*.pc" -type f` ; 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 |