diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-02-15 15:31:07 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-02-15 15:31:07 +0000 |
| commit | 094234f792b4ae4acd21e87542ab25b3e9f7c3ef (patch) | |
| tree | 74ca682af7448a4b4d929acc8adafb6413e6654d | |
| parent | 35d364f96478a6f1a264f5c49aded46702615795 (diff) | |
| download | openembedded-core-094234f792b4ae4acd21e87542ab25b3e9f7c3ef.tar.gz openembedded-core-094234f792b4ae4acd21e87542ab25b3e9f7c3ef.tar.bz2 openembedded-core-094234f792b4ae4acd21e87542ab25b3e9f7c3ef.tar.xz openembedded-core-094234f792b4ae4acd21e87542ab25b3e9f7c3ef.zip | |
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
| -rw-r--r-- | meta/classes/base.bbclass | 4 | ||||
| -rw-r--r-- | meta/conf/distro/poky.conf | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index a3a795eb9..e329449f3 100644 --- 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 dd7b0e25b..832e18f44 100644 --- 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/ \ |