<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="Title" content="">
<meta name="Keywords" content="">
<meta name="Generator" content="Microsoft Word 15 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
{font-family:DengXian;
panose-1:2 1 6 0 3 1 1 1 1 1;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri",sans-serif;}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
text-decoration:underline;}
span.EmailStyle17
{mso-style-type:personal-reply;
font-family:"Calibri",sans-serif;
color:windowtext;}
span.msoIns
{mso-style-type:export-only;
mso-style-name:"";
text-decoration:underline;
color:teal;}
.MsoChpDefault
{mso-style-type:export-only;
font-size:10.0pt;}
@page WordSection1
{size:595.0pt 842.0pt;
margin:72.0pt 72.0pt 72.0pt 72.0pt;}
div.WordSection1
{page:WordSection1;}
--></style>
</head>
<body bgcolor="white" lang="EN-GB" link="blue" vlink="purple">
<div class="WordSection1">
<p class="MsoNormal">Thank you, please let me know if the patch need a v2.<o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal">Rebecca<o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<div style="border:none;border-top:solid #B5C4DF 1.0pt;padding:3.0pt 0cm 0cm 0cm">
<p class="MsoNormal"><b><span style="font-size:12.0pt;color:black">From: </span></b><span style="font-size:12.0pt;color:black">Ross Burton <ross.burton@intel.com><br>
<b>Date: </b>Monday, 11 December 2017 at 9:34 PM<br>
<b>To: </b>"Chang, Rebecca Swee Fun" <rebecca.swee.fun.chang@intel.com><br>
<b>Cc: </b>OpenEmbedded Core Mailing List <openembedded-core@lists.openembedded.org><br>
<b>Subject: </b>Re: [OE-core] [PATCH] recipetool: create: fix conflict between SRCREV and tag<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal">I think there were selftest failures and I removed it to see what happened, added back again now.
<o:p></o:p></p>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal">Ross<o:p></o:p></p>
</div>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
<div>
<p class="MsoNormal">On 11 December 2017 at 01:10, Chang, Rebecca Swee Fun <<a href="mailto:rebecca.swee.fun.chang@intel.com" target="_blank">rebecca.swee.fun.chang@intel.com</a>> wrote:<o:p></o:p></p>
<blockquote style="border:none;border-left:solid #CCCCCC 1.0pt;padding:0cm 0cm 0cm 6.0pt;margin-left:4.8pt;margin-right:0cm">
<p class="MsoNormal">Ping again.<br>
I noticed that it was on mut2 2 weeks ago. I think this was dropped somehow at that point. May I know what I can do in order to make it into M1 cycle?<br>
<br>
Thanks,<br>
Rebecca<o:p></o:p></p>
<div>
<div>
<p class="MsoNormal"><br>
<br>
On 15/11/2017, 10:00 AM, "<a href="mailto:openembedded-core-bounces@lists.openembedded.org">openembedded-core-bounces@lists.openembedded.org</a> on behalf of Chang Rebecca Swee Fun" <<a href="mailto:openembedded-core-bounces@lists.openembedded.org">openembedded-core-bounces@lists.openembedded.org</a>
on behalf of <a href="mailto:rebecca.swee.fun.chang@intel.com">rebecca.swee.fun.chang@intel.com</a>> wrote:<br>
<br>
If you specify 'tag=' for a git URL and passed to recipetool create, you<br>
will get into Bitbake expansion error shown below:<br>
<br>
----- snip -----<br>
$ devtool add --version 2.4.2 mbedtls "git://<a href="http://github.com/ARMmbed/mbedtls;tag=mbedtls-2.4.2" target="_blank">github.com/ARMmbed/mbedtls;tag=mbedtls-2.4.2</a>"<br>
...<br>
bb.data_smart.ExpansionError: Failure expanding variable SRCPV, expression was ${@bb.fetch2.get_srcrev(d)} which triggered exception FetchError: Fetcher failure: Conflicting revisions (abeccb9dbd7e19ae91ac50e1edd3803111c5f9b6 from SRCREV and mbedtls-2.4.2
from the url) found, please specify one valid value<br>
----- snip -----<br>
<br>
Assuming the tag is valid, we should get the tag commit hash and<br>
drop the usage of 'tag=' from SRC_URI. By using a commit hash<br>
corresponding to the tag will prevent bitbake from accessing<br>
remote repository in order to expand SRCPV.<br>
<br>
Signed-off-by: Chang Rebecca Swee Fun <<a href="mailto:rebecca.swee.fun.chang@intel.com">rebecca.swee.fun.chang@intel.com</a>><br>
---<br>
scripts/lib/recipetool/create.py | 8 ++++----<br>
1 file changed, 4 insertions(+), 4 deletions(-)<br>
<br>
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py<br>
index 54e7e85..2fc9e0a 100644<br>
--- a/scripts/lib/recipetool/create.py<br>
+++ b/scripts/lib/recipetool/create.py<br>
@@ -480,7 +480,6 @@ def create_recipe(args):<br>
if tag:<br>
# Keep a copy of tag and append nobranch=1 then remove tag from URL.<br>
# Bitbake fetcher unable to fetch when {AUTOREV} and tag is set at the same time.<br>
- # We will re-introduce tag argument after bitbake fetcher process is complete.<br>
storeTagName = params['tag']<br>
params['nobranch'] = '1'<br>
del params['tag']<br>
@@ -552,13 +551,11 @@ def create_recipe(args):<br>
<br>
# Since we might have a value in srcbranch, we need to<br>
# recontruct the srcuri to include 'branch' in params.<br>
+ scheme, network, path, user, passwd, params = bb.fetch2.decodeurl(srcuri)<br>
if srcbranch:<br>
- scheme, network, path, user, passwd, params = bb.fetch2.decodeurl(srcuri)<br>
params['branch'] = srcbranch<br>
- srcuri = bb.fetch2.encodeurl((scheme, network, path, user, passwd, params))<br>
<br>
if storeTagName and scheme in ['git', 'gitsm']:<br>
- # Re-introduced tag variable from storeTagName<br>
# Check srcrev using tag and check validity of the tag<br>
cmd = ('git rev-parse --verify %s' % (storeTagName))<br>
try:<br>
@@ -568,6 +565,9 @@ def create_recipe(args):<br>
logger.error(str(err))<br>
logger.error("Possibly wrong tag name is provided")<br>
sys.exit(1)<br>
+ # Drop tag from srcuri as it will have conflicts with SRCREV during recipe parse.<br>
+ del params['tag']<br>
+ srcuri = bb.fetch2.encodeurl((scheme, network, path, user, passwd, params))<br>
<br>
if os.path.exists(os.path.join(srctree, '.gitmodules')) and srcuri.startswith('git://'):<br>
srcuri = 'gitsm://' + srcuri[6:]<br>
--<br>
2.7.4<br>
<br>
--<br>
_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" target="_blank">
http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
<br>
<br>
--<br>
_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><o:p></o:p></p>
</div>
</div>
</blockquote>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
</div>
</body>
</html>