<div dir="ltr">The change itself is OK, but you should update the commit message so that other people won't get bad idea about how the fetcher works.<div><br></div><div>Also please don't send meta-oe patches to both lists, it should go just to openembedded-devel (to prevent both patchwork instances picking this change).</div></div><br><div class="gmail_quote"><div dir="ltr">On Wed, May 30, 2018 at 3:19 PM George McCollister <<a href="mailto:george.mccollister@gmail.com">george.mccollister@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On Wed, May 30, 2018 at 8:08 AM, Martin Jansa <<a href="mailto:martin.jansa@gmail.com" target="_blank">martin.jansa@gmail.com</a>> wrote:<br>
> This doesn't just rely on SRCREV (bitbake fetcher would be complaining if<br>
> the SRCREV isn't found in the branch used in SRC_URI), it relies on this<br>
> SRCREV to be in master branch (which is the default branch for git fetcher):<br>
<br>
Okay, point taken.<br>
<br>
><br>
> docker-shr @ ~/projects/protobuf $ git branch -a --contains<br>
> b04e5cba356212e4e8c66c61bbe0c3a20537c5b9<br>
> * master<br>
<br>
Since it's in master the patch should work fine anyway. Should I<br>
update the commit message and add branch=master or just leave it as<br>
is?<br>
<br>
> remotes/origin/<a href="http://3.5.1.1" rel="noreferrer" target="_blank">3.5.1.1</a><br>
> remotes/origin/3.5.x<br>
> remotes/origin/3.6.x<br>
> remotes/origin/HEAD -> origin/master<br>
> remotes/origin/cython_protobuf<br>
> remotes/origin/master<br>
> remotes/origin/php-generated-dev<br>
> remotes/origin/python-wheel<br>
> remotes/origin/python_deps<br>
><br>
><br>
> On Wed, May 30, 2018 at 3:01 PM George McCollister<br>
> <<a href="mailto:george.mccollister@gmail.com" target="_blank">george.mccollister@gmail.com</a>> wrote:<br>
>><br>
>> The 3.4.x branch was removed upstream but the commit referenced in<br>
>> SRCREV is the 3.4.1 release and is still available:<br>
>> <a href="https://github.com/google/protobuf/releases/tag/v3.4.1" rel="noreferrer" target="_blank">https://github.com/google/protobuf/releases/tag/v3.4.1</a><br>
>><br>
>> Drop branch=3.4.x from SRC_URI and just rely on SRCREV.<br>
>><br>
>> Signed-off-by: George McCollister <<a href="mailto:george.mccollister@gmail.com" target="_blank">george.mccollister@gmail.com</a>><br>
>> ---<br>
>> meta-oe/recipes-devtools/protobuf/<a href="http://protobuf_3.4.1.bb" rel="noreferrer" target="_blank">protobuf_3.4.1.bb</a> | 2 +-<br>
>> 1 file changed, 1 insertion(+), 1 deletion(-)<br>
>><br>
>> diff --git a/meta-oe/recipes-devtools/protobuf/<a href="http://protobuf_3.4.1.bb" rel="noreferrer" target="_blank">protobuf_3.4.1.bb</a><br>
>> b/meta-oe/recipes-devtools/protobuf/<a href="http://protobuf_3.4.1.bb" rel="noreferrer" target="_blank">protobuf_3.4.1.bb</a><br>
>> index fae7c18a1..fe28f475a 100644<br>
>> --- a/meta-oe/recipes-devtools/protobuf/<a href="http://protobuf_3.4.1.bb" rel="noreferrer" target="_blank">protobuf_3.4.1.bb</a><br>
>> +++ b/meta-oe/recipes-devtools/protobuf/<a href="http://protobuf_3.4.1.bb" rel="noreferrer" target="_blank">protobuf_3.4.1.bb</a><br>
>> @@ -18,7 +18,7 @@ SRCREV = "b04e5cba356212e4e8c66c61bbe0c3a20537c5b9"<br>
>><br>
>> PV = "3.4.1+git${SRCPV}"<br>
>><br>
>> -SRC_URI = "git://<a href="http://github.com/google/protobuf.git;branch=3.4.x" rel="noreferrer" target="_blank">github.com/google/protobuf.git;branch=3.4.x</a>"<br>
>> +SRC_URI = "git://<a href="http://github.com/google/protobuf.git" rel="noreferrer" target="_blank">github.com/google/protobuf.git</a>"<br>
>><br>
>> EXTRA_OECONF += " --with-protoc=echo"<br>
>><br>
>> --<br>
>> 2.11.0<br>
>><br>
>> --<br>
>> _______________________________________________<br>
>> Openembedded-core mailing list<br>
>> <a href="mailto:Openembedded-core@lists.openembedded.org" target="_blank">Openembedded-core@lists.openembedded.org</a><br>
>> <a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
<br>
Regards,<br>
George<br>
</blockquote></div>