base.bbclass: Drop _FUNCTION suffix to METADATA_REVISION

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

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index a3a795eb9cd7fe487153146a26e8dba0f7131441..e329449f34314c36888dd1486d79b0638bbf72f4 100644 (file)
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -627,7 +627,7 @@ def base_get_metadata_svn_revision(d):
                pass
        return revision
 
-METADATA_REVISION_FUNCTION ?= "${@base_get_metadata_monotone_revision(d)}"
+METADATA_REVISION ?= "${@base_get_metadata_monotone_revision(d)}"
 
 addhandler base_eventhandler
 python base_eventhandler() {
@@ -659,8 +659,6 @@ python base_eventhandler() {
 
        if name.startswith("BuildStarted"):
                bb.data.setVar( 'BB_VERSION', bb.__version__, e.data )
-               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)

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