[oe] [OE-core] [meta-oe][rocko][PATCH] protobuf: fix SRC_URI by removing branch

[George McCollister]

On Wed, May 30, 2018 at 8:27 AM, Martin Jansa <martin.jansa at gmail.com> wrote:
> 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.

Sounds good, I agree.

>
> 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).

I specifically sent it to both lists because the original discussion
was on openembedded-core while I knew the correct place to send the
patch is openembedded-devel. Next time I won't send it to the wrong
list, I'll just send a separate reply to the thread stating I have
sent a patch to the correct list.

>
> On Wed, May 30, 2018 at 3:19 PM George McCollister
> <george.mccollister at gmail.com> wrote:
>>
>> On Wed, May 30, 2018 at 8:08 AM, Martin Jansa <martin.jansa at gmail.com>
>> wrote:
>> > This doesn't just rely on SRCREV (bitbake fetcher would be complaining
>> > if
>> > the SRCREV isn't found in the branch used in SRC_URI), it relies on this
>> > SRCREV to be in master branch (which is the default branch for git
>> > fetcher):
>>
>> Okay, point taken.
>>
>> >
>> > docker-shr @ ~/projects/protobuf $ git branch -a --contains
>> > b04e5cba356212e4e8c66c61bbe0c3a20537c5b9
>> > * master
>>
>> Since it's in master the patch should work fine anyway. Should I
>> update the commit message and add branch=master or just leave it as
>> is?
>>
>> >   remotes/origin/3.5.1.1
>> >   remotes/origin/3.5.x
>> >   remotes/origin/3.6.x
>> >   remotes/origin/HEAD -> origin/master
>> >   remotes/origin/cython_protobuf
>> >   remotes/origin/master
>> >   remotes/origin/php-generated-dev
>> >   remotes/origin/python-wheel
>> >   remotes/origin/python_deps
>> >
>> >
>> > On Wed, May 30, 2018 at 3:01 PM George McCollister
>> > <george.mccollister at gmail.com> wrote:
>> >>
>> >> The 3.4.x branch was removed upstream but the commit referenced in
>> >> SRCREV is the 3.4.1 release and is still available:
>> >> https://github.com/google/protobuf/releases/tag/v3.4.1
>> >>
>> >> Drop branch=3.4.x from SRC_URI and just rely on SRCREV.
>> >>
>> >> Signed-off-by: George McCollister <george.mccollister at gmail.com>
>> >> ---
>> >>  meta-oe/recipes-devtools/protobuf/protobuf_3.4.1.bb | 2 +-
>> >>  1 file changed, 1 insertion(+), 1 deletion(-)
>> >>
>> >> diff --git a/meta-oe/recipes-devtools/protobuf/protobuf_3.4.1.bb
>> >> b/meta-oe/recipes-devtools/protobuf/protobuf_3.4.1.bb
>> >> index fae7c18a1..fe28f475a 100644
>> >> --- a/meta-oe/recipes-devtools/protobuf/protobuf_3.4.1.bb
>> >> +++ b/meta-oe/recipes-devtools/protobuf/protobuf_3.4.1.bb
>> >> @@ -18,7 +18,7 @@ SRCREV = "b04e5cba356212e4e8c66c61bbe0c3a20537c5b9"
>> >>
>> >>  PV = "3.4.1+git${SRCPV}"
>> >>
>> >> -SRC_URI = "git://github.com/google/protobuf.git;branch=3.4.x"
>> >> +SRC_URI = "git://github.com/google/protobuf.git"
>> >>
>> >>  EXTRA_OECONF += " --with-protoc=echo"
>> >>
>> >> --
>> >> 2.11.0
>> >>
>> >> --
>> >> _______________________________________________
>> >> Openembedded-core mailing list
>> >> Openembedded-core at lists.openembedded.org
>> >> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>>
>> Regards,
>> George