summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-02-15 15:31:07 +0000
committerRichard Purdie <richard@openedhand.com>2008-02-15 15:31:07 +0000
commit094234f792b4ae4acd21e87542ab25b3e9f7c3ef (patch)
tree74ca682af7448a4b4d929acc8adafb6413e6654d
parent35d364f96478a6f1a264f5c49aded46702615795 (diff)
downloadpoky-094234f792b4ae4acd21e87542ab25b3e9f7c3ef.tar.gz
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.bbclass4
-rw-r--r--meta/conf/distro/poky.conf2
2 files changed, 2 insertions, 4 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index a3a795eb9c..e329449f34 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -627,7 +627,7 @@ def base_get_metadata_svn_revision(d):
627 pass 627 pass
628 return revision 628 return revision
629 629
630METADATA_REVISION_FUNCTION ?= "${@base_get_metadata_monotone_revision(d)}" 630METADATA_REVISION ?= "${@base_get_metadata_monotone_revision(d)}"
631 631
632addhandler base_eventhandler 632addhandler base_eventhandler
633python base_eventhandler() { 633python base_eventhandler() {
@@ -659,8 +659,6 @@ python base_eventhandler() {
659 659
660 if name.startswith("BuildStarted"): 660 if name.startswith("BuildStarted"):
661 bb.data.setVar( 'BB_VERSION', bb.__version__, e.data ) 661 bb.data.setVar( 'BB_VERSION', bb.__version__, e.data )
662 revision = bb.data.getVar('METADATA_REVISION_FUNCTION', e.data, 1)
663 bb.data.setVar( 'METADATA_REVISION', revision, e.data )
664 statusvars = ['BB_VERSION', 'METADATA_REVISION', 'TARGET_ARCH', 'TARGET_OS', 'MACHINE', 'DISTRO', 'DISTRO_VERSION','TARGET_FPU'] 662 statusvars = ['BB_VERSION', 'METADATA_REVISION', 'TARGET_ARCH', 'TARGET_OS', 'MACHINE', 'DISTRO', 'DISTRO_VERSION','TARGET_FPU']
665 statuslines = ["%-14s = \"%s\"" % (i, bb.data.getVar(i, e.data, 1) or '') for i in statusvars] 663 statuslines = ["%-14s = \"%s\"" % (i, bb.data.getVar(i, e.data, 1) or '') for i in statusvars]
666 statusmsg = "\nOE Build Configuration:\n%s\n" % '\n'.join(statuslines) 664 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 dd7b0e25b2..832e18f448 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -20,7 +20,7 @@ TARGET_FPU_armeb ?= "soft"
20IMAGE_ROOTFS_SIZE_ext2 ?= "131072" 20IMAGE_ROOTFS_SIZE_ext2 ?= "131072"
21 21
22# Poky is svn based 22# Poky is svn based
23METADATA_REVISION_FUNCTION = "${@base_get_metadata_svn_revision(d)}" 23METADATA_REVISION = "${@base_get_metadata_svn_revision(d)}"
24 24
25#FEED_URIS += " \ 25#FEED_URIS += " \
26# upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \ 26# upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \