diff options
-rw-r--r-- | meta/classes/metadata_scm.bbclass | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/meta/classes/metadata_scm.bbclass b/meta/classes/metadata_scm.bbclass index fa791f04c4..658e2f883b 100644 --- a/meta/classes/metadata_scm.bbclass +++ b/meta/classes/metadata_scm.bbclass | |||
@@ -3,27 +3,11 @@ METADATA_REVISION ?= "${@base_detect_revision(d)}" | |||
3 | 3 | ||
4 | def base_detect_revision(d): | 4 | def base_detect_revision(d): |
5 | path = base_get_scmbasepath(d) | 5 | path = base_get_scmbasepath(d) |
6 | 6 | return base_get_metadata_git_revision(path, d) | |
7 | scms = [base_get_metadata_git_revision] | ||
8 | |||
9 | for scm in scms: | ||
10 | rev = scm(path, d) | ||
11 | if rev != "<unknown>": | ||
12 | return rev | ||
13 | |||
14 | return "<unknown>" | ||
15 | 7 | ||
16 | def base_detect_branch(d): | 8 | def base_detect_branch(d): |
17 | path = base_get_scmbasepath(d) | 9 | path = base_get_scmbasepath(d) |
18 | 10 | return base_get_metadata_git_branch(path, d) | |
19 | scms = [base_get_metadata_git_branch] | ||
20 | |||
21 | for scm in scms: | ||
22 | rev = scm(path, d) | ||
23 | if rev != "<unknown>": | ||
24 | return rev.strip() | ||
25 | |||
26 | return "<unknown>" | ||
27 | 11 | ||
28 | def base_get_scmbasepath(d): | 12 | def base_get_scmbasepath(d): |
29 | return os.path.join(d.getVar('COREBASE'), 'meta') | 13 | return os.path.join(d.getVar('COREBASE'), 'meta') |