base.bbclass: Show svn revision of poky being used

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3818 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 8d92e3db0649dc2a018bf5c353c24621ecc278db..a3a795eb9cd7fe487153146a26e8dba0f7131441 100644 (file)
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -603,6 +603,31 @@ python base_do_unpack() {
                        raise bb.build.FuncFailed()
 }
 
+def base_get_scmbasepath(d):
+       import bb
+       path_to_bbfiles = bb.data.getVar( 'BBFILES', d, 1 ).split()
+       return path_to_bbfiles[0][:path_to_bbfiles[0].rindex( "packages" )]
+
+def base_get_metadata_monotone_revision(d):
+       monotone_revision = "<unknown>"
+       try:
+               monotone_revision = file( "%s/_MTN/revision" % base_get_scmbasepath(d) ).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]
+       except IOError:
+               pass
+       return monotone_revision
+
+def base_get_metadata_svn_revision(d):
+       revision = "<unknown>"
+       try:
+               revision = file( "%s/.svn/entries" % base_get_scmbasepath(d) ).readlines()[3].strip()
+       except IOError:
+               pass
+       return revision
+
+METADATA_REVISION_FUNCTION ?= "${@base_get_metadata_monotone_revision(d)}"
 
 addhandler base_eventhandler
 python base_eventhandler() {
@@ -634,18 +659,9 @@ python base_eventhandler() {
 
        if name.startswith("BuildStarted"):
                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>"
-               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]
-               except IOError:
-                       pass
-               bb.data.setVar( 'OE_REVISION', monotone_revision, e.data )
-               statusvars = ['BB_VERSION', 'OE_REVISION', 'TARGET_ARCH', 'TARGET_OS', 'MACHINE', 'DISTRO', 'DISTRO_VERSION','TARGET_FPU']
+               revision = bb.data.getVar('METADATA_REVISION_FUNCTION', e.data, 1)
+               bb.data.setVar( 'METADATA_REVISION', revision, e.data )
+               statusvars = ['BB_VERSION', 'METADATA_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)
                print statusmsg

diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index c4df483310774cbe423b6322cc933430e6747f28..dd7b0e25b2f5f4e74ce94e13da9e9c05d98a2750 100644 (file)
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -19,6 +19,9 @@ TARGET_FPU_arm ?= "soft"
 TARGET_FPU_armeb ?= "soft"
 IMAGE_ROOTFS_SIZE_ext2 ?= "131072"
 
+# Poky is svn based
+METADATA_REVISION_FUNCTION = "${@base_get_metadata_svn_revision(d)}"
+
 #FEED_URIS += " \
 #           upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \
 #upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \