[oe-commits] org.oe.dev merge of '518cab8ae2535562912ff7f5fdba8458448a0e18'
oe commit
oe at amethyst.openembedded.net
Sun May 18 20:10:36 UTC 2008
merge of '518cab8ae2535562912ff7f5fdba8458448a0e18'
and 'c0506e8e648ca1fe78fd69e6ce1b63a3bd38d877'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 877e06661e8de46879b47ec9f82a7dc9b5ca75cd
ViewMTN: http://monotone.openembedded.org/revision/info/877e06661e8de46879b47ec9f82a7dc9b5ca75cd
Files:
1
classes/oestats-client.bbclass
packages/keyring/keyring-0.6.8
packages/keyring/keyring-0.6.8/keyring-0.6.8-datatype.patch
packages/dropbear/dropbear-early_1.0.bb
packages/dropbear/dropbear_0.49.bb
packages/dropbear/dropbear_0.50.bb
packages/keyring/keyring_0.6.8.bb
Diffs:
#
# mt diff -r518cab8ae2535562912ff7f5fdba8458448a0e18 -r877e06661e8de46879b47ec9f82a7dc9b5ca75cd
#
#
#
# patch "classes/oestats-client.bbclass"
# from [c171db6462110869cb93b9aeaddec289573fca56]
# to [2b82de605ebfcc914f36652cbb9c49dce3cd2442]
#
============================================================
--- classes/oestats-client.bbclass c171db6462110869cb93b9aeaddec289573fca56
+++ classes/oestats-client.bbclass 2b82de605ebfcc914f36652cbb9c49dce3cd2442
@@ -6,7 +6,7 @@
#
# INHERIT += "oestats-client"
# OESTATS_SERVER = "some.server.org:8000"
-# OESTATS_BUILDER = "some title"
+# OESTATS_BUILDER = "some_nickname"
def oestats_setid(d, val):
import bb
@@ -18,7 +18,7 @@ def oestats_getid(d):
f = file(bb.data.getVar('TMPDIR', d, True) + '/oestats.id', 'r')
return f.read()
-def oestats_send(server, action, vars = {}):
+def oestats_send(server, action, vars = {}, files = {}):
import httplib
# build body
@@ -30,6 +30,14 @@ def oestats_send(server, action, vars =
output.append('Content-Disposition: form-data; name="%s"' % key)
output.append('')
output.append(vars[key])
+ for key in files:
+ assert files[key]
+ output.append('--' + bound)
+ output.append('Content-Disposition: form-data; name="%s"; filename="%s"' % (key, files[key]['filename']))
+ output.append('Content-Type: %s' % files[key]['content-type'])
+
+ output.append('')
+ output.append(files[key]['content'])
output.append('--' + bound + '--')
output.append('')
body = "\r\n".join(output)
@@ -90,6 +98,7 @@ def oestats_task(server, d, task, status
def oestats_task(server, d, task, status):
import bb
+ import glob
import time
# retrieve build id
@@ -101,7 +110,19 @@ def oestats_task(server, d, task, status
elapsed = time.time() - float(bb.data.getVar('OESTATS_STAMP', d, True))
except:
elapsed = 0
-
+
+ # send the log for failures
+ files = {}
+ if status == 'Failed':
+ 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(),
+ 'content-type': 'text/plain'}
+
# send report
try:
response = oestats_send(server, "/builds/task/%s/" % id, {
@@ -111,7 +132,7 @@ def oestats_task(server, d, task, status
'task': task,
'status': status,
'time': str(elapsed),
- })
+ }, files)
except:
bb.note("oestats: error sending task, disabling stats")
oestats_setid(d, "")
#
# mt diff -rc0506e8e648ca1fe78fd69e6ce1b63a3bd38d877 -r877e06661e8de46879b47ec9f82a7dc9b5ca75cd
#
#
#
# add_dir "packages/keyring/keyring-0.6.8"
#
# add_file "packages/keyring/keyring-0.6.8/keyring-0.6.8-datatype.patch"
# content [20aad83748060bdeaff7f817d93e61f7f3d10d42]
#
# patch "packages/dropbear/dropbear-early_1.0.bb"
# from [5b7702b9d74427e400988330fbd7c6fcff176371]
# to [f1e7db2a9ec4fc0155567720a008f3158be5d187]
#
# patch "packages/dropbear/dropbear_0.49.bb"
# from [251634540a152574b870f74866d793a0dedefae3]
# to [78fcce6b1a8d01f370d8c3b57fe9feea4faa3d77]
#
# patch "packages/dropbear/dropbear_0.50.bb"
# from [1f1e5b54696006b7f8484bd48dff9fa684992830]
# to [61b1e18c0d8254b164c4d1ed3bf6b6b20d9fc200]
#
# patch "packages/keyring/keyring_0.6.8.bb"
# from [2cfb564b37ee4f9a7f8fc38d6a1ef53cf057ac03]
# to [e0d93d0a4a92bc44db6eeeafa9ecbcf49ef6babe]
#
============================================================
--- packages/keyring/keyring-0.6.8/keyring-0.6.8-datatype.patch 20aad83748060bdeaff7f817d93e61f7f3d10d42
+++ packages/keyring/keyring-0.6.8/keyring-0.6.8-datatype.patch 20aad83748060bdeaff7f817d93e61f7f3d10d42
@@ -0,0 +1,93 @@
+diff -Naru Keyring.orig/accountlist.cpp Keyring/accountlist.cpp
+--- Keyring.orig/accountlist.cpp 2002-09-29 17:24:09.000000000 +0200
++++ Keyring/accountlist.cpp 2007-06-05 15:46:59.000000000 +0200
+@@ -314,7 +314,7 @@
+ */
+ void AccountList::resetTimer(){
+ mSeconds=mTimerStart;
+- mStartTime = time(NULL);
++ mStartTime = (time_t*)time(NULL);
+ wLCD->display(mSeconds);
+ }
+
+@@ -390,20 +390,20 @@
+ //if so and it has expired, lock keyring.
+ if(mTimerViewingAC && mTimerEnabled){
+ //Timer has expired
+- if((time(NULL)-mStartTime) > mTimerStart){
++ if((time(NULL)-(time_t)mStartTime) > mTimerStart){
+ lock();
+ } else {
+ //Timer needs to be updated
+ time_t diff=time(NULL)-viewtime;
+ mSeconds=mSeconds-diff;
+- mStartTime = time(NULL)-(mTimerStart-mSeconds);
++ mStartTime = (time_t*)time(NULL)-(mTimerStart-mSeconds);
+ mUpdateTimer->start(500,false);
+ wLCD->display(mSeconds);
+ }
+ } else {
+ if(mTimerEnabled){
+ mUpdateTimer->start(500,false);
+- mStartTime = time(NULL)-(mTimerStart-mSeconds);
++ mStartTime = (time_t*)time(NULL)-(mTimerStart-mSeconds);
+ }
+ }
+
+@@ -432,7 +432,7 @@
+ if(mTimerEnabled)
+ mUpdateTimer->start(500,false);
+ mSeconds=mTimerStart;
+- mStartTime = time(NULL);
++ mStartTime = (time_t*)time(NULL);
+ updateCountDown();
+
+ //Let's be a bastard and bitch if the
+@@ -463,11 +463,11 @@
+ void AccountList::updateCountDown(){
+ wLCD->display(mSeconds);
+ if(mSeconds==0 ||
+- (((time(NULL)-mStartTime) > mTimerStart) && mTimerPowerOff)){
++ (((time(NULL)-(time_t)mStartTime) > mTimerStart) && mTimerPowerOff)){
+ lock();
+ return;
+ }
+- mSeconds=mTimerStart-(time(NULL)-mStartTime);
++ mSeconds=mTimerStart-(time(NULL)-(time_t)mStartTime);
+ }
+
+ void AccountList::selectionChanged(QListViewItem *item){
+@@ -548,20 +548,20 @@
+ //if so and it has expired, lock keyring.
+ if(mTimerViewingAC && mTimerEnabled){
+ //Timer has expired
+- if((time(NULL)-mStartTime) > mTimerStart){
++ if((time(NULL)-(time_t)mStartTime) > mTimerStart){
+ lock();
+ } else {
+ //Timer needs to be updated
+- time_t diff=time(NULL)-viewtime;
++ time_t diff = time(NULL)-(time_t)viewtime;
+ mSeconds=mSeconds-diff;
+- mStartTime = time(NULL)-(mTimerStart-mSeconds);
++ mStartTime = (time_t*)time(NULL)-(mTimerStart-mSeconds);
+ mUpdateTimer->start(500,false);
+ wLCD->display(mSeconds);
+ }
+ } else {
+ if(mTimerEnabled){
+ mUpdateTimer->start(500,false);
+- mStartTime = time(NULL)-(mTimerStart-mSeconds);
++ mStartTime = (time_t*)time(NULL)-(mTimerStart-mSeconds);
+ }
+ }
+ delete qd;
+@@ -627,7 +627,7 @@
+
+ if(mTimerEnabled){
+ mUpdateTimer->start(500,false);
+- mStartTime = time(NULL)-(mTimerStart-mSeconds);
++ mStartTime = (time_t*)time(NULL)-(mTimerStart-mSeconds);
+ }
+
+ showAccountList();
============================================================
--- packages/dropbear/dropbear-early_1.0.bb 5b7702b9d74427e400988330fbd7c6fcff176371
+++ packages/dropbear/dropbear-early_1.0.bb f1e7db2a9ec4fc0155567720a008f3158be5d187
@@ -1,7 +1,7 @@ SECTION = "devel"
DESCRIPTION = "Allow to start dropbear soon after boot, depending on kernel command line option."
SECTION = "devel"
-PR = "r2"
RDEPENDS = "dropbear"
+PR = "r3"
SRC_URI = "file://dropbear-early"
============================================================
--- packages/dropbear/dropbear_0.49.bb 251634540a152574b870f74866d793a0dedefae3
+++ packages/dropbear/dropbear_0.49.bb 78fcce6b1a8d01f370d8c3b57fe9feea4faa3d77
@@ -1,5 +1,5 @@
+require dropbear.inc
+
PR = "r2"
+SRC_URI += "file://scp-argument-fix.patch;patch=1"
-require dropbear.inc
-SRC_URI += "file://scp-argument-fix.patch;patch=1 \
- "
============================================================
--- packages/dropbear/dropbear_0.50.bb 1f1e5b54696006b7f8484bd48dff9fa684992830
+++ packages/dropbear/dropbear_0.50.bb 61b1e18c0d8254b164c4d1ed3bf6b6b20d9fc200
@@ -1,6 +1,6 @@
-PR = "r0"
+require dropbear.inc
-require dropbear.inc
+PR = "r1"
# testing
DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/keyring/keyring_0.6.8.bb 2cfb564b37ee4f9a7f8fc38d6a1ef53cf057ac03
+++ packages/keyring/keyring_0.6.8.bb e0d93d0a4a92bc44db6eeeafa9ecbcf49ef6babe
@@ -5,7 +5,8 @@ PR = "r2"
DEPENDS = "gdbm"
PR = "r2"
-SRC_URI = "http://www.scrypt.net/~celer/kweb/Keyring-0.6.8.tgz"
+SRC_URI = "http://www.scrypt.net/~celer/kweb/Keyring-0.6.8.tgz \
+ file://keyring-0.6.8-datatype.patch;patch=1"
S = "${WORKDIR}/Keyring"
inherit palmtop
More information about the Openembedded-commits
mailing list