Patchwork [meta-oe] libav: Fix git URI

login
register
mail settings
Submitter Gary Thomas
Date Oct. 18, 2012, 4:51 p.m.
Message ID <1350579089-23342-1-git-send-email-gary@mlbassoc.com>
Download mbox | patch
Permalink /patch/38287/
State Rejected
Headers show

Comments

Gary Thomas - Oct. 18, 2012, 4:51 p.m.
Specifying SRCREV and branch in the git SRC_URI confuses the bitbake
fetcher.  This ends up with a saved tarball which contains neither
the SRCREV nor the branch, which in turn means the git tree needs
to be fetched every time even though a saved tarball has been created.

Simply removing the branch (which is redundant anyway) from the SRC_URI
makes everything happy.

Signed-off-by: Gary Thomas <gary@mlbassoc.com>
---
 meta-oe/recipes-multimedia/libav/libav_0.8.3.bb |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Martin Jansa - Oct. 18, 2012, 5:46 p.m.
On Thu, Oct 18, 2012 at 10:51:29AM -0600, Gary Thomas wrote:
> Specifying SRCREV and branch in the git SRC_URI confuses the bitbake
> fetcher.  This ends up with a saved tarball which contains neither
> the SRCREV nor the branch, which in turn means the git tree needs
> to be fetched every time even though a saved tarball has been created.

That's fetcher fault.

Branch is part of persistent db key for LOCALCOUNT, so this breaks
upgrade path.

Also AUTOREV wont work without branch specified in SRC_URI.

Fix bitbake fetcher instead.

Cheers,

 
> Simply removing the branch (which is redundant anyway) from the SRC_URI
> makes everything happy.
> 
> Signed-off-by: Gary Thomas <gary@mlbassoc.com>
> ---
>  meta-oe/recipes-multimedia/libav/libav_0.8.3.bb |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb b/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb
> index 66a32c9..f9a2e06 100644
> --- a/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb
> +++ b/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb
> @@ -6,13 +6,13 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
>                      file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
>  
>  PV = "0.8.3+git${SRCPV}"
> -PR = "${INC_PR}.0"
> +PR = "${INC_PR}.1"
>  
>  # When bumping SRCREV make sure you bump PR here and in dependant
>  # recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION
>  # changes
>  SRCREV = "2fb4be9a99a2c2a9435339830e3d940171cc0d9b"
> -SRC_URI = "git://git.libav.org/libav.git;protocol=git;branch=release/0.8"
> +SRC_URI = "git://git.libav.org/libav.git;protocol=git"
>  
>  S = "${WORKDIR}/git"
>  
> -- 
> 1.7.9.5
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Gary Thomas - Oct. 18, 2012, 6:29 p.m.
On 2012-10-18 11:46, Martin Jansa wrote:
> On Thu, Oct 18, 2012 at 10:51:29AM -0600, Gary Thomas wrote:
>> Specifying SRCREV and branch in the git SRC_URI confuses the bitbake
>> fetcher.  This ends up with a saved tarball which contains neither
>> the SRCREV nor the branch, which in turn means the git tree needs
>> to be fetched every time even though a saved tarball has been created.
>
> That's fetcher fault.
>
> Branch is part of persistent db key for LOCALCOUNT, so this breaks
> upgrade path.
>
> Also AUTOREV wont work without branch specified in SRC_URI.

AUTOREV is not being used, so how does your comment apply?

>
> Fix bitbake fetcher instead.
>
> Cheers,
>
>
>> Simply removing the branch (which is redundant anyway) from the SRC_URI
>> makes everything happy.
>>
>> Signed-off-by: Gary Thomas <gary@mlbassoc.com>
>> ---
>>   meta-oe/recipes-multimedia/libav/libav_0.8.3.bb |    4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb b/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb
>> index 66a32c9..f9a2e06 100644
>> --- a/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb
>> +++ b/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb
>> @@ -6,13 +6,13 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
>>                       file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
>>
>>   PV = "0.8.3+git${SRCPV}"
>> -PR = "${INC_PR}.0"
>> +PR = "${INC_PR}.1"
>>
>>   # When bumping SRCREV make sure you bump PR here and in dependant
>>   # recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION
>>   # changes
>>   SRCREV = "2fb4be9a99a2c2a9435339830e3d940171cc0d9b"
>> -SRC_URI = "git://git.libav.org/libav.git;protocol=git;branch=release/0.8"
>> +SRC_URI = "git://git.libav.org/libav.git;protocol=git"
>>
>>   S = "${WORKDIR}/git"
>>
>> --
>> 1.7.9.5
>>
>>
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
Martin Jansa - Oct. 18, 2012, 6:48 p.m.
On Thu, Oct 18, 2012 at 12:29:00PM -0600, Gary Thomas wrote:
> On 2012-10-18 11:46, Martin Jansa wrote:
> > On Thu, Oct 18, 2012 at 10:51:29AM -0600, Gary Thomas wrote:
> >> Specifying SRCREV and branch in the git SRC_URI confuses the bitbake
> >> fetcher.  This ends up with a saved tarball which contains neither
> >> the SRCREV nor the branch, which in turn means the git tree needs
> >> to be fetched every time even though a saved tarball has been created.
> >
> > That's fetcher fault.
> >
> > Branch is part of persistent db key for LOCALCOUNT, so this breaks
> > upgrade path.
> >
> > Also AUTOREV wont work without branch specified in SRC_URI.
> 
> AUTOREV is not being used, so how does your comment apply?

yes it's good practise to use it from some .inc even or local.conf,
_without_ need to change SRC_URI

> > Fix bitbake fetcher instead.
> >
> > Cheers,
> >
> >
> >> Simply removing the branch (which is redundant anyway) from the SRC_URI
> >> makes everything happy.
> >>
> >> Signed-off-by: Gary Thomas <gary@mlbassoc.com>
> >> ---
> >>   meta-oe/recipes-multimedia/libav/libav_0.8.3.bb |    4 ++--
> >>   1 file changed, 2 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb b/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb
> >> index 66a32c9..f9a2e06 100644
> >> --- a/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb
> >> +++ b/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb
> >> @@ -6,13 +6,13 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
> >>                       file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
> >>
> >>   PV = "0.8.3+git${SRCPV}"
> >> -PR = "${INC_PR}.0"
> >> +PR = "${INC_PR}.1"
> >>
> >>   # When bumping SRCREV make sure you bump PR here and in dependant
> >>   # recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION
> >>   # changes
> >>   SRCREV = "2fb4be9a99a2c2a9435339830e3d940171cc0d9b"
> >> -SRC_URI = "git://git.libav.org/libav.git;protocol=git;branch=release/0.8"
> >> +SRC_URI = "git://git.libav.org/libav.git;protocol=git"
> >>
> >>   S = "${WORKDIR}/git"
> >>
> >> --
> >> 1.7.9.5
> >>
> >>
> >> _______________________________________________
> >> Openembedded-devel mailing list
> >> Openembedded-devel@lists.openembedded.org
> >> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
> >
> >
> >
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
> >
> 
> -- 
> ------------------------------------------------------------
> Gary Thomas                 |  Consulting for the
> MLB Associates              |    Embedded world
> ------------------------------------------------------------
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Gary Thomas - Oct. 18, 2012, 8:05 p.m.
On 2012-10-18 12:48, Martin Jansa wrote:
> On Thu, Oct 18, 2012 at 12:29:00PM -0600, Gary Thomas wrote:
>> On 2012-10-18 11:46, Martin Jansa wrote:
>>> On Thu, Oct 18, 2012 at 10:51:29AM -0600, Gary Thomas wrote:
>>>> Specifying SRCREV and branch in the git SRC_URI confuses the bitbake
>>>> fetcher.  This ends up with a saved tarball which contains neither
>>>> the SRCREV nor the branch, which in turn means the git tree needs
>>>> to be fetched every time even though a saved tarball has been created.
>>>
>>> That's fetcher fault.
>>>
>>> Branch is part of persistent db key for LOCALCOUNT, so this breaks
>>> upgrade path.
>>>
>>> Also AUTOREV wont work without branch specified in SRC_URI.
>>
>> AUTOREV is not being used, so how does your comment apply?
>
> yes it's good practise to use it from some .inc even or local.conf,
> _without_ need to change SRC_URI

But the whole point is to have a specific SRCREV, not AUTOREV.  Having
a recipe which always gets the latest revision is often not advised nor
even allowed in some circles.

This particular recipe obviously wanted to use a particular revision,
not the tip of the "releases/0.8" branch.  Specifying both is contradictory.

>
>>> Fix bitbake fetcher instead.
>>>
>>> Cheers,
>>>
>>>
>>>> Simply removing the branch (which is redundant anyway) from the SRC_URI
>>>> makes everything happy.
>>>>
>>>> Signed-off-by: Gary Thomas <gary@mlbassoc.com>
>>>> ---
>>>>    meta-oe/recipes-multimedia/libav/libav_0.8.3.bb |    4 ++--
>>>>    1 file changed, 2 insertions(+), 2 deletions(-)
>>>>
>>>> diff --git a/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb b/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb
>>>> index 66a32c9..f9a2e06 100644
>>>> --- a/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb
>>>> +++ b/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb
>>>> @@ -6,13 +6,13 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
>>>>                        file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
>>>>
>>>>    PV = "0.8.3+git${SRCPV}"
>>>> -PR = "${INC_PR}.0"
>>>> +PR = "${INC_PR}.1"
>>>>
>>>>    # When bumping SRCREV make sure you bump PR here and in dependant
>>>>    # recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION
>>>>    # changes
>>>>    SRCREV = "2fb4be9a99a2c2a9435339830e3d940171cc0d9b"
>>>> -SRC_URI = "git://git.libav.org/libav.git;protocol=git;branch=release/0.8"
>>>> +SRC_URI = "git://git.libav.org/libav.git;protocol=git"
>>>>
>>>>    S = "${WORKDIR}/git"
>>>>
>>>> --
>>>> 1.7.9.5
>>>>
>>>>
>>>> _______________________________________________
>>>> Openembedded-devel mailing list
>>>> Openembedded-devel@lists.openembedded.org
>>>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>>>
>>>
>>>
>>> _______________________________________________
>>> Openembedded-devel mailing list
>>> Openembedded-devel@lists.openembedded.org
>>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>>>
>>
>> --
>> ------------------------------------------------------------
>> Gary Thomas                 |  Consulting for the
>> MLB Associates              |    Embedded world
>> ------------------------------------------------------------
>>
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>

Patch

diff --git a/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb b/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb
index 66a32c9..f9a2e06 100644
--- a/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb
+++ b/meta-oe/recipes-multimedia/libav/libav_0.8.3.bb
@@ -6,13 +6,13 @@  LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
 
 PV = "0.8.3+git${SRCPV}"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 # When bumping SRCREV make sure you bump PR here and in dependant
 # recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION
 # changes
 SRCREV = "2fb4be9a99a2c2a9435339830e3d940171cc0d9b"
-SRC_URI = "git://git.libav.org/libav.git;protocol=git;branch=release/0.8"
+SRC_URI = "git://git.libav.org/libav.git;protocol=git"
 
 S = "${WORKDIR}/git"