diff options
author | Alejandro Mery <amery@hanoverdisplays.com> | 2017-06-20 13:13:04 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-06-22 16:03:00 +0200 |
commit | 251547bd2ee9417175cf8d4349f83cdbd7f8479e (patch) | |
tree | 527c4ed2c0a87919fd03702ec7af267bc38c7241 /meta-oe | |
parent | bc94e4329acce34972b42c3ed30ee28e910224ae (diff) | |
download | meta-openembedded-contrib-251547bd2ee9417175cf8d4349f83cdbd7f8479e.tar.gz |
gitver: skip packages instead of panic()ing if ${GITVER} fails to expand
`inherit externalsrc gitver` is a very useful combo to get development trees
in your workspace having a ${PN}_git.bb with PV=${GITVER} coexisting with a regular
${PN}_${PV}.bb
but not everyone wants to checkout all developments sources and managinging different
layers for each options is quite troublesome.
making `gitver` skip the .bb instead of panic()ing every time EXTERNALSRC is missing
allows people to have a single development layer where packages get enabled if
the right sources are present or falling back to the last release if not
Signed-off-by: Alejandro Mery <amery@hanoverdisplays.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/classes/gitver.bbclass | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/meta-oe/classes/gitver.bbclass b/meta-oe/classes/gitver.bbclass index a09c997496..380374ab27 100644 --- a/meta-oe/classes/gitver.bbclass +++ b/meta-oe/classes/gitver.bbclass @@ -27,23 +27,20 @@ def get_git_pv(d, tagadjust=None): gitdir = os.path.abspath(os.path.join(srcdir, ".git")) try: ver = gitrev_run("git describe --tags", gitdir) - except Exception as exc: - bb.fatal(str(exc)) - - if not ver: + except: try: ver = gitrev_run("git rev-parse --short HEAD", gitdir) + if ver: + return "0.0+%s" % ver + else: + return "0.0" + except Exception as exc: - bb.fatal(str(exc)) + raise bb.parse.SkipPackage(str(exc)) - if ver: - return "0.0+%s" % ver - else: - return "0.0" - else: - if tagadjust: - ver = tagadjust(ver) - return ver + if ver and tagadjust: + ver = tagadjust(ver) + return ver def get_git_hash(d): import os |