Patchwork [v2] btrfs-tools: added PV to git package recipe

login
register
mail settings
Submitter Emilia Ciobanu
Date March 1, 2013, 12:19 p.m.
Message ID <1362140387-5761-1-git-send-email-emilia.maria.silvia.ciobanu@intel.com>
Download mbox | patch
Permalink /patch/45355/
State New
Headers show

Comments

Emilia Ciobanu - March 1, 2013, 12:19 p.m.
Signed-off-by: Emilia Ciobanu <emilia.maria.silvia.ciobanu@intel.com>
---
 .../btrfs-tools/btrfs-tools_git.bb                 |    2 ++
 1 file changed, 2 insertions(+)
Richard Purdie - March 1, 2013, 12:41 p.m.
On Fri, 2013-03-01 at 14:19 +0200, Emilia Ciobanu wrote:
> Signed-off-by: Emilia Ciobanu <emilia.maria.silvia.ciobanu@intel.com>
> ---
>  .../btrfs-tools/btrfs-tools_git.bb                 |    2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
> index e963a74..df216b1 100644
> --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
> +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
> @@ -17,6 +17,8 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git;p
>  
>  S = "${WORKDIR}/git"
>  
> +PV = "0.20-rc1+git${SRCPV}"
> +
>  PR = "r6"

Sadly this won't allow an upgrade path to 0.20 when its released.

We'd either need to use 0.20~rc1 or 0.19+0.20-rc1 as the string.

Cheers,

Richard
Saul Wold - March 1, 2013, 7:11 p.m.
On 03/01/2013 04:41 AM, Richard Purdie wrote:
> On Fri, 2013-03-01 at 14:19 +0200, Emilia Ciobanu wrote:
>> Signed-off-by: Emilia Ciobanu <emilia.maria.silvia.ciobanu@intel.com>
>> ---
>>   .../btrfs-tools/btrfs-tools_git.bb                 |    2 ++
>>   1 file changed, 2 insertions(+)
>>
>> diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
>> index e963a74..df216b1 100644
>> --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
>> +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
>> @@ -17,6 +17,8 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git;p
>>
>>   S = "${WORKDIR}/git"
>>
>> +PV = "0.20-rc1+git${SRCPV}"
>> +
>>   PR = "r6"
>
> Sadly this won't allow an upgrade path to 0.20 when its released.
>
> We'd either need to use 0.20~rc1 or 0.19+0.20-rc1 as the string.

I would suggest the 0.20~rc1 variation since the Git Rev we are at is 
already beyong 0.20-rc1 tag.

Sau!

>
> Cheers,
>
> Richard
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
>
Martin Jansa - March 1, 2013, 7:24 p.m.
I don't think 0.20~rc1 sorts lower then 0.20 at least in opkg world:

OE @ ~/projects/opkg-utils $ ./opkg-compare-versions 0.20~rc1 '<=' 0.20 &&
echo "Y"
OE @ ~/projects/opkg-utils $ ./opkg-compare-versions 0.20-rc1 '<=' 0.20 &&
echo "Y"
OE @ ~/projects/opkg-utils $ ./opkg-compare-versions 0.19+0.20~rc1 '<='
0.20 && echo "Y"
Y
OE @ ~/projects/opkg-utils $ ./opkg-compare-versions 0.19+0.20-rc1 '<='
0.20 && echo "Y"
Y



On Fri, Mar 1, 2013 at 8:11 PM, Saul Wold <sgw@linux.intel.com> wrote:

> On 03/01/2013 04:41 AM, Richard Purdie wrote:
>
>> On Fri, 2013-03-01 at 14:19 +0200, Emilia Ciobanu wrote:
>>
>>> Signed-off-by: Emilia Ciobanu <emilia.maria.silvia.ciobanu@**intel.com<emilia.maria.silvia.ciobanu@intel.com>
>>> >
>>> ---
>>>   .../btrfs-tools/btrfs-tools_**git.bb <http://btrfs-tools_git.bb>
>>>             |    2 ++
>>>   1 file changed, 2 insertions(+)
>>>
>>> diff --git a/meta/recipes-devtools/btrfs-**tools/btrfs-tools_git.bbb/meta/recipes-devtools/btrfs-
>>> **tools/btrfs-tools_git.bb
>>> index e963a74..df216b1 100644
>>> --- a/meta/recipes-devtools/btrfs-**tools/btrfs-tools_git.bb
>>> +++ b/meta/recipes-devtools/btrfs-**tools/btrfs-tools_git.bb
>>> @@ -17,6 +17,8 @@ SRC_URI = "git://git.kernel.org/pub/scm/**
>>> linux/kernel/git/mason/btrfs-**progs.git;p<http://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git;p>
>>>
>>>   S = "${WORKDIR}/git"
>>>
>>> +PV = "0.20-rc1+git${SRCPV}"
>>> +
>>>   PR = "r6"
>>>
>>
>> Sadly this won't allow an upgrade path to 0.20 when its released.
>>
>> We'd either need to use 0.20~rc1 or 0.19+0.20-rc1 as the string.
>>
>
> I would suggest the 0.20~rc1 variation since the Git Rev we are at is
> already beyong 0.20-rc1 tag.
>
> Sau!
>
>
>
>> Cheers,
>>
>> Richard
>>
>>
>> ______________________________**_________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.**openembedded.org<Openembedded-core@lists.openembedded.org>
>> http://lists.linuxtogo.org/**cgi-bin/mailman/listinfo/**openembedded-core<http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core>
>>
>>
>>
> ______________________________**_________________
> Openembedded-core mailing list
> Openembedded-core@lists.**openembedded.org<Openembedded-core@lists.openembedded.org>
> http://lists.linuxtogo.org/**cgi-bin/mailman/listinfo/**openembedded-core<http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core>
>
Ross Burton - March 1, 2013, 11:09 p.m.
On 1 March 2013 19:24, Martin Jansa <martin.jansa@gmail.com> wrote:
> I don't think 0.20~rc1 sorts lower then 0.20 at least in opkg world:

Hmph, stupid opkg. That's just a quick change to the comparison logic
though right? Deb and rpm have these semantics for ~.

Ross
Richard Purdie - March 1, 2013, 11:19 p.m.
On Fri, 2013-03-01 at 23:09 +0000, Burton, Ross wrote:
> On 1 March 2013 19:24, Martin Jansa <martin.jansa@gmail.com> wrote:
> > I don't think 0.20~rc1 sorts lower then 0.20 at least in opkg world:
> 
> Hmph, stupid opkg. That's just a quick change to the comparison logic
> though right? Deb and rpm have these semantics for ~.

I'm sure I've seen changes for opkg itself and I think this util is out
of sync with the changes in opkg itself. It should really link against
libopkg and use the *same* version comparison algorithm.

Cheers,

Richard
Richard Purdie - March 1, 2013, 11:46 p.m.
On Fri, 2013-03-01 at 20:24 +0100, Martin Jansa wrote:
> I don't think 0.20~rc1 sorts lower then 0.20 at least in opkg world:
> 
> 
> OE @ ~/projects/opkg-utils $ ./opkg-compare-versions 0.20~rc1 '<='
> 0.20 && echo "Y"
> OE @ ~/projects/opkg-utils $ ./opkg-compare-versions 0.20-rc1 '<='
> 0.20 && echo "Y"
> OE @ ~/projects/opkg-utils $ ./opkg-compare-versions 0.19+0.20~rc1
> '<=' 0.20 && echo "Y"
> Y
> OE @ ~/projects/opkg-utils $ ./opkg-compare-versions 0.19+0.20-rc1
> '<=' 0.20 && echo "Y"
> Y

Just to follow up, I added this support to opkg itself back in 2008:

http://code.google.com/p/opkg/source/detail?spec=svn40&r=40

It would be nice to finally be able to start using it!

Cheers,

Richard
Emilia Ciobanu - March 4, 2013, 8:42 a.m.
I've tried building the package after added the "0.20~rc1" tag for 
PV. This format for the tag doesn't seem to be supported. I
get the following error:
 invalid tag value("^[A-Za-z0-9+._]+$") Version: Version: 0.20~rc1+git0+fdb6c0402337d9607c7a39155088eaf033742752

Thanks,
Ema
Richard Purdie - March 4, 2013, 10:03 a.m.
On Mon, 2013-03-04 at 08:42 +0000, Ciobanu, Emilia Maria Silvia wrote:
> I've tried building the package after added the "0.20~rc1" tag for 
> PV. This format for the tag doesn't seem to be supported. I
> get the following error:
>  invalid tag value("^[A-Za-z0-9+._]+$") Version: Version: 0.20~rc1+git0+fdb6c0402337d9607c7a39155088eaf033742752

Which part of the system did that error come from?

From what you've said, we should probably go with 0.19 for now and if we
upgrade past the tag, switch to 0.19+0.20-rc1.

We need to open a bug about ~ not working in package versions with the
bug in opkg-compare-versions and the above issue being mentioned.

Cheers,

Richard
Emilia Ciobanu - March 4, 2013, 11:13 a.m.
The error appeared at do_package.
I've attached the logfile.

Thanks,
Ema

Patch

diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
index e963a74..df216b1 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb
@@ -17,6 +17,8 @@  SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git;p
 
 S = "${WORKDIR}/git"
 
+PV = "0.20-rc1+git${SRCPV}"
+
 PR = "r6"
 
 SRC_URI += " file://fix_use_of_gcc.patch \