diff options
| author | Philip Balister <philip@balister.org> | 2008-08-08 22:01:58 +0000 |
|---|---|---|
| committer | Philip Balister <philip@balister.org> | 2008-08-08 22:01:58 +0000 |
| commit | e9938336c173acad89726fa60605abba7c23d57f (patch) | |
| tree | 2f9ec804e06669659653a1c8049639f4b6c31b7e /classes | |
| parent | 1f651e7bfd7409c8db96d530b74b31af2a79cf15 (diff) | |
| parent | da481e02805d3a9ec6e4cd70b6cbeb76d0af6fdb (diff) | |
merge of '05dd48c35e7fc8bd8ec725a975682953f4e2eb8b'
and 'e5d51ef06db323f64e81b4277041a3eb479eda1b'
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/autotools.bbclass | 6 | ||||
| -rw-r--r-- | classes/cpan.bbclass | 1 | ||||
| -rw-r--r-- | classes/gnome.bbclass | 2 | ||||
| -rw-r--r-- | classes/oestats-client.bbclass | 5 |
4 files changed, 11 insertions, 3 deletions
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index 7137876a93..b4e78f8118 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -215,8 +215,10 @@ autotools_stage_all() { # b) packaged staging will fix that anyways. :M: if [ "${AUTOTOOLS_STAGE_PKGCONFIG}" = "1" ] then - echo "cp -f ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/" - cp -f ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/ + if [ -e ${STAGE_TEMP}/${libdir}/pkgconfig/ ] ; then + echo "cp -f ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/" + cp -f ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/ + fi fi rm -rf ${STAGE_TEMP}/${mandir} || true rm -rf ${STAGE_TEMP}/${infodir} || true diff --git a/classes/cpan.bbclass b/classes/cpan.bbclass index ca5303d97f..005e7cc0e9 100644 --- a/classes/cpan.bbclass +++ b/classes/cpan.bbclass @@ -10,6 +10,7 @@ export PERLCONFIGTARGET = "${@is_target(d)}" # Env var which tells perl where the perl include files are export PERL_INC = "${STAGING_LIBDIR}/perl/${@get_perl_version(d)}/CORE" +export PERL_ARCHLIB = "${STAGING_LIBDIR_NATIVE}/perl/${@get_perl_version(d)}" cpan_do_configure () { yes '' | perl Makefile.PL ${EXTRA_CPANFLAGS} diff --git a/classes/gnome.bbclass b/classes/gnome.bbclass index b29d86cefd..133859d5a0 100644 --- a/classes/gnome.bbclass +++ b/classes/gnome.bbclass @@ -13,6 +13,8 @@ FILES_${PN} += "${datadir}/application-registry ${datadir}/mime-info \ inherit autotools pkgconfig gconf +AUTOTOOLS_STAGE_PKGCONFIG = "1" + gnome_stage_includes() { autotools_stage_includes } diff --git a/classes/oestats-client.bbclass b/classes/oestats-client.bbclass index 968aa42c3b..94fdbf41c4 100644 --- a/classes/oestats-client.bbclass +++ b/classes/oestats-client.bbclass @@ -100,6 +100,8 @@ def oestats_stop(server, d, failures): response = oestats_send(server, "/builds/%s/" % id, { 'status': status, }) + if status == 'Failed': + bb.note("oestats: build failed, see http://%s%s" % (server,response)) except: bb.note("oestats: error stopping build") @@ -124,7 +126,6 @@ def oestats_task(server, d, task, status): logs = glob.glob("%s/log.%s.*" % (bb.data.getVar('T', d, True), task)) if len(logs) > 0: log = logs[0] - bb.note("oestats: sending log file : %s" % log) files['log'] = { 'filename': 'log.txt', 'content': file(log).read(), @@ -149,6 +150,8 @@ def oestats_task(server, d, task, status): # send report try: response = oestats_send(server, "/tasks/", vars, files) + if status == 'Failed': + bb.note("oestats: task failed, see http://%s%s" % (server, response)) except: bb.note("oestats: error sending task, disabling stats") oestats_setid(d, "") |