summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/lib/oe/buildcfg.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/lib/oe/buildcfg.py b/meta/lib/oe/buildcfg.py
index b9d32c7cc1..b3fe510309 100644
--- a/meta/lib/oe/buildcfg.py
+++ b/meta/lib/oe/buildcfg.py
@@ -5,23 +5,23 @@ import bb.process
5 5
6def detect_revision(d): 6def detect_revision(d):
7 path = get_scmbasepath(d) 7 path = get_scmbasepath(d)
8 return get_metadata_git_revision(path, d) 8 return get_metadata_git_revision(path)
9 9
10def detect_branch(d): 10def detect_branch(d):
11 path = get_scmbasepath(d) 11 path = get_scmbasepath(d)
12 return get_metadata_git_branch(path, d) 12 return get_metadata_git_branch(path)
13 13
14def get_scmbasepath(d): 14def get_scmbasepath(d):
15 return os.path.join(d.getVar('COREBASE'), 'meta') 15 return os.path.join(d.getVar('COREBASE'), 'meta')
16 16
17def get_metadata_git_branch(path, d): 17def get_metadata_git_branch(path):
18 try: 18 try:
19 rev, _ = bb.process.run('git rev-parse --abbrev-ref HEAD', cwd=path) 19 rev, _ = bb.process.run('git rev-parse --abbrev-ref HEAD', cwd=path)
20 except bb.process.ExecutionError: 20 except bb.process.ExecutionError:
21 rev = '<unknown>' 21 rev = '<unknown>'
22 return rev.strip() 22 return rev.strip()
23 23
24def get_metadata_git_revision(path, d): 24def get_metadata_git_revision(path):
25 try: 25 try:
26 rev, _ = bb.process.run('git rev-parse HEAD', cwd=path) 26 rev, _ = bb.process.run('git rev-parse HEAD', cwd=path)
27 except bb.process.ExecutionError: 27 except bb.process.ExecutionError:
@@ -46,5 +46,5 @@ def get_layer_revisions(d):
46 layers = (d.getVar("BBLAYERS") or "").split() 46 layers = (d.getVar("BBLAYERS") or "").split()
47 revisions = [] 47 revisions = []
48 for i in layers: 48 for i in layers:
49 revisions.append((i, os.path.basename(i), get_metadata_git_branch(i, None).strip(), get_metadata_git_revision(i, None), is_layer_modified(i))) 49 revisions.append((i, os.path.basename(i), get_metadata_git_branch(i).strip(), get_metadata_git_revision(i), is_layer_modified(i)))
50 return revisions 50 return revisions