summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--classes/seppuku.bbclass6
-rw-r--r--classes/tinderclient.bbclass24
-rw-r--r--conf/machine/at91cap9adk.conf1
-rw-r--r--conf/machine/at91sam9260ek.conf3
-rw-r--r--conf/machine/at91sam9261ek.conf3
-rw-r--r--conf/machine/at91sam9263ek.conf1
-rw-r--r--conf/machine/at91sam9g20ek.conf1
-rw-r--r--conf/machine/at91sam9rlek.conf3
-rw-r--r--recipes/lowpan-tools/lowpan-tools_git.bb20
-rw-r--r--recipes/lowpan-utils/lowpan-utils_git.bb21
10 files changed, 46 insertions, 37 deletions
diff --git a/classes/seppuku.bbclass b/classes/seppuku.bbclass
index ab8096eb45..546738dde8 100644
--- a/classes/seppuku.bbclass
+++ b/classes/seppuku.bbclass
@@ -319,6 +319,12 @@ python seppuku_eventhandler() {
passw = bb.data.getVar("SEPPUKU_PASS", data, True)
product = bb.data.getVar("SEPPUKU_PRODUCT", data, True)
component = bb.data.getVar("SEPPUKU_COMPONENT", data, True)
+ proxy = bb.data.getVar('HTTP_PROXY', data, True )
+ if (proxy):
+ phl = urllib2.ProxyHandler({'http' : proxy})
+ poster.add_handler(phl)
+ opener.add_handler(phl)
+
# evil hack to figure out what is going on
debug_file = open(os.path.join(bb.data.getVar("TMPDIR", data, True),"..","seppuku-log"),"a")
diff --git a/classes/tinderclient.bbclass b/classes/tinderclient.bbclass
index 0b7fc1d843..d2b2b33898 100644
--- a/classes/tinderclient.bbclass
+++ b/classes/tinderclient.bbclass
@@ -1,10 +1,20 @@
-def tinder_http_post(server, selector, content_type, body):
+def tinder_http_post(d, server, selector, content_type, body):
import httplib
+ from bb import data
# now post it
for i in range(0,5):
try:
- h = httplib.HTTP(server)
- h.putrequest('POST', selector)
+ proxy = data.getVar('HTTP_PROXY', d, True )
+ if (proxy):
+ if (proxy.endswith('/')):
+ proxy = proxy[:-1]
+ if (proxy.startswith('http://')):
+ proxy = proxy[7:]
+ h = httplib.HTTP(proxy)
+ h.putrequest('POST', 'http://%s%s' % (server, selector))
+ else:
+ h = httplib.HTTP(server)
+ h.putrequest('POST', selector)
h.putheader('content-type', content_type)
h.putheader('content-length', str(len(body)))
h.endheaders()
@@ -12,8 +22,8 @@ def tinder_http_post(server, selector, content_type, body):
errcode, errmsg, headers = h.getreply()
#print errcode, errmsg, headers
return (errcode,errmsg, headers, h.file)
- except:
- print "Error sending the report!"
+ except Exception, e:
+ print "Error sending the report! ", e
# try again
pass
@@ -116,7 +126,7 @@ def tinder_build_start(d):
#print "selector %s and url %s" % (selector, url)
# now post it
- errcode, errmsg, headers, h_file = tinder_http_post(server,selector,content_type, body)
+ errcode, errmsg, headers, h_file = tinder_http_post(d,server,selector,content_type, body)
#print errcode, errmsg, headers
report = h_file.read()
@@ -151,7 +161,7 @@ def tinder_send_http(d, status, _log):
new_log = _log
while len(new_log) > 0:
content_type, body = tinder_format_http_post(d,status,new_log[0:18000])
- errcode, errmsg, headers, h_file = tinder_http_post(server,selector,content_type, body)
+ errcode, errmsg, headers, h_file = tinder_http_post(d,server,selector,content_type, body)
#print errcode, errmsg, headers
#print h.file.read()
new_log = new_log[18000:]
diff --git a/conf/machine/at91cap9adk.conf b/conf/machine/at91cap9adk.conf
index 50549dabf6..87311e9be4 100644
--- a/conf/machine/at91cap9adk.conf
+++ b/conf/machine/at91cap9adk.conf
@@ -9,7 +9,6 @@ PREFERRED_VERSION_linux = "2.6.28"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
KERNEL_IMAGETYPE = "uImage"
-PREFERRED_VERSION_u-boot = "2009.01"
UBOOT_MACHINE = "at91cap9adk_config"
PREFERRED_VERSION_at91bootstrap = "2.10"
diff --git a/conf/machine/at91sam9260ek.conf b/conf/machine/at91sam9260ek.conf
index 3882c118fb..9a7ca9af62 100644
--- a/conf/machine/at91sam9260ek.conf
+++ b/conf/machine/at91sam9260ek.conf
@@ -10,8 +10,7 @@ PREFERRED_VERSION_linux = "2.6.28"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
KERNEL_IMAGETYPE = "uImage"
-PREFERRED_VERSION_u-boot = "2009.01"
-UBOOT_MACHINE = "at92sam9260ek_config"
+UBOOT_MACHINE = "at91sam9260ek_config"
PREFERRED_VERSION_at91bootstrap = "2.10"
diff --git a/conf/machine/at91sam9261ek.conf b/conf/machine/at91sam9261ek.conf
index a3a9be6dc1..79f275f483 100644
--- a/conf/machine/at91sam9261ek.conf
+++ b/conf/machine/at91sam9261ek.conf
@@ -10,8 +10,7 @@ PREFERRED_VERSION_linux = "2.6.28"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
KERNEL_IMAGETYPE = "uImage"
-PREFERRED_VERSION_u-boot = "2009.01"
-UBOOT_MACHINE = "at92sam9261ek_config"
+UBOOT_MACHINE = "at91sam9261ek_config"
PREFERRED_VERSION_at91bootstrap = "2.10"
diff --git a/conf/machine/at91sam9263ek.conf b/conf/machine/at91sam9263ek.conf
index e633148172..f052170aed 100644
--- a/conf/machine/at91sam9263ek.conf
+++ b/conf/machine/at91sam9263ek.conf
@@ -10,7 +10,6 @@ PREFERRED_VERSION_linux = "2.6.28"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
KERNEL_IMAGETYPE = "uImage"
-PREFERRED_VERSION_u-boot = "2009.01"
UBOOT_MACHINE = "at91sam9263ek_config"
PREFERRED_VERSION_at91bootstrap = "2.10"
diff --git a/conf/machine/at91sam9g20ek.conf b/conf/machine/at91sam9g20ek.conf
index 38078b6d03..7dc6ba0d53 100644
--- a/conf/machine/at91sam9g20ek.conf
+++ b/conf/machine/at91sam9g20ek.conf
@@ -9,7 +9,6 @@ PREFERRED_VERSION_linux = "2.6.28"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
KERNEL_IMAGETYPE = "uImage"
-PREFERRED_VERSION_u-boot = "2009.01"
UBOOT_MACHINE = "at91sam9g20ek_config"
PREFERRED_VERSION_at91bootstrap = "2.10"
diff --git a/conf/machine/at91sam9rlek.conf b/conf/machine/at91sam9rlek.conf
index ba19cb3e00..f7a78dcf75 100644
--- a/conf/machine/at91sam9rlek.conf
+++ b/conf/machine/at91sam9rlek.conf
@@ -10,8 +10,7 @@ PREFERRED_VERSION_linux = "2.6.28"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
KERNEL_IMAGETYPE = "uImage"
-PREFERRED_VERSION_u-boot = "2009.01"
-UBOOT_MACHINE = "at92sam9rlek_config"
+UBOOT_MACHINE = "at91sam9rlek_config"
PREFERRED_VERSION_at91bootstrap = "2.10"
diff --git a/recipes/lowpan-tools/lowpan-tools_git.bb b/recipes/lowpan-tools/lowpan-tools_git.bb
new file mode 100644
index 0000000000..1fde23218d
--- /dev/null
+++ b/recipes/lowpan-tools/lowpan-tools_git.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "LoWPAN utilities (IEEE802.15.4)"
+LICENSE = "GPL"
+SRCREV = "e9e80a2eefa7aadbbb15bef1519b373e2e907aa0"
+#SRC_URI = "git://github.com/lumag/lowpan-utils.git;protocol=git"
+SRC_URI = "git://linux-zigbee.git.sourceforge.net/gitroot/linux-zigbee;protocol=git"
+DEPENDS = "libnl bison-native flex-native"
+PR = "r6"
+
+S = "${WORKDIR}/git"
+PACKAGES += "${PN}-tests-dbg"
+PACKAGES += "${PN}-tests"
+FILES_${PN} = "${sbindir}/iz ${sbindir}/izconfig \
+ ${bindir}/izchat ${bindir}/izlisten ${sbindir}/izcoordinator \
+ ${sbindir}/izattach"
+FILES_${PN}-tests = "${libexecdir}/lowpan-tools ${libdir}/python*/site-packages"
+FILES_${PN}-tests-dbg = "${libexecdir}/lowpan-tools/.debug"
+
+EXTRA_OECONF = "--disable-manpages"
+
+inherit autotools_stage
diff --git a/recipes/lowpan-utils/lowpan-utils_git.bb b/recipes/lowpan-utils/lowpan-utils_git.bb
deleted file mode 100644
index 89a5e438ab..0000000000
--- a/recipes/lowpan-utils/lowpan-utils_git.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "LoWPAN utilities (IEEE802.15.4)"
-LICENSE = "GPL"
-SRCREV = "master"
-SRC_URI = "git://github.com/lumag/lowpan-utils.git;protocol=git"
-DEPENDS = "libnl bison-native flex-native"
-PR = "r4"
-
-S = "${WORKDIR}/git"
-PACKAGES += "${PN}-tests-dbg"
-PACKAGES += "${PN}-tests"
-FILES_${PN} = "${sbindir}/iz ${sbindir}/izconfig \
- ${bindir}/izchat ${bindir}/izlisten ${sbindir}/izcoordinator \
- ${sbindir}/izattach"
-FILES_${PN}-tests = "${libexecdir}/zigbee ${libdir}/python*/site-packages"
-FILES_${PN}-tests-dbg = "${libexecdir}/zigbee/.debug"
-
-inherit autotools
-
-do_stage() {
- autotools_stage_all
-}