<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body text="#000000" bgcolor="#FFFFFF">
<div class="moz-cite-prefix">On 6/1/19 4:27 AM, Alexander Kanavin
wrote:<br>
</div>
<blockquote type="cite"
cite="mid:CANNYZj88dNfVa1DfXPFuOSHbeZw8BBhh8qgycLPgf=MM7s7pDg@mail.gmail.com">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<div dir="ltr">
<div class="gmail_quote">
<div dir="ltr" class="gmail_attr">On Sun, 12 May 2019 at
10:18, Hongxu Jia <<a
href="mailto:hongxu.jia@windriver.com"
moz-do-not-send="true">hongxu.jia@windriver.com</a>>
wrote:<br>
</div>
<blockquote class="gmail_quote" style="margin:0px 0px 0px
0.8ex;border-left:1px solid
rgb(204,204,204);padding-left:1ex">The upstream git tag has
a `upstream/' prefix, such as:<br>
>>> import re<br>
>>> pattern =
"upstream/(?P<pver>\d+(\.\d+)+(\+\d+)*)"<br>
>>> string = "upstream/6.1+20181013"<br>
>>> result = re.match(pattern, string)<br>
>>> result['pver']<br>
'6.1+20181013'<br>
</blockquote>
<div><br>
</div>
<div>Have you checked with devtool that this actually works?</div>
<div><br>
</div>
</div>
</div>
</blockquote>
<p>I am afraid no, I did not run devtool it before</p>
<p><br>
</p>
<blockquote type="cite"
cite="mid:CANNYZj88dNfVa1DfXPFuOSHbeZw8BBhh8qgycLPgf=MM7s7pDg@mail.gmail.com">
<div dir="ltr">
<div class="gmail_quote">
<div> Before this commit:</div>
<div>alexander@alexander-box:~/development/poky$ devtool
check-upgrade-status ncurses<br>
INFO: ncurses 6.1 6.1+20181013
Hongxu Jia <<a href="mailto:hongxu.jia@windriver.com"
moz-do-not-send="true">hongxu.jia@windriver.com</a>>
7a97a7f937762ba342d5b2fd7cd090885a809835</div>
<div><br>
</div>
</div>
</div>
</blockquote>
<p>Then I know the script, and run it, I am afraid only revert is
not sufficient.</p>
<p>The current ncurses version is `6.1+20181013' rather than `6.1',
since upstream latest</p>
<p>version is `6.1+20181013', but auth email incorrect report
ncurses should be upgraded</p>
<p>(that's why I try to fix UPSTREAM_CHECK_GITTAGREGEX, but it seems
a wrong try)</p>
<p><br>
</p>
<p>Thanks to your mention of devtool, I know how auth works, and
trace the root cause,</p>
<p>then I found in the following commit, it filters out `+' from git
pv, but in ncurse case,</p>
<p>`+' is part of version<br>
</p>
<p>...<br>
</p>
<p>commit ab609c471d85be3248b789c8ab2813957cd97e29<br>
Author: Alexander Kanavin
<a class="moz-txt-link-rfc2396E" href="mailto:alexander.kanavin@linux.intel.com"><alexander.kanavin@linux.intel.com></a><br>
Date: Mon Aug 3 19:29:54 2015 +0300<br>
<br>
recipeutils.py: allow all characters in regexes used to parse
version strings<br>
<br>
Previously only numeric characters were matches and anything
else was<br>
discarded, so 4.0-rc3, 2005e, 1.0.2a and similar versions got
truncated.<br>
<br>
Signed-off-by: Alexander Kanavin
<a class="moz-txt-link-rfc2396E" href="mailto:alexander.kanavin@linux.intel.com"><alexander.kanavin@linux.intel.com></a><br>
Signed-off-by: Richard Purdie
<a class="moz-txt-link-rfc2396E" href="mailto:richard.purdie@linuxfoundation.org"><richard.purdie@linuxfoundation.org></a><br>
<br>
diff --git a/meta/lib/oe/recipeutils.py
b/meta/lib/oe/recipeutils.py<br>
index 9d45b42..cd74213 100644<br>
--- a/meta/lib/oe/recipeutils.py<br>
+++ b/meta/lib/oe/recipeutils.py<br>
@@ -638,7 +638,7 @@ def get_recipe_pv_without_srcpv(pv, uri_type):<br>
sfx = ''<br>
<br>
if uri_type == 'git':<br>
- git_regex =
re.compile("(?P<pfx>(v|))(?P<ver>((\d+[\.\-_]*)+))(?P<sfx>(\+|)(git|)(r|)(AUTOINC|)(\+|))(?P<rev>.*)")<br>
+ git_regex =
re.compile("(?P<pfx>v?)(?P<ver>[^\+]*)((?P<sfx>\+(git)?r?(AUTOINC\+))(?P<rev>.*))?")<br>
m = git_regex.match(pv)<br>
<br>
if m:<br>
</p>
<p>...</p>
<p>I believe the commit is to parse manually PV in **_git.bb (such
as `PV = "1.9.0+git${SRCPV}"' ),</p>
<p>which contains `+gitAUTOINC+' in PV, but the regrex is not
suitable for ncurses version</p>
<p><br>
</p>
<p>//Hongxu<br>
</p>
<p><br>
</p>
<blockquote type="cite"
cite="mid:CANNYZj88dNfVa1DfXPFuOSHbeZw8BBhh8qgycLPgf=MM7s7pDg@mail.gmail.com">
<div dir="ltr">
<div class="gmail_quote">
<div>After the commit:<br>
</div>
<div>alexander@alexander-box:~/development/poky$ devtool
check-upgrade-status ncurses</div>
<div>INFO: ncurses 6.1
UNKNOWN_BROKEN Hongxu Jia <<a
href="mailto:hongxu.jia@windriver.com"
moz-do-not-send="true">hongxu.jia@windriver.com</a>> <br>
</div>
<div><br>
</div>
<div>The code in bitbake/lib/bb/fetch2/git.py actually splits
each tag with '/' as separator and takes only the last part
for some reason, so those prefixes are never a part of the
string that is matched against regex.<br>
</div>
<div>I'll send a revert in a moment.</div>
<div><br>
</div>
<div>Alex<br>
</div>
<div><br>
</div>
<div><br>
</div>
</div>
</div>
</blockquote>
<p><br>
</p>
</body>
</html>