[oe-commits] org.oe.dev merge of '8c79c14e519c2da015b828d88899e0af791e9da9'

svolpe commit oe at amethyst.openembedded.net
Sun May 18 19:02:29 UTC 2008


merge of '8c79c14e519c2da015b828d88899e0af791e9da9'
     and 'ac3b0371db0864fa58d78538a2999cb2d41479ff'

Author: svolpe at openembedded.org
Branch: org.openembedded.dev
Revision: 595d3bb20485f41ca08f2f400d9c3a3c7106db90
ViewMTN: http://monotone.openembedded.org/revision/info/595d3bb20485f41ca08f2f400d9c3a3c7106db90
Files:
1
packages/php/php_5.2.5.bb
packages/gcc/gcc-csl-arm-2007q3
conf/machine/include/tune-mips2.inc
packages/dropbear/dropbear-0.49/scp-argument-fix.patch
packages/gcc/gcc-cross-initial_csl-arm-2007q3.bb
packages/gcc/gcc-cross_csl-arm-2007q3.bb
packages/gcc/gcc-csl-arm-2007q3/gcc-new-makeinfo.patch
packages/gcc/gcc-csl-arm-2007q3.inc
packages/gcc/gcc_csl-arm-2007q3.bb
packages/libopie/libopie2/remove_h2200_rotate_fix.patch
packages/qte/qte-2.3.10/disable-dup-rotation.patch
classes/oestats-client.bbclass
conf/distro/angstrom-2008.1.conf
conf/distro/include/angstrom-glibc.inc
conf/machine/include/gumstix.inc
conf/machine/include/tune-cortexa8.inc
conf/machine/rb500.conf
conf/machine/wl500g.conf
conf/machine/wrt54.conf
contrib/distro-packages/debian/openembedded-essential-1.4/debian/control
contrib/distro-packages/debian/openembedded-essential-1.4/debian/rules
packages/dropbear/dropbear_0.49.bb
packages/freesmartphone/zhone_git.bb
packages/gallery/gallery_1.5.5.bb
packages/gpe-helpviewer/gpe-helpviewer_1.0.bb
packages/python/python-setuptools-native_0.6c6.bb
packages/python/python-setuptools_0.6c6.bb
packages/tasks/task-opie-16mb.bb
packages/tasks/task-opie-all.bb
packages/tasks/task-opie.bb
Diffs:

#
# mt diff -r8c79c14e519c2da015b828d88899e0af791e9da9 -r595d3bb20485f41ca08f2f400d9c3a3c7106db90
#
#
#
# patch "packages/php/php_5.2.5.bb"
#  from [3c1f63cc7326dce0a534438bf37d88728f3048ec]
#    to [7b323ec36d0b7855942e82ce9ecbd07e2600a9df]
#
============================================================
--- packages/php/php_5.2.5.bb	3c1f63cc7326dce0a534438bf37d88728f3048ec
+++ packages/php/php_5.2.5.bb	7b323ec36d0b7855942e82ce9ecbd07e2600a9df
@@ -1,6 +1,6 @@ require php.inc
 require php.inc
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "file://pear-makefile.patch;patch=1 "
 
@@ -19,7 +19,7 @@ EXTRA_OECONF = "    --without-iconv \
                     --with-mysqli="${STAGING_BINDIR_NATIVE}/mysql_config" \
 "
 
-EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR} --with-libxml-dir=${STAGING_BINDIR}"
+EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR} --with-libxml-dir=${STAGING_BINDIR_CROSS}"
 
 export LD_LIBRARY_PATH = "${STAGING_LIBDIR}"
 export PHP_NATIVE_DIR="${STAGING_BINDIR_NATIVE}"


#
# mt diff -rac3b0371db0864fa58d78538a2999cb2d41479ff -r595d3bb20485f41ca08f2f400d9c3a3c7106db90
#
#
#
# add_dir "packages/gcc/gcc-csl-arm-2007q3"
# 
# add_file "conf/machine/include/tune-mips2.inc"
#  content [057bacb0584328df3d50b30000597eb1d919767b]
# 
# add_file "packages/dropbear/dropbear-0.49/scp-argument-fix.patch"
#  content [43e25cab4f86cb784071ef1a175b77eb2d69b7fc]
# 
# add_file "packages/gcc/gcc-cross-initial_csl-arm-2007q3.bb"
#  content [4acf01cc481b727325c6077882c195b4f1572001]
# 
# add_file "packages/gcc/gcc-cross_csl-arm-2007q3.bb"
#  content [f7fca6eee83b5ebe3eca940d8e1b1046d6de5ff0]
# 
# add_file "packages/gcc/gcc-csl-arm-2007q3/gcc-new-makeinfo.patch"
#  content [ae26bd559a50cddae7e3e2732e8821389464d64b]
# 
# add_file "packages/gcc/gcc-csl-arm-2007q3.inc"
#  content [01e125daae24e6a2f2f71eb12b6d2232b0ada01a]
# 
# add_file "packages/gcc/gcc_csl-arm-2007q3.bb"
#  content [d2ba66d1d65f6be2dc6ddf47d238afe57eb05f4f]
# 
# add_file "packages/libopie/libopie2/remove_h2200_rotate_fix.patch"
#  content [971d8c3bbb6ab648db8f29cf5425c85557416af6]
# 
# add_file "packages/qte/qte-2.3.10/disable-dup-rotation.patch"
#  content [f90a467431d9bde1ffae27ccf563cfdeed54691e]
# 
# patch "classes/oestats-client.bbclass"
#  from [a710c44a7f932fd458136ca8079856a4b2962a61]
#    to [c171db6462110869cb93b9aeaddec289573fca56]
# 
# patch "conf/distro/angstrom-2008.1.conf"
#  from [dface09802ce45bdb21c822c2e46b480f3369810]
#    to [4b22a5418909757b3c14e67557228138743a303e]
# 
# patch "conf/distro/include/angstrom-glibc.inc"
#  from [c49fa1468b1a41c309505f099d320a78a592a8b8]
#    to [64060b7ace4591e34cd8206bb5cd3ba77c6554d4]
# 
# patch "conf/machine/include/gumstix.inc"
#  from [7578e77d24254c6b31c18d29909b2cdae25e53b8]
#    to [296433a9b80e1ec2fd23dc9e4c458d24e763e9a4]
# 
# patch "conf/machine/include/tune-cortexa8.inc"
#  from [8ce9346cd012a0659a0967b2e43edcfc2dfaf921]
#    to [ffd911180ea7eb03d473826a023a54d88a219438]
# 
# patch "conf/machine/rb500.conf"
#  from [c5e4304761ab59c29e7a9549abec25df0455a552]
#    to [ec3468237873c1f6f3831eb19db443d2aba4a9e0]
# 
# patch "conf/machine/wl500g.conf"
#  from [d7067382eb29e1f5c251a2c48f5e4f7d36f6f0f9]
#    to [b7ee5dd752935d7f8924e84976cadbce6359227d]
# 
# patch "conf/machine/wrt54.conf"
#  from [5d9e6710b8fae51d475e91a5c2047e7be52b7649]
#    to [2fe22c13b02b4959e3cab0cc7ff5c98fb68bf489]
# 
# patch "contrib/distro-packages/debian/openembedded-essential-1.4/debian/control"
#  from [b527265a4a8d5e1b7c8b8ecf77d86a5bd0892b57]
#    to [0c3280f88a76ccf4454f600420c2394625422b57]
# 
# patch "contrib/distro-packages/debian/openembedded-essential-1.4/debian/rules"
#  from [fca0385b822b8dc03a597d316d04549edc9dd1be]
#    to [f2b5b27d488e832661562e98cc7249a22c9e29bb]
# 
# patch "packages/dropbear/dropbear_0.49.bb"
#  from [ca38761fd3af49819c41b42791592ee01c0d97cc]
#    to [251634540a152574b870f74866d793a0dedefae3]
# 
# patch "packages/freesmartphone/zhone_git.bb"
#  from [d0d277f5c32f22996b96396481571321668f1dc1]
#    to [1d68c71ea6216ba266c1d3f52a8a13c33d86b97d]
# 
# patch "packages/gallery/gallery_1.5.5.bb"
#  from [733e15213ab5e6ec1bd791438af67af63d5ec35c]
#    to [511bfe0c06f90814e496d4f7e1d3b7218cd60e28]
# 
# patch "packages/gpe-helpviewer/gpe-helpviewer_1.0.bb"
#  from [0b59db3ecd7e959fdd8a7c3e7f0b122f4b6f6c8b]
#    to [92868c7c6de1862496bb9aa0d29afa555520bad4]
# 
# patch "packages/python/python-setuptools-native_0.6c6.bb"
#  from [37e35eebe4105610cad978ad7a92f12a2b9095d1]
#    to [98f58e21bf03997cb61c8459da61b888c73364f9]
# 
# patch "packages/python/python-setuptools_0.6c6.bb"
#  from [074cb8e81cb89426c6d897caeb5fd18c68571c9a]
#    to [84dd67b8d39b269a732a02fdc2b2b08af8516af9]
# 
# patch "packages/tasks/task-opie-16mb.bb"
#  from [17a97e85093fb7c7aaba5ea5de08086d633dc185]
#    to [cf1f25614ad8da263d528b3f34d314213dd05281]
# 
# patch "packages/tasks/task-opie-all.bb"
#  from [247d329aa6a21cecb1f4f74f1a838072b8aa22d8]
#    to [e996923d71e129ec881e2b565c3689d4ce4c94c5]
# 
# patch "packages/tasks/task-opie.bb"
#  from [78fbe261fe8ace945600c95b91627808e02cef52]
#    to [ae01f0abcd042b147b21cd29141a481fd081fdb4]
#
============================================================
--- conf/machine/include/tune-mips2.inc	057bacb0584328df3d50b30000597eb1d919767b
+++ conf/machine/include/tune-mips2.inc	057bacb0584328df3d50b30000597eb1d919767b
@@ -0,0 +1 @@
+TARGET_CC_ARCH = "-mips2"
============================================================
--- packages/dropbear/dropbear-0.49/scp-argument-fix.patch	43e25cab4f86cb784071ef1a175b77eb2d69b7fc
+++ packages/dropbear/dropbear-0.49/scp-argument-fix.patch	43e25cab4f86cb784071ef1a175b77eb2d69b7fc
@@ -0,0 +1,21 @@
+source: https://dev.openwrt.org/browser/trunk/openwrt/package/dropbear/patches/scp-argument-fix.patch?rev=453
+comment: remove unsupported default arguments in scp.  Fixes OE bug 3227.
+
+diff -ur dropbear-0.49-orig/scp.c dropbear-0.49/scp.c
+--- dropbear-0.49-orig/scp.c	2007-02-22 16:51:35.000000000 +0100
++++ dropbear-0.49/scp.c	2007-10-19 14:19:08.000000000 +0200
+@@ -308,10 +308,10 @@
+ 	memset(&args, '\0', sizeof(args));
+ 	args.list = NULL;
+ 	addargs(&args, "%s", ssh_program);
+-	addargs(&args, "-x");
+-	addargs(&args, "-oForwardAgent no");
+-	addargs(&args, "-oPermitLocalCommand no");
+-	addargs(&args, "-oClearAllForwardings yes");
++//	addargs(&args, "-x");
++//	addargs(&args, "-oForwardAgent no");
++//	addargs(&args, "-oPermitLocalCommand no");
++//	addargs(&args, "-oClearAllForwardings yes");
+ 
+ 	fflag = tflag = 0;
+ 	while ((ch = getopt(argc, argv, "dfl:prtvBCc:i:P:q1246S:o:F:")) != -1)
============================================================
--- packages/gcc/gcc-cross-initial_csl-arm-2007q3.bb	4acf01cc481b727325c6077882c195b4f1572001
+++ packages/gcc/gcc-cross-initial_csl-arm-2007q3.bb	4acf01cc481b727325c6077882c195b4f1572001
@@ -0,0 +1,12 @@
+require gcc-cross_${PV}.bb
+require gcc-cross-initial.inc
+
+S = "${WORKDIR}/gcc-4.2"
+
+EXTRA_OECONF += "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap "
+
+# Hack till we fix *libc properly
+do_stage_append() {
+	ln -sf ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include/
+}
+
============================================================
--- packages/gcc/gcc-cross_csl-arm-2007q3.bb	f7fca6eee83b5ebe3eca940d8e1b1046d6de5ff0
+++ packages/gcc/gcc-cross_csl-arm-2007q3.bb	f7fca6eee83b5ebe3eca940d8e1b1046d6de5ff0
@@ -0,0 +1,26 @@
+PR = "r0"
+
+require gcc-csl-arm-2007q3.inc
+require gcc-cross4.inc
+require gcc-configure-cross.inc
+require gcc-package-cross.inc
+
+SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
+
+EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
+
+#We don't want i686 linux ending up in the CFLAGS_FOR_TARGET like this: -isystem/OE/angstrom-tmp/staging/i686-linux/usr/include
+CFLAGS = ""
+CXXFLAGS = ""
+LDFLAGS = ""
+
+# staging-linkage and cross-linkage recipes don't work anymore, so do it by hand for this backwards CSL toolchain
+do_compile_prepend() {
+	ln -sf ${STAGING_DIR_TARGET}${layout_libdir}/crt*.o ${CROSS_DIR}/${TARGET_SYS}/lib/
+	ln -sf ${STAGING_DIR_TARGET}${layout_libdir}/ld-* ${CROSS_DIR}/${TARGET_SYS}/lib/
+	ln -sf ${STAGING_DIR_TARGET}/lib/libc* ${CROSS_DIR}/${TARGET_SYS}/lib/ 
+	sed -i -e 's:gcc_no_link=yes:gcc_no_link=no:' ${S}/libstdc++-v3/configure
+
+}
+
+ARCH_FLAGS_FOR_TARGET += " -L${STAGING_DIR_TARGET}${layout_libdir} -isystem${STAGING_DIR_TARGET}${layout_includedir}"
============================================================
--- packages/gcc/gcc-csl-arm-2007q3/gcc-new-makeinfo.patch	ae26bd559a50cddae7e3e2732e8821389464d64b
+++ packages/gcc/gcc-csl-arm-2007q3/gcc-new-makeinfo.patch	ae26bd559a50cddae7e3e2732e8821389464d64b
@@ -0,0 +1,22 @@
+--- /tmp/configure	2008-05-18 12:57:11.378648834 +0200
++++ gcc-4.2/configure	2008-05-18 12:58:38.309478684 +0200
+@@ -3776,7 +3776,7 @@
+     # For an installed makeinfo, we require it to be from texinfo 4.4 or
+     # higher, else we use the "missing" dummy.
+     if ${MAKEINFO} --version \
+-       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
++       | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
+       :
+     else
+       MAKEINFO="$MISSING makeinfo"
+--- /tmp/configure.in	2008-05-18 12:57:32.665314708 +0200
++++ gcc-4.2/configure.in	2008-05-18 12:59:03.000000000 +0200
+@@ -2271,7 +2271,7 @@
+     # For an installed makeinfo, we require it to be from texinfo 4.4 or
+     # higher, else we use the "missing" dummy.
+     if ${MAKEINFO} --version \
+-       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
++       | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
+       :
+     else
+       MAKEINFO="$MISSING makeinfo"
============================================================
--- packages/gcc/gcc-csl-arm-2007q3.inc	01e125daae24e6a2f2f71eb12b6d2232b0ada01a
+++ packages/gcc/gcc-csl-arm-2007q3.inc	01e125daae24e6a2f2f71eb12b6d2232b0ada01a
@@ -0,0 +1,51 @@
+require gcc-common.inc
+
+BINV = "4.2.1"
+PV = "4.2.1+csl-arm-2007q3-53"
+
+FILESPATH = "${FILE_DIRNAME}/gcc-csl-arm-2007q3:${FILE_DIRNAME}/gcc-csl-arm"
+
+SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2007q3-53-arm-none-eabi.src.tar.bz2 \
+           file://gcc-new-makeinfo.patch;patch=1 \
+#           file://100-uclibc-conf.patch;patch=1 \
+#           file://103-uclibc-conf-noupstream.patch;patch=1 \
+#           file://200-uclibc-locale.patch;patch=1 \
+#           file://203-uclibc-locale-no__x.patch;patch=1 \
+#           file://204-uclibc-locale-wchar_fix.patch;patch=1 \
+#           file://205-uclibc-locale-update.patch;patch=1 \
+#           file://300-libstdc++-pic.patch;patch=1 \
+#           file://302-c99-snprintf.patch;patch=1 \
+#           file://303-c99-complex-ugly-hack.patch;patch=1 \
+#           file://304-index_macro.patch;patch=1 \
+#           file://305-libmudflap-susv3-legacy.patch;patch=1 \
+#           file://306-libstdc++-namespace.patch;patch=1 \
+#           file://307-locale_facets.patch;patch=1 \
+#           file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \
+#           file://602-sdk-libstdc++-includes.patch;patch=1 \
+           file://gcc41-configure.in.patch;patch=1 \
+           file://arm-nolibfloat.patch;patch=1 \
+           file://arm-softfloat.patch;patch=1 \
+           file://zecke-xgcc-cpp.patch;patch=1 \
+#           file://gfortran.patch;patch=1 \
+#           file://fortran-static-linking.patch;patch=1 \
+#           file://gcc-configure-no-fortran.patch;patch=1;pnum=1 \
+#           file://gcc-new-makeinfo.patch;patch=1 \
+"
+
+
+S = "${WORKDIR}/gcc-4.2"
+
+do_unpack2() {
+	cd ${WORKDIR}
+	tar -xvjf ./arm-2007q3-53-arm-none-eabi/gcc-2007q3-53.tar.bz2
+}
+
+# Language Overrides
+FORTRAN = ""
+#FORTRAN_linux-gnueabi = ",fortran"
+#JAVA = ",java"
+
+EXTRA_OECONF_BASE = "--enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
+ARM_INSTRUCTION_SET = "arm"
+
+addtask unpack2 after do_unpack before do_patch
============================================================
--- packages/gcc/gcc_csl-arm-2007q3.bb	d2ba66d1d65f6be2dc6ddf47d238afe57eb05f4f
+++ packages/gcc/gcc_csl-arm-2007q3.bb	d2ba66d1d65f6be2dc6ddf47d238afe57eb05f4f
@@ -0,0 +1,5 @@
+PR = "r0"
+
+require gcc-${PV}.inc
+require gcc-configure-target.inc
+require gcc-package-target.inc
============================================================
--- packages/libopie/libopie2/remove_h2200_rotate_fix.patch	971d8c3bbb6ab648db8f29cf5425c85557416af6
+++ packages/libopie/libopie2/remove_h2200_rotate_fix.patch	971d8c3bbb6ab648db8f29cf5425c85557416af6
@@ -0,0 +1,15 @@
+--- libopie2/opiecore/device/odevice_ipaq.cpp	25 Jul 2007 10:49:20 -0000	1.32
++++ libopie2/opiecore/device/odevice_ipaq.cpp	17 Mar 2007 22:08:43 -0000	1.30
+@@ -330,12 +330,6 @@
+                 case Rot180: quarters = 1/*270deg*/; break;
+                 case Rot270: quarters = 0/*270deg*/; break;
+             }
+-            if( d->m_model == Model_iPAQ_H22xx ) {
+-              // FIXME: there's something screwed with the keycodes being sent on h2200. I have
+-              // added a temporary workaround for this here, but the bug should be fixed properly
+-              // later in the right place. - Paul Eggleton 25/07/2007
+-              quarters = 0;
+-            }
+             newkeycode = Key_Left + ( keycode - Key_Left + quarters ) % 4;
+             break;
+         }
============================================================
--- packages/qte/qte-2.3.10/disable-dup-rotation.patch	f90a467431d9bde1ffae27ccf563cfdeed54691e
+++ packages/qte/qte-2.3.10/disable-dup-rotation.patch	f90a467431d9bde1ffae27ccf563cfdeed54691e
@@ -0,0 +1,13 @@
+--- qte/src/kernel/kernelkeyboard.cpp	2008-04-04 11:07:42.000000000 +0100
++++ qte/src/kernel/kernelkeyboard.cpp	2008-04-04 11:07:45.000000000 +0100
+@@ -627,8 +627,8 @@
+     case Qt::Key_Down:
+         unicode = 0xffff;
+         mod_key = false;
+-        if (qt_screen->isTransformed())
+-            qtKeyCode = static_cast<Qt::Key>( xform_dirkey(static_cast<int>( qtKeyCode ) ) );
++//        if (qt_screen->isTransformed())
++//            qtKeyCode = static_cast<Qt::Key>( xform_dirkey(static_cast<int>( qtKeyCode ) ) );
+         break;
+     /*
+      * handle lock, we don't handle scroll lock!
============================================================
--- classes/oestats-client.bbclass	a710c44a7f932fd458136ca8079856a4b2962a61
+++ classes/oestats-client.bbclass	c171db6462110869cb93b9aeaddec289573fca56
@@ -19,31 +19,58 @@ def oestats_send(server, action, vars = 
 	return f.read()
 	
 def oestats_send(server, action, vars = {}):
-	import httplib, urllib
+	import httplib
 
-	params = urllib.urlencode(vars)
-	headers = {"Content-type": "application/x-www-form-urlencoded",
-		"Accept": "text/plain"}
+	# build body
+	output = []
+	bound = '----------ThIs_Is_tHe_bouNdaRY_$'
+	for key in vars:
+		assert vars[key]
+		output.append('--' + bound)
+		output.append('Content-Disposition: form-data; name="%s"' % key)
+		output.append('')
+		output.append(vars[key])
+	output.append('--' + bound + '--')
+	output.append('')
+	body = "\r\n".join(output)
+
+	# build headers
+	headers = {
+		"User-agent": "oestats-client/0.1",
+		"Content-type": "multipart/form-data; boundary=%s" % bound,
+		"Content-length": str(len(body))}
+
+	# send request
 	conn = httplib.HTTPConnection(server)
-	conn.request("POST", action, params, headers)
+	conn.request("POST", action, body, headers)
 	response = conn.getresponse()
+	data = response.read()
 	conn.close()
-	return response
+	return data
 
 def oestats_start(server, builder, d):
 	import bb
 	import os.path
+	import re
 
 	# send report
-	response = oestats_send(server, "/builds/start/", {
-		'builder': builder,
-		'revision': bb.data.getVar('METADATA_REVISION', d, True),
-		'machine': bb.data.getVar('MACHINE', d, True),
-		'distro': bb.data.getVar('DISTRO', d, True),
-	})
-	id = response.read()
+	id = ""
+	try:
+		data = oestats_send(server, "/builds/start/", {
+			'builder': builder,
+			'revision': bb.data.getVar('METADATA_REVISION', d, True),
+			'machine': bb.data.getVar('MACHINE', d, True),
+			'distro': bb.data.getVar('DISTRO', d, True),
+		})
+		if re.match("^\d+$", data): id=data
+	except:
+		pass
 
 	# save the build id
+	if id:
+		bb.note("oestats: build %s" % id)
+	else:
+		bb.note("oestats: error starting build, disabling stats")
 	oestats_setid(d, id)
 
 def oestats_stop(server, d, status):
@@ -51,11 +78,15 @@ def oestats_stop(server, d, status):
 
 	# retrieve build id
 	id = oestats_getid(d)
+	if not id: return
 
 	# send report
-	response = oestats_send(server, "/builds/stop/%s/" % id, {
-		'status': status,
-	})
+	try:
+		response = oestats_send(server, "/builds/stop/%s/" % id, {
+			'status': status,
+		})
+	except:
+		bb.note("oestats: error stopping build")
 
 def oestats_task(server, d, task, status):
 	import bb
@@ -63,20 +94,27 @@ def oestats_task(server, d, task, status
 
 	# retrieve build id
 	id = oestats_getid(d)
+	if not id: return
+
+	# calculate build time
 	try:
 		elapsed = time.time() - float(bb.data.getVar('OESTATS_STAMP', d, True))
 	except:
 		elapsed = 0
 
 	# send report
-	response = oestats_send(server, "/builds/task/%s/" % id, {
-		'package': bb.data.getVar('PN', d, True),
-		'version':%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list