helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-05-18 21:46:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

gitver: fix broken ${GITSHA} and recursion in S when PV="${GITVER}"

Browse Source 
v2:
* use git rev-parse instead of rev-list for consistency with get_git_pv
* fix getVar() to pass `expand` as required by morty's bitbake

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>
This commit is contained in:
Alejandro Mery 2017-06-13 10:47:56 +01:00 committed by Armin Kuster
parent c90b1753c9
commit 718daa9754
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
meta-oe/classes/gitver.bbclass
View File

@ -13,16 +13,15 @@ def git_drop_tag_prefix(version):
return version
GIT_TAGADJUST = "git_drop_tag_prefix(version)"
GITVER = "${@get_git_pv('${S}', d, tagadjust=lambda version:${GIT_TAGADJUST})}"
GITSHA = "${@get_git_hash('${S}', d)}"
GITVER = "${@get_git_pv(d, tagadjust=lambda version:${GIT_TAGADJUST})}"
GITSHA = "${@get_git_hash(d)}"
def gitrev_run(cmd, path):
(output, error) = bb.process.run(cmd, cwd=path)
return output.rstrip()
def get_git_pv(path, d, tagadjust=None):
def get_git_pv(d, tagadjust=None):
import os
import bb.process
srcdir = d.getVar("EXTERNALSRC", True) or d.getVar("S", True)
gitdir = os.path.abspath(os.path.join(srcdir, ".git"))
@ -46,6 +45,17 @@ def get_git_pv(path, d, tagadjust=None):
ver = tagadjust(ver)
return ver
def get_git_hash(d):
import os
srcdir = d.getVar("EXTERNALSRC", True) or d.getVar("S", True)
gitdir = os.path.abspath(os.path.join(srcdir, ".git"))
try:
return gitrev_run("git rev-parse HEAD", gitdir)
except Exception as exc:
bb.fatal(str(exc))
def mark_recipe_dependencies(path, d):
from bb.parse import mark_dependency