org.openmoko.april-update: 178c97ae0a693edea4d65673050d3cf8080f2bba

oe at monotone.openmoko.org oe at monotone.openmoko.org
Mon May 19 17:32:24 CEST 2008


revision:            178c97ae0a693edea4d65673050d3cf8080f2bba
date:                2008-05-17T20:33:07
author:              freyther at openembedded.org
branch:              org.openmoko.april-update
changelog:
base.bbclass: Use git-log to get a possible git-revision and populate OE_REVISION with that
    Prepare for the switch to git and to have accurate OE_REVISION even on git

manifest:
format_version "1"

new_manifest [1ae26a15613ea55f1d87a9f851da56e3bf5851ea]

old_revision [5d9397e8336d1ce179a66966e2d064a6e4ecfe9f]

patch "classes/base.bbclass"
 from [cf57311376e9ff8f4bd87f3ffdaad688ef85ea51]
   to [d26debb0f94b1091c3bbf203084c6a5f1f1909bb]
-------------- next part --------------
#
#
# patch "classes/base.bbclass"
#  from [cf57311376e9ff8f4bd87f3ffdaad688ef85ea51]
#    to [d26debb0f94b1091c3bbf203084c6a5f1f1909bb]
#
============================================================
--- classes/base.bbclass	cf57311376e9ff8f4bd87f3ffdaad688ef85ea51
+++ classes/base.bbclass	d26debb0f94b1091c3bbf203084c6a5f1f1909bb
@@ -720,15 +720,22 @@ python base_eventhandler() {
 		bb.data.setVar( 'BB_VERSION', bb.__version__, e.data )
 		path_to_bbfiles = bb.data.getVar( 'BBFILES', e.data, 1 )
 		path_to_packages = path_to_bbfiles[:path_to_bbfiles.rindex( "packages" )]
-		monotone_revision = "<unknown>"
+		scm_revision = "<unknown>"
+
 		try:
-			monotone_revision = file( "%s/_MTN/revision" % path_to_packages ).read().strip()
-			if monotone_revision.startswith( "format_version" ):
-				monotone_revision_words = monotone_revision.split()
-				monotone_revision = monotone_revision_words[ monotone_revision_words.index( "old_revision" )+1][1:-1]
+			scm_revision = file( "%s/_MTN/revision" % path_to_packages ).read().strip()
+			if scm_revision.startswith( "format_version" ):
+				scm_revision_words = scm_revision.split()
+				scm_revision = scm_revision_words[ scm_revision_words.index( "old_revision" )+1][1:-1]
 		except IOError:
 			pass
-		bb.data.setVar( 'OE_REVISION', monotone_revision, e.data )
+
+		if scm_revision == "<unknown>":
+			rev = os.popen("cd %s; git-log -n 1 --pretty=oneline --" % path_to_packages).read().split(" ")[0]
+			if len(rev) != 0:
+				scm_revision = rev
+
+		bb.data.setVar( 'OE_REVISION', scm_revision, e.data )
 		statusvars = ['BB_VERSION', 'OE_REVISION', 'TARGET_ARCH', 'TARGET_OS', 'MACHINE', 'DISTRO', 'DISTRO_VERSION','TARGET_FPU']
 		statuslines = ["%-14s = \"%s\"" % (i, bb.data.getVar(i, e.data, 1) or '') for i in statusvars]
 		statusmsg = "\nOE Build Configuration:\n%s\n" % '\n'.join(statuslines)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080519/6f84d939/attachment.htm 


More information about the commitlog mailing list