distrodata.bbaclass: change in git and svn package reporting
For git packages the Package Reporting System should always report the latest HEAD. For svn packages the new version reporting has the following format: version+svn[r|-]revision (From OE-Core rev: 43c28375f97161e618fa54349c65be2058c33c53) Signed-off-by: Emilia Ciobanu <emilia.maria.silvia.ciobanu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Emilia Ciobanu
Richard Purdie
parent
5c9281e87b
commit
06ae127aed
|
|
@ -663,15 +663,25 @@ python do_checkpkg() {
|
|||
gitproto = parm['protocol']
|
||||
else:
|
||||
gitproto = "git"
|
||||
gitcmd = "git ls-remote %s://%s%s%s *tag* 2>&1" % (gitproto, gituser, host, path)
|
||||
|
||||
# Get all tags and HEAD
|
||||
if d.getVar('GIT_REGEX', True):
|
||||
gitcmd = "git ls-remote %s://%s%s%s %s 2>&1" % (gitproto, gituser, host, path, d.getVar('GIT_REGEX', True))
|
||||
else:
|
||||
gitcmd = "git ls-remote %s://%s%s%s *tag* 2>&1" % (gitproto, gituser, host, path)
|
||||
gitcmd2 = "git ls-remote %s://%s%s%s HEAD 2>&1" % (gitproto, gituser, host, path)
|
||||
|
||||
tmp = os.popen(gitcmd).read()
|
||||
if 'unable to connect' in tmp:
|
||||
tmp = None
|
||||
tmp2 = os.popen(gitcmd2).read()
|
||||
#This is for those repo have tag like: refs/tags/1.2.2
|
||||
if 'unable to connect' in tmp2:
|
||||
tmp2 = None
|
||||
#This is for those repos have tag like: refs/tags/1.2.2
|
||||
phash = pversion.rsplit("+")[-1]
|
||||
if tmp:
|
||||
tmpline = tmp.split("\n")
|
||||
verflag = 0
|
||||
phash = tmpline[0].rsplit("\t")[0]
|
||||
pupver = pversion
|
||||
for line in tmpline:
|
||||
if len(line)==0:
|
||||
|
|
@ -681,46 +691,52 @@ python do_checkpkg() {
|
|||
if upstr_regex:
|
||||
puptag = re.search(upstr_regex, puptag)
|
||||
else:
|
||||
puptag = re.search("([0-9][\.|_]?)+", puptag)
|
||||
puptag = re.search("(?P<pver>([0-9][\.|_]?)+)", puptag)
|
||||
if puptag == None:
|
||||
continue;
|
||||
puptag = puptag.group()
|
||||
continue
|
||||
puptag = puptag.group('pver')
|
||||
puptag = re.sub("_",".",puptag)
|
||||
plocaltag = pupver.split("+git")[0]
|
||||
if "git" in plocaltag:
|
||||
plocaltag = plocaltag.split("-")[0]
|
||||
result = bb.utils.vercmp(("0", puptag, ""), ("0", plocaltag, ""))
|
||||
|
||||
if result > 0:
|
||||
verflag = 1
|
||||
pstatus = "UPDATE"
|
||||
pupver = puptag
|
||||
phash = line.split("\t")[0]
|
||||
verflag = 1
|
||||
pupver = puptag
|
||||
elif verflag == 0 :
|
||||
pupver = plocaltag
|
||||
pstatus = "MATCH"
|
||||
pupver = plocaltag
|
||||
#This is for those no tag repo
|
||||
elif tmp2:
|
||||
pupver = tmp2.split("\t")[0]
|
||||
pupver = pversion.rsplit("+")[0]
|
||||
phash = pupver
|
||||
if pupver in pversion:
|
||||
pstatus = "MATCH"
|
||||
else:
|
||||
pstatus = "UPDATE"
|
||||
else:
|
||||
pstatus = "ErrGitAccess"
|
||||
if not ('ErrGitAccess' in pstatus):
|
||||
|
||||
tmp3 = re.search('(?P<git_ver>(\d+[\.-]?)+)(?P<git_prefix>(\+git[r|\-|]?)AUTOINC\+)(?P<head_md5>(.+))', pversion)
|
||||
if tmp3:
|
||||
pversion = tmp3.group('git_ver') + tmp3.group('git_prefix') + tmp3.group('head_md5')[:7]
|
||||
git_prefix = tmp3.group('git_prefix')
|
||||
if not (git_prefix in pupver):
|
||||
if len(pupver) < 40:
|
||||
"""This is not the HEAD of the repository"""
|
||||
pupver = pupver + tmp3.group('git_prefix') + phash[:7]
|
||||
latest_head = tmp2.rsplit("\t")[0][:7]
|
||||
tmp3 = re.search('(?P<git_ver>(\d+[\.-]?)+)(?P<git_prefix>(\+git[r|\-|]?)AUTOINC\+)(?P<head_md5>([\w|_]+))', pversion)
|
||||
tmp4 = re.search('(?P<git_ver>(\d+[\.-]?)+)(?P<git_prefix>(\+git[r|\-|]?)AUTOINC\+)(?P<head_md5>([\w|_]+))', pupver)
|
||||
if not tmp4:
|
||||
tmp4 = re.search('(?P<git_ver>(\d+[\.-]?)+)', pupver)
|
||||
|
||||
if tmp3:
|
||||
# Get status of the package - MATCH/UPDATE
|
||||
result = bb.utils.vercmp(("0", tmp3.group('git_ver'), ""), ("0",tmp3.group('git_ver') , ""))
|
||||
# Get the latest tag
|
||||
pstatus = 'MATCH'
|
||||
if result < 0:
|
||||
latest_pv = tmp3.group('git_ver')
|
||||
else:
|
||||
"""This is the HEAD of the repository"""
|
||||
pupver = tmp3.group('git_ver') + tmp3.group('git_prefix') + phash[:7]
|
||||
latest_pv = pupver
|
||||
if not(tmp3.group('head_md5')[:7] in latest_head) or not(latest_head in tmp3.group('head_md5')[:7]):
|
||||
pstatus = 'UPDATE'
|
||||
|
||||
git_prefix = tmp3.group('git_prefix')
|
||||
pupver = latest_pv + tmp3.group('git_prefix') + latest_head
|
||||
else:
|
||||
if not tmp3:
|
||||
bb.plain("#DEBUG# Current version (%s) doesn't match the usual pattern" %pversion)
|
||||
elif type == 'svn':
|
||||
options = []
|
||||
if user:
|
||||
|
|
@ -750,6 +766,13 @@ python do_checkpkg() {
|
|||
|
||||
if re.match("Err", pstatus):
|
||||
pstatus = "ErrSvnAccess"
|
||||
|
||||
if pstatus != "ErrSvnAccess":
|
||||
tag = pversion.rsplit("+svn")[0]
|
||||
svn_prefix = re.search('(\+svn[r|\-]?)', pversion)
|
||||
if tag and svn_prefix:
|
||||
pupver = tag + svn_prefix.group() + pupver
|
||||
|
||||
elif type == 'cvs':
|
||||
pupver = "HEAD"
|
||||
pstatus = "UPDATE"
|
||||
|
|
|
|||
Loading…
Reference in New Issue