aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGraeme Gregory <dp@xora.org.uk>2009-05-23 21:48:59 +0100
committerGraeme Gregory <dp@xora.org.uk>2009-05-23 21:48:59 +0100
commit22069bb987b0076b6cae30d8f93153ef91a91657 (patch)
treeb402cfdcd2e2119b496887bbf9dccb9a36da10d4
parentb1b585492dac308d35bc3b6fb76d91a1a51d6561 (diff)
parent17ed48f1a44001d05614a03c0fc469346516f5a1 (diff)
downloadopenembedded-22069bb987b0076b6cae30d8f93153ef91a91657.tar.gz
openembedded-22069bb987b0076b6cae30d8f93153ef91a91657.tar.bz2
openembedded-22069bb987b0076b6cae30d8f93153ef91a91657.zip
Merge branch 'org.openembedded.dev' of git+ssh://git@git.openembedded.org/openembedded into org.openembedded.dev
-rw-r--r--classes/oestats-client.bbclass20
-rw-r--r--conf/machine/at91sam9g20ek.conf3
-rw-r--r--conf/machine/tqm8540.conf25
3 files changed, 41 insertions, 7 deletions
diff --git a/classes/oestats-client.bbclass b/classes/oestats-client.bbclass
index 6d348d3ded..8922496242 100644
--- a/classes/oestats-client.bbclass
+++ b/classes/oestats-client.bbclass
@@ -18,8 +18,9 @@ def oestats_getid(d):
f = file(bb.data.getVar('TMPDIR', d, True) + '/oestats.id', 'r')
return f.read()
-def oestats_send(server, action, vars = {}, files = {}):
+def oestats_send(d, server, action, vars = {}, files = {}):
import httplib
+ import bb
# build body
output = []
@@ -49,7 +50,16 @@ def oestats_send(server, action, vars = {}, files = {}):
"Content-length": str(len(body))}
# send request
- conn = httplib.HTTPConnection(server)
+ proxy = bb.data.getVar('HTTP_PROXY', d, True )
+ if (proxy):
+ if (proxy.endswith('/')):
+ proxy = proxy[:-1]
+ if (proxy.startswith('http://')):
+ proxy = proxy[7:]
+ conn = httplib.HTTPConnection(proxy)
+ action = "http://%s%s" %(server, action)
+ else:
+ conn = httplib.HTTPConnection(server)
conn.request("POST", action, body, headers)
response = conn.getresponse()
data = response.read()
@@ -64,7 +74,7 @@ def oestats_start(server, builder, d):
# send report
id = ""
try:
- data = oestats_send(server, "/builds/", {
+ data = oestats_send(d, server, "/builds/", {
'builder': builder,
'build_arch': bb.data.getVar('BUILD_ARCH', d, True),
'metadata_branch': bb.data.getVar('METADATA_BRANCH', d, True),
@@ -97,7 +107,7 @@ def oestats_stop(server, d, failures):
status = "Succeeded"
try:
- response = oestats_send(server, "/builds/%s/" % id, {
+ response = oestats_send(d, server, "/builds/%s/" % id, {
'status': status,
})
if status == 'Failed':
@@ -157,7 +167,7 @@ def oestats_task(server, d, task, status):
# send report
try:
- response = oestats_send(server, "/tasks/", vars, files)
+ response = oestats_send(d, server, "/tasks/", vars, files)
if status == 'Failed':
bb.note("oestats: task failed, see http://%s%s" % (server, response))
except:
diff --git a/conf/machine/at91sam9g20ek.conf b/conf/machine/at91sam9g20ek.conf
index 903e953b13..38078b6d03 100644
--- a/conf/machine/at91sam9g20ek.conf
+++ b/conf/machine/at91sam9g20ek.conf
@@ -18,8 +18,7 @@ PREFERRED_VERSION_at91bootstrap = "2.10"
USE_VT = "0"
MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget"
-#EXTRA_IMAGEDEPENDS += "u-boot"
-#EXTRA_IMAGEDEPENDS += "at91bootstrap"
+EXTRA_IMAGEDEPENDS += "at91bootstrap u-boot"
# used by sysvinit_2
SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/conf/machine/tqm8540.conf b/conf/machine/tqm8540.conf
new file mode 100644
index 0000000000..7595f8a5dc
--- /dev/null
+++ b/conf/machine/tqm8540.conf
@@ -0,0 +1,25 @@
+#@TYPE: Machine
+#@Name: TQM85xx
+#@DESCRIPTION: Machine configuration for the Ixxi TQ-Minimodule with MPC8540
+
+TARGET_ARCH = "powerpc"
+
+PREFERRED_PROVIDER_virtual/kernel ?= "linux"
+
+MACHINE_FEATURES = "kernel26 usbhost pci ext2 uboot jffs2"
+
+KERNEL_IMAGETYPE = "uImage"
+
+PREFERRED_VERSION_u-boot = "1.3.2"
+UBOOT_MACHINE = "TQM8540_config"
+
+EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000"
+
+#don't try to access tty1
+USE_VT = "0"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+#tune for the e500 core
+require conf/machine/include/tune-ppce500.inc
+