[oe-commits] org.oe.dev merge of '6e562962e9bd825d825465d312524f84e3e493a4'

[oe commit]

merge of '6e562962e9bd825d825465d312524f84e3e493a4'
     and 'b0881da09ca99de633f27df620ac1f8e8250f288'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 6cc3aaedf8cf414553ad240c92f741b2f004e596
ViewMTN: http://monotone.openembedded.org/revision/info/6cc3aaedf8cf414553ad240c92f741b2f004e596
Files:
1
packages/avahi/avahi.inc
packages/avahi/avahi_0.6.19.bb
packages/avahi/avahi_0.6.20.bb
packages/avahi/avahi_0.6.21.bb
packages/avahi/avahi_0.6.22.bb
classes/oestats-client.bbclass
classes/seppuku.bbclass
Diffs:

#
# mt diff -r6e562962e9bd825d825465d312524f84e3e493a4 -r6cc3aaedf8cf414553ad240c92f741b2f004e596
#
#
#
# patch "packages/avahi/avahi.inc"
#  from [4fa00bfeab78501b5f96381ad7362170b9b43670]
#    to [43834b0521bfa682033d94ab0f585788c3343deb]
# 
# patch "packages/avahi/avahi_0.6.19.bb"
#  from [b79ad80e97d4543f28d1a53c5b017057371d031f]
#    to [31876c8a22a42cf1aa6837bb7555de371381d3cf]
# 
# patch "packages/avahi/avahi_0.6.20.bb"
#  from [b79ad80e97d4543f28d1a53c5b017057371d031f]
#    to [31876c8a22a42cf1aa6837bb7555de371381d3cf]
# 
# patch "packages/avahi/avahi_0.6.21.bb"
#  from [26918362d7839d99e5016a6b67015a2f5e442910]
#    to [601996f503c03a8271af8251c380475caeb88960]
# 
# patch "packages/avahi/avahi_0.6.22.bb"
#  from [7cc7310ab622a94d9c9df777edca8e64664ab30d]
#    to [2e254bff547105d0abcbff5c287d52affacd37fa]
#
============================================================
--- packages/avahi/avahi.inc	4fa00bfeab78501b5f96381ad7362170b9b43670
+++ packages/avahi/avahi.inc	43834b0521bfa682033d94ab0f585788c3343deb
@@ -20,8 +20,7 @@ RDEPENDS_append = ""
 RDEPENDS_append = ""
 
 # TODO: build and enable all the extra stuff avahi offers
-EXTRA_OECONF = "--with-distro=debian  --disable-nls --disable-gdbm ${AVAHI_GTK} --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 ${AVAHI_PYTHON}"
-EXTRA_OECONF_append_mipsel = " --disable-stack-protector"
+EXTRA_OECONF = "--with-distro=debian  --disable-stack-protector --disable-nls --disable-gdbm ${AVAHI_GTK} --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 ${AVAHI_PYTHON}"
 AVAHI_PYTHON = "--disable-python"
 AVAHI_GTK = "--disable-gtk"
 
============================================================
--- packages/avahi/avahi_0.6.19.bb	b79ad80e97d4543f28d1a53c5b017057371d031f
+++ packages/avahi/avahi_0.6.19.bb	31876c8a22a42cf1aa6837bb7555de371381d3cf
@@ -1,3 +1,3 @@ require avahi.inc
 require avahi.inc
 
+PR = "r7"
-PR = "r6"
============================================================
--- packages/avahi/avahi_0.6.20.bb	b79ad80e97d4543f28d1a53c5b017057371d031f
+++ packages/avahi/avahi_0.6.20.bb	31876c8a22a42cf1aa6837bb7555de371381d3cf
@@ -1,3 +1,3 @@ require avahi.inc
 require avahi.inc
 
+PR = "r7"
-PR = "r6"
============================================================
--- packages/avahi/avahi_0.6.21.bb	26918362d7839d99e5016a6b67015a2f5e442910
+++ packages/avahi/avahi_0.6.21.bb	601996f503c03a8271af8251c380475caeb88960
@@ -1,6 +1,6 @@ require avahi.inc
 require avahi.inc
 
-PR = "r6"
+PR = "r7"
 
 SRC_URI += "file://dbus-pre-1.1.1-support.patch;patch=1"
 SRC_URI += "file://avr32-ipv6-fix.patch;patch=1"
============================================================
--- packages/avahi/avahi_0.6.22.bb	7cc7310ab622a94d9c9df777edca8e64664ab30d
+++ packages/avahi/avahi_0.6.22.bb	2e254bff547105d0abcbff5c287d52affacd37fa
@@ -1,6 +1,6 @@ DEPENDS += "intltool-native"
 require avahi.inc
 
 DEPENDS += "intltool-native"
-PR = "r6"
+PR = "r7"
 
 PACKAGES =+ "libavahi-gobject"


#
# mt diff -rb0881da09ca99de633f27df620ac1f8e8250f288 -r6cc3aaedf8cf414553ad240c92f741b2f004e596
#
#
#
# patch "classes/oestats-client.bbclass"
#  from [9f4ff853acd1082675e4590ab2bfe012dc7e2fc3]
#    to [9b7bcf75099c4710192e9db3d5d93b228b0c73ba]
# 
# patch "classes/seppuku.bbclass"
#  from [97be1cf15677f7c326c40bcc51d7b2a31f25260f]
#    to [503bd4965d85136d5e8b8f6a4cad80e3d82e7440]
#
============================================================
--- classes/oestats-client.bbclass	9f4ff853acd1082675e4590ab2bfe012dc7e2fc3
+++ classes/oestats-client.bbclass	9b7bcf75099c4710192e9db3d5d93b228b0c73ba
@@ -44,7 +44,7 @@ def oestats_send(server, action, vars = 
 
 	# build headers
 	headers = {
-		"User-agent": "oestats-client/0.4",
+		"User-agent": "oestats-client/0.5",
 		"Content-type": "multipart/form-data; boundary=%s" % bound,
 		"Content-length": str(len(body))}
 
@@ -66,8 +66,9 @@ def oestats_start(server, builder, d):
 	try:
 		data = oestats_send(server, "/builds/", {
 			'builder': builder,
-			'branch': bb.data.getVar('METADATA_BRANCH', d, True),
-			'revision': bb.data.getVar('METADATA_REVISION', d, True),
+			'build_arch': bb.data.getVar('BUILD_ARCH', d, True),
+			'metadata_branch': bb.data.getVar('METADATA_BRANCH', d, True),
+			'metadata_revision': bb.data.getVar('METADATA_REVISION', d, True),
 			'machine': bb.data.getVar('MACHINE', d, True),
 			'distro': bb.data.getVar('DISTRO', d, True),
 		})
@@ -140,6 +141,8 @@ def oestats_task(server, d, task, status
 			'task': task,
 			'status': status,
 			'time': str(elapsed),
+			'bug_number': bb.data.getVar('OESTATS_BUG_NUMBER', d, True) or "",
+			'bug_tracker': bb.data.getVar('OESTATS_BUG_TRACKER', d, True) or "",
 		}, files)
 	except:
 		bb.note("oestats: error sending task, disabling stats")
============================================================
--- classes/seppuku.bbclass	97be1cf15677f7c326c40bcc51d7b2a31f25260f
+++ classes/seppuku.bbclass	503bd4965d85136d5e8b8f6a4cad80e3d82e7440
@@ -380,5 +380,10 @@ python seppuku_eventhandler() {
         else:
             print >> debug_file, "Not trying to create an attachment for bug #%s" % bug_number
 
+        # store bug number for oestats-client
+        if bug_number:
+            bb.data.setVar('OESTATS_BUG_NUMBER', bug_number, event.data)
+            bb.data.setVar('OESTATS_BUG_TRACKER', "http://bugs.openembedded.net/", event.data)
+
     return NotHandled
 }