summaryrefslogtreecommitdiff
path: root/meta/classes/metadata_scm.bbclass
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2016-04-29 19:03:45 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-11 10:08:30 +0100
commit53fd0a4a37023642a770a9fbf3cd5511d3c82af7 (patch)
tree3aa26ce4c52d052d618baa07e88701ae5f61406a /meta/classes/metadata_scm.bbclass
parent29a8c45be2862be02afe2ebbc5c026a42f351990 (diff)
downloadopenembedded-core-53fd0a4a37023642a770a9fbf3cd5511d3c82af7.tar.gz
openembedded-core-53fd0a4a37023642a770a9fbf3cd5511d3c82af7.tar.bz2
openembedded-core-53fd0a4a37023642a770a9fbf3cd5511d3c82af7.zip
metadata_scm.bbclass: Do not assume ${COREBASE} is a Git repo
The functions base_detect_revision() and base_detect_branch() try to extract SCM meta information from the path returned by base_get_scmbasepath(), which currently returns ${COREBASE}. However, making the assumption that ${COREBASE} contains SCM meta information can be false. It is true for Poky, but not necessarily other environments. A better option is to look for the SCM meta information based on the meta layer. Since this works as expected for Git but not SVN, the call to base_get_metadata_svn_revision() from base_detect_revision() was also removed. This is not expected to affect anyone (partly based on the comment in base_get_metadata_svn_revision()). Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/classes/metadata_scm.bbclass')
-rw-r--r--meta/classes/metadata_scm.bbclass5
1 files changed, 2 insertions, 3 deletions
diff --git a/meta/classes/metadata_scm.bbclass b/meta/classes/metadata_scm.bbclass
index 0f7f4235a3..2e6fac209a 100644
--- a/meta/classes/metadata_scm.bbclass
+++ b/meta/classes/metadata_scm.bbclass
@@ -4,8 +4,7 @@ METADATA_REVISION ?= "${@base_detect_revision(d)}"
def base_detect_revision(d):
path = base_get_scmbasepath(d)
- scms = [base_get_metadata_git_revision, \
- base_get_metadata_svn_revision]
+ scms = [base_get_metadata_git_revision]
for scm in scms:
rev = scm(path, d)
@@ -27,7 +26,7 @@ def base_detect_branch(d):
return "<unknown>"
def base_get_scmbasepath(d):
- return d.getVar( 'COREBASE', True)
+ return os.path.join(d.getVar('COREBASE', True), 'meta')
def base_get_metadata_monotone_branch(path, d):
monotone_branch = "<unknown>"