[meta-oe,rocko,v2] protobuf: fix SRC_URI by removing branch

Submitted by George McCollister on May 30, 2018, 1:47 p.m. | Patch ID: 151242

Details

Message ID 20180530134741.29397-1-george.mccollister@gmail.com
State New
Delegated to: Armin Kuster
Headers show

Commit Message

George McCollister May 30, 2018, 1:47 p.m.
The 3.4.x branch was removed upstream but the commit referenced in
SRC_REV 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 use commit specified in SRC_REV from
the master branch.

Signed-off-by: George McCollister <george.mccollister@gmail.com>
---

v2:
 - Correct commit message.

 meta-oe/recipes-devtools/protobuf/protobuf_3.4.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

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"
 

Comments

Khem Raj May 30, 2018, 3:15 p.m.
Can you try this patch with

Bitbake -cleanall recipe

And bake it again

On Wed, May 30, 2018 at 6:48 AM George McCollister <
george.mccollister@gmail.com> wrote:

> The 3.4.x branch was removed upstream but the commit referenced in
> SRC_REV 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 use commit specified in SRC_REV from
> the master branch.
>
> Signed-off-by: George McCollister <george.mccollister@gmail.com>
> ---
>
> v2:
>  - Correct commit message.
>
>  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
>
>
George McCollister May 30, 2018, 3:29 p.m.
On Wed, May 30, 2018 at 10:15 AM, Khem Raj <raj.khem@gmail.com> wrote:
> Can you try this patch with
>
> Bitbake -cleanall recipe
>
> And bake it again

bitbake -c cleanall protobuf
bitbake protobuf

Works fine for me with the patch applied. Did you run into a problem
or have a concern?

>
> On Wed, May 30, 2018 at 6:48 AM George McCollister
> <george.mccollister@gmail.com> wrote:
>>
>> The 3.4.x branch was removed upstream but the commit referenced in
>> SRC_REV 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 use commit specified in SRC_REV from
>> the master branch.
>>
>> Signed-off-by: George McCollister <george.mccollister@gmail.com>
>> ---
>>
>> v2:
>>  - Correct commit message.
>>
>>  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
>>
>
Khem Raj May 30, 2018, 4:40 p.m.
On Wed, May 30, 2018 at 8:29 AM, George McCollister
<george.mccollister@gmail.com> wrote:
> On Wed, May 30, 2018 at 10:15 AM, Khem Raj <raj.khem@gmail.com> wrote:
>> Can you try this patch with
>>
>> Bitbake -cleanall recipe
>>
>> And bake it again
>
> bitbake -c cleanall protobuf
> bitbake protobuf
>
> Works fine for me with the patch applied. Did you run into a problem
> or have a concern?
>

yes my concern was that your local git repo for protobuf might have some
commits which might not be available in upstream repo. So checking out
a fresh copy from upstreaming and building it is required.
Martin Jansa May 30, 2018, 4:50 p.m.
FWIW: I've checked it in fresh checkout with "git branch -a --contains"
shown before.

On Wed, May 30, 2018 at 6:41 PM Khem Raj <raj.khem@gmail.com> wrote:

> On Wed, May 30, 2018 at 8:29 AM, George McCollister
> <george.mccollister@gmail.com> wrote:
> > On Wed, May 30, 2018 at 10:15 AM, Khem Raj <raj.khem@gmail.com> wrote:
> >> Can you try this patch with
> >>
> >> Bitbake -cleanall recipe
> >>
> >> And bake it again
> >
> > bitbake -c cleanall protobuf
> > bitbake protobuf
> >
> > Works fine for me with the patch applied. Did you run into a problem
> > or have a concern?
> >
>
> yes my concern was that your local git repo for protobuf might have some
> commits which might not be available in upstream repo. So checking out
> a fresh copy from upstreaming and building it is required.
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
Khem Raj May 30, 2018, 7:20 p.m.
ok thanks for confirming

On Wed, May 30, 2018 at 9:50 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> FWIW: I've checked it in fresh checkout with "git branch -a --contains"
> shown before.
>
> On Wed, May 30, 2018 at 6:41 PM Khem Raj <raj.khem@gmail.com> wrote:
>>
>> On Wed, May 30, 2018 at 8:29 AM, George McCollister
>> <george.mccollister@gmail.com> wrote:
>> > On Wed, May 30, 2018 at 10:15 AM, Khem Raj <raj.khem@gmail.com> wrote:
>> >> Can you try this patch with
>> >>
>> >> Bitbake -cleanall recipe
>> >>
>> >> And bake it again
>> >
>> > bitbake -c cleanall protobuf
>> > bitbake protobuf
>> >
>> > Works fine for me with the patch applied. Did you run into a problem
>> > or have a concern?
>> >
>>
>> yes my concern was that your local git repo for protobuf might have some
>> commits which might not be available in upstream repo. So checking out
>> a fresh copy from upstreaming and building it is required.
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel