diff options
author | Alejandro Mery <amery@hanoverdisplays.com> | 2017-06-13 10:47:55 +0100 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2017-06-26 11:35:51 -0700 |
commit | c90b1753c9c34ed16613d8979613460c85f4295c (patch) | |
tree | fb98277b0c53f56482674bc896c65d8bc5ff49cb | |
parent | 2a53b11d6cd99c05868c8d04e78c1c9ffd0a59ac (diff) | |
download | meta-openembedded-c90b1753c9c34ed16613d8979613460c85f4295c.tar.gz |
gitver: extend class to use EXTERNALSRC if set
Signed-off-by: Alejandro Mery <amery@hanoverdisplays.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | meta-oe/classes/gitver.bbclass | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta-oe/classes/gitver.bbclass b/meta-oe/classes/gitver.bbclass index b677996ea..adb434a46 100644 --- a/meta-oe/classes/gitver.bbclass +++ b/meta-oe/classes/gitver.bbclass | |||
@@ -24,7 +24,8 @@ def get_git_pv(path, d, tagadjust=None): | |||
24 | import os | 24 | import os |
25 | import bb.process | 25 | import bb.process |
26 | 26 | ||
27 | gitdir = os.path.abspath(os.path.join(d.getVar("S", True), ".git")) | 27 | srcdir = d.getVar("EXTERNALSRC", True) or d.getVar("S", True) |
28 | gitdir = os.path.abspath(os.path.join(srcdir, ".git")) | ||
28 | try: | 29 | try: |
29 | ver = gitrev_run("git describe --tags", gitdir) | 30 | ver = gitrev_run("git describe --tags", gitdir) |
30 | except Exception as exc: | 31 | except Exception as exc: |
@@ -71,5 +72,6 @@ def mark_recipe_dependencies(path, d): | |||
71 | mark_dependency(d, tagdir) | 72 | mark_dependency(d, tagdir) |
72 | 73 | ||
73 | python () { | 74 | python () { |
74 | mark_recipe_dependencies(d.getVar("S", True), d) | 75 | srcdir = d.getVar("EXTERNALSRC", True) or d.getVar("S", True) |
76 | mark_recipe_dependencies(srcdir, d) | ||
75 | } | 77 | } |