diff options
-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 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 | ||
630 | METADATA_REVISION_FUNCTION ?= "${@base_get_metadata_monotone_revision(d)}" | 630 | METADATA_REVISION ?= "${@base_get_metadata_monotone_revision(d)}" |
631 | 631 | ||
632 | addhandler base_eventhandler | 632 | addhandler base_eventhandler |
633 | python base_eventhandler() { | 633 | python 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" | |||
20 | IMAGE_ROOTFS_SIZE_ext2 ?= "131072" | 20 | IMAGE_ROOTFS_SIZE_ext2 ?= "131072" |
21 | 21 | ||
22 | # Poky is svn based | 22 | # Poky is svn based |
23 | METADATA_REVISION_FUNCTION = "${@base_get_metadata_svn_revision(d)}" | 23 | METADATA_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/ \ |