[oe-commits] org.oe.dev merge of '344877dac1be60d7f6d718179f6d015c047ad23e'

[koen commit]

merge of '344877dac1be60d7f6d718179f6d015c047ad23e'
     and 'e293c46f8f09b6eaa2999aeb6d575e1b84e6c7b4'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 9cb48c162717430109870fb9eea210df9f75c47a
ViewMTN: http://monotone.openembedded.org/revision/info/9cb48c162717430109870fb9eea210df9f75c47a
Files:
1
packages/openssl/openssl-native_0.9.7m.bb
packages/openssl/openssl-native_0.9.8g.bb
classes/oestats-client.bbclass
Diffs:

#
# mt diff -r344877dac1be60d7f6d718179f6d015c047ad23e -r9cb48c162717430109870fb9eea210df9f75c47a
#
#
#
# patch "packages/openssl/openssl-native_0.9.7m.bb"
#  from [a7e810d1f91585491c6c3f0f1404c6fef062ee5c]
#    to [69af4325c51cf9c0e85833785b2726217c47ae07]
# 
# patch "packages/openssl/openssl-native_0.9.8g.bb"
#  from [2ca0e07e42caa326c5ec3f9611fdd2def25638a8]
#    to [791dde22e199319f5a22754272eb8ec65b0b5220]
#
============================================================
--- packages/openssl/openssl-native_0.9.7m.bb	a7e810d1f91585491c6c3f0f1404c6fef062ee5c
+++ packages/openssl/openssl-native_0.9.7m.bb	69af4325c51cf9c0e85833785b2726217c47ae07
@@ -6,10 +6,6 @@ export BUILD_OPTIMIZATION = " "
 export FULL_OPTIMIZATION = " "
 export BUILD_OPTIMIZATION = " "
 
-export CFLAG = " ${@base_conditional('SITEINFO_ENDIANESS', 'le', '-DL_ENDIAN', '-DB_ENDIAN', d)} \
-                 -DTERMIO  "
-
-
 PR = "r2"
 
 SRC_URI += "file://debian.patch;patch=1 \
============================================================
--- packages/openssl/openssl-native_0.9.8g.bb	2ca0e07e42caa326c5ec3f9611fdd2def25638a8
+++ packages/openssl/openssl-native_0.9.8g.bb	791dde22e199319f5a22754272eb8ec65b0b5220
@@ -8,9 +8,6 @@ export BUILD_OPTIMIZATION = " "
 export FULL_OPTIMIZATION = " "
 export BUILD_OPTIMIZATION = " "
 
-export CFLAG = " ${@base_conditional('SITEINFO_ENDIANESS', 'le', '-DL_ENDIAN', '-DB_ENDIAN', d)} \
-                 -DTERMIO  "
-
 SRC_URI += "file://debian.patch;patch=1 \
             file://configure-targets.patch;patch=1 \
             file://shared-libs.patch;patch=1"


#
# mt diff -re293c46f8f09b6eaa2999aeb6d575e1b84e6c7b4 -r9cb48c162717430109870fb9eea210df9f75c47a
#
#
#
# patch "classes/oestats-client.bbclass"
#  from [78b88551bd771649a9f72a86d627426a00214ad0]
#    to [a710c44a7f932fd458136ca8079856a4b2962a61]
#
============================================================
--- classes/oestats-client.bbclass	78b88551bd771649a9f72a86d627426a00214ad0
+++ classes/oestats-client.bbclass	a710c44a7f932fd458136ca8079856a4b2962a61
@@ -18,15 +18,6 @@ def oestats_getid(d):
 	f = file(bb.data.getVar('TMPDIR', d, True) + '/oestats.id', 'r')
 	return f.read()
 	
-def oestats_revision(dir):
-	import re
-	try:
-		f = file("%s/_MTN/revision" % dir)
-		m = re.search(r"old_revision \[(.*)\]", f.read())
-		return m.group(1)
-	except:
-		return
-
 def oestats_send(server, action, vars = {}):
 	import httplib, urllib
 
@@ -43,17 +34,10 @@ def oestats_start(server, builder, d):
 	import bb
 	import os.path
 
-	# collect information about revisions
-	path_bb = bb.data.getVar('BBPATH', d, True)
-	for p in (path_bb or "").split(':'):
-		revision = oestats_revision(p)
-		if revision:
-			break
-
 	# send report
 	response = oestats_send(server, "/builds/start/", {
 		'builder': builder,
-		'revision': revision,
+		'revision': bb.data.getVar('METADATA_REVISION', d, True),
 		'machine': bb.data.getVar('MACHINE', d, True),
 		'distro': bb.data.getVar('DISTRO', d, True),
 	})