Patchwork package_deb: Remove version from Provides Field

login
register
mail settings
Submitter Ricardo Ribalda Delgado
Date March 13, 2014, 3:31 p.m.
Message ID <1394724708-9894-1-git-send-email-ricardo.ribalda@gmail.com>
Download mbox | patch
Permalink /patch/68603/
State New
Headers show

Comments

Ricardo Ribalda Delgado - March 13, 2014, 3:31 p.m.
According to Debian Policy Manual. Chapter 7.1

All of the fields except for Provides may restrict their applicability
to particular versions of each named package. This is done in
parentheses after each individual package name; the parentheses should
contain a relation from the list below followed by a version number, in
the format described in Version, Section 5.6.12.

This Fixes the following warning:

root@qt5022:~# apt-get update

...

Reading package lists... Done
W: Ignoring Provides line with DepCompareOp for package
pkgconfig__pkg-config__
W: You may want to run apt-get update to correct these problems

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
 meta/classes/package_deb.bbclass | 8 ++++++++
 1 file changed, 8 insertions(+)
Ricardo Ribalda Delgado - March 25, 2014, 8:26 a.m.
Ping

On Thu, Mar 13, 2014 at 4:31 PM, Ricardo Ribalda Delgado
<ricardo.ribalda@gmail.com> wrote:
> According to Debian Policy Manual. Chapter 7.1
>
> All of the fields except for Provides may restrict their applicability
> to particular versions of each named package. This is done in
> parentheses after each individual package name; the parentheses should
> contain a relation from the list below followed by a version number, in
> the format described in Version, Section 5.6.12.
>
> This Fixes the following warning:
>
> root@qt5022:~# apt-get update
>
> ...
>
> Reading package lists... Done
> W: Ignoring Provides line with DepCompareOp for package
> pkgconfig__pkg-config__
> W: You may want to run apt-get update to correct these problems
>
> Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
> ---
>  meta/classes/package_deb.bbclass | 8 ++++++++
>  1 file changed, 8 insertions(+)
>
> diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
> index 2d2f3f1..905af24 100644
> --- a/meta/classes/package_deb.bbclass
> +++ b/meta/classes/package_deb.bbclass
> @@ -322,6 +322,13 @@ python do_package_deb () {
>
>          mapping_rename_hook(localdata)
>
> +        def debian_cmp_purgeversion(var):
> +            # dpkg does not allow versions on Provides.
> +            # From Debian Policy Manual, Chapter 7:
> +            # All of the fields except for Provides may restrict their applicability to particular versions of each named package.
> +            for key in var:
> +                var[key] = []
> +
>          def debian_cmp_remap(var):
>              # dpkg does not allow for '(' or ')' in a dependency name
>              # replace these instances with '__' and '__'
> @@ -359,6 +366,7 @@ python do_package_deb () {
>          debian_cmp_remap(rsuggests)
>          rprovides = bb.utils.explode_dep_versions2(localdata.getVar("RPROVIDES", True) or "")
>          debian_cmp_remap(rprovides)
> +        debian_cmp_purgeversion(rprovides)
>          rreplaces = bb.utils.explode_dep_versions2(localdata.getVar("RREPLACES", True) or "")
>          debian_cmp_remap(rreplaces)
>          rconflicts = bb.utils.explode_dep_versions2(localdata.getVar("RCONFLICTS", True) or "")
> --
> 1.9.0
>
Richard Purdie - March 25, 2014, 8:50 a.m.
On Thu, 2014-03-13 at 16:31 +0100, Ricardo Ribalda Delgado wrote:
> According to Debian Policy Manual. Chapter 7.1
> 
> All of the fields except for Provides may restrict their applicability
> to particular versions of each named package. This is done in
> parentheses after each individual package name; the parentheses should
> contain a relation from the list below followed by a version number, in
> the format described in Version, Section 5.6.12.
> 
> This Fixes the following warning:
> 
> root@qt5022:~# apt-get update
> 
> ...
> 
> Reading package lists... Done
> W: Ignoring Provides line with DepCompareOp for package
> pkgconfig__pkg-config__
> W: You may want to run apt-get update to correct these problems
> 
> Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
> ---
>  meta/classes/package_deb.bbclass | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
> index 2d2f3f1..905af24 100644
> --- a/meta/classes/package_deb.bbclass
> +++ b/meta/classes/package_deb.bbclass
> @@ -322,6 +322,13 @@ python do_package_deb () {
>  
>          mapping_rename_hook(localdata)
>  
> +        def debian_cmp_purgeversion(var):
> +            # dpkg does not allow versions on Provides.
> +            # From Debian Policy Manual, Chapter 7:
> +            # All of the fields except for Provides may restrict their applicability to particular versions of each named package.
> +            for key in var:
> +                var[key] = []
> +
Shouldn't this actually make a version comparison, i.e. if <condition>
then emit the Provides, otherwise don't (looking at the package version
for comparison)?

I can imagine having multiple versions of a recipe, some with provides
and some without, all using the same code.

Cheers,

Richard

         def debian_cmp_remap(var):
>              # dpkg does not allow for '(' or ')' in a dependency name
>              # replace these instances with '__' and '__'
> @@ -359,6 +366,7 @@ python do_package_deb () {
>          debian_cmp_remap(rsuggests)
>          rprovides = bb.utils.explode_dep_versions2(localdata.getVar("RPROVIDES", True) or "")
>          debian_cmp_remap(rprovides)
> +        debian_cmp_purgeversion(rprovides)
>          rreplaces = bb.utils.explode_dep_versions2(localdata.getVar("RREPLACES", True) or "")
>          debian_cmp_remap(rreplaces)
>          rconflicts = bb.utils.explode_dep_versions2(localdata.getVar("RCONFLICTS", True) or "")
Ricardo Ribalda Delgado - March 25, 2014, 8:54 a.m.
Hello Richard

It is ok to have Provides, but they should not have a version number.
If they have a version number a nasty warning appears (as you can see
on the patch). The provided patch just clears all the versions but
keeps the Provides

We could "fix" dpkg to support versioning, but I believe it is better
to just remove the version number from the Provides.

Cheers!

On Tue, Mar 25, 2014 at 9:50 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Thu, 2014-03-13 at 16:31 +0100, Ricardo Ribalda Delgado wrote:
>> According to Debian Policy Manual. Chapter 7.1
>>
>> All of the fields except for Provides may restrict their applicability
>> to particular versions of each named package. This is done in
>> parentheses after each individual package name; the parentheses should
>> contain a relation from the list below followed by a version number, in
>> the format described in Version, Section 5.6.12.
>>
>> This Fixes the following warning:
>>
>> root@qt5022:~# apt-get update
>>
>> ...
>>
>> Reading package lists... Done
>> W: Ignoring Provides line with DepCompareOp for package
>> pkgconfig__pkg-config__
>> W: You may want to run apt-get update to correct these problems
>>
>> Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
>> ---
>>  meta/classes/package_deb.bbclass | 8 ++++++++
>>  1 file changed, 8 insertions(+)
>>
>> diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
>> index 2d2f3f1..905af24 100644
>> --- a/meta/classes/package_deb.bbclass
>> +++ b/meta/classes/package_deb.bbclass
>> @@ -322,6 +322,13 @@ python do_package_deb () {
>>
>>          mapping_rename_hook(localdata)
>>
>> +        def debian_cmp_purgeversion(var):
>> +            # dpkg does not allow versions on Provides.
>> +            # From Debian Policy Manual, Chapter 7:
>> +            # All of the fields except for Provides may restrict their applicability to particular versions of each named package.
>> +            for key in var:
>> +                var[key] = []
>> +
> Shouldn't this actually make a version comparison, i.e. if <condition>
> then emit the Provides, otherwise don't (looking at the package version
> for comparison)?
>
> I can imagine having multiple versions of a recipe, some with provides
> and some without, all using the same code.
>
> Cheers,
>
> Richard
>
>          def debian_cmp_remap(var):
>>              # dpkg does not allow for '(' or ')' in a dependency name
>>              # replace these instances with '__' and '__'
>> @@ -359,6 +366,7 @@ python do_package_deb () {
>>          debian_cmp_remap(rsuggests)
>>          rprovides = bb.utils.explode_dep_versions2(localdata.getVar("RPROVIDES", True) or "")
>>          debian_cmp_remap(rprovides)
>> +        debian_cmp_purgeversion(rprovides)
>>          rreplaces = bb.utils.explode_dep_versions2(localdata.getVar("RREPLACES", True) or "")
>>          debian_cmp_remap(rreplaces)
>>          rconflicts = bb.utils.explode_dep_versions2(localdata.getVar("RCONFLICTS", True) or "")
>
>
Richard Purdie - March 25, 2014, 9:19 a.m.
On Tue, 2014-03-25 at 09:54 +0100, Ricardo Ribalda Delgado wrote:
> Hello Richard
> 
> It is ok to have Provides, but they should not have a version number.
> If they have a version number a nasty warning appears (as you can see
> on the patch). The provided patch just clears all the versions but
> keeps the Provides
> 
> We could "fix" dpkg to support versioning, but I believe it is better
> to just remove the version number from the Provides.

We can also do the version comparison in package_deb.bbclass itself. I
believe there is some code somewhere which can understand the different
constraints.

Cheers,

Richard

> Cheers!
> 
> On Tue, Mar 25, 2014 at 9:50 AM, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> > On Thu, 2014-03-13 at 16:31 +0100, Ricardo Ribalda Delgado wrote:
> >> According to Debian Policy Manual. Chapter 7.1
> >>
> >> All of the fields except for Provides may restrict their applicability
> >> to particular versions of each named package. This is done in
> >> parentheses after each individual package name; the parentheses should
> >> contain a relation from the list below followed by a version number, in
> >> the format described in Version, Section 5.6.12.
> >>
> >> This Fixes the following warning:
> >>
> >> root@qt5022:~# apt-get update
> >>
> >> ...
> >>
> >> Reading package lists... Done
> >> W: Ignoring Provides line with DepCompareOp for package
> >> pkgconfig__pkg-config__
> >> W: You may want to run apt-get update to correct these problems
> >>
> >> Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
> >> ---
> >>  meta/classes/package_deb.bbclass | 8 ++++++++
> >>  1 file changed, 8 insertions(+)
> >>
> >> diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
> >> index 2d2f3f1..905af24 100644
> >> --- a/meta/classes/package_deb.bbclass
> >> +++ b/meta/classes/package_deb.bbclass
> >> @@ -322,6 +322,13 @@ python do_package_deb () {
> >>
> >>          mapping_rename_hook(localdata)
> >>
> >> +        def debian_cmp_purgeversion(var):
> >> +            # dpkg does not allow versions on Provides.
> >> +            # From Debian Policy Manual, Chapter 7:
> >> +            # All of the fields except for Provides may restrict their applicability to particular versions of each named package.
> >> +            for key in var:
> >> +                var[key] = []
> >> +
> > Shouldn't this actually make a version comparison, i.e. if <condition>
> > then emit the Provides, otherwise don't (looking at the package version
> > for comparison)?
> >
> > I can imagine having multiple versions of a recipe, some with provides
> > and some without, all using the same code.
> >
> > Cheers,
> >
> > Richard
> >
> >          def debian_cmp_remap(var):
> >>              # dpkg does not allow for '(' or ')' in a dependency name
> >>              # replace these instances with '__' and '__'
> >> @@ -359,6 +366,7 @@ python do_package_deb () {
> >>          debian_cmp_remap(rsuggests)
> >>          rprovides = bb.utils.explode_dep_versions2(localdata.getVar("RPROVIDES", True) or "")
> >>          debian_cmp_remap(rprovides)
> >> +        debian_cmp_purgeversion(rprovides)
> >>          rreplaces = bb.utils.explode_dep_versions2(localdata.getVar("RREPLACES", True) or "")
> >>          debian_cmp_remap(rreplaces)
> >>          rconflicts = bb.utils.explode_dep_versions2(localdata.getVar("RCONFLICTS", True) or "")
> >
> >
> 
> 
>
Ricardo Ribalda Delgado - March 25, 2014, 10:54 a.m.
ok, but for the next release wont be a good idea to fix the warning in dpkg?

On Tue, Mar 25, 2014 at 10:19 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Tue, 2014-03-25 at 09:54 +0100, Ricardo Ribalda Delgado wrote:
>> Hello Richard
>>
>> It is ok to have Provides, but they should not have a version number.
>> If they have a version number a nasty warning appears (as you can see
>> on the patch). The provided patch just clears all the versions but
>> keeps the Provides
>>
>> We could "fix" dpkg to support versioning, but I believe it is better
>> to just remove the version number from the Provides.
>
> We can also do the version comparison in package_deb.bbclass itself. I
> believe there is some code somewhere which can understand the different
> constraints.
>
> Cheers,
>
> Richard
>
>> Cheers!
>>
>> On Tue, Mar 25, 2014 at 9:50 AM, Richard Purdie
>> <richard.purdie@linuxfoundation.org> wrote:
>> > On Thu, 2014-03-13 at 16:31 +0100, Ricardo Ribalda Delgado wrote:
>> >> According to Debian Policy Manual. Chapter 7.1
>> >>
>> >> All of the fields except for Provides may restrict their applicability
>> >> to particular versions of each named package. This is done in
>> >> parentheses after each individual package name; the parentheses should
>> >> contain a relation from the list below followed by a version number, in
>> >> the format described in Version, Section 5.6.12.
>> >>
>> >> This Fixes the following warning:
>> >>
>> >> root@qt5022:~# apt-get update
>> >>
>> >> ...
>> >>
>> >> Reading package lists... Done
>> >> W: Ignoring Provides line with DepCompareOp for package
>> >> pkgconfig__pkg-config__
>> >> W: You may want to run apt-get update to correct these problems
>> >>
>> >> Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
>> >> ---
>> >>  meta/classes/package_deb.bbclass | 8 ++++++++
>> >>  1 file changed, 8 insertions(+)
>> >>
>> >> diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
>> >> index 2d2f3f1..905af24 100644
>> >> --- a/meta/classes/package_deb.bbclass
>> >> +++ b/meta/classes/package_deb.bbclass
>> >> @@ -322,6 +322,13 @@ python do_package_deb () {
>> >>
>> >>          mapping_rename_hook(localdata)
>> >>
>> >> +        def debian_cmp_purgeversion(var):
>> >> +            # dpkg does not allow versions on Provides.
>> >> +            # From Debian Policy Manual, Chapter 7:
>> >> +            # All of the fields except for Provides may restrict their applicability to particular versions of each named package.
>> >> +            for key in var:
>> >> +                var[key] = []
>> >> +
>> > Shouldn't this actually make a version comparison, i.e. if <condition>
>> > then emit the Provides, otherwise don't (looking at the package version
>> > for comparison)?
>> >
>> > I can imagine having multiple versions of a recipe, some with provides
>> > and some without, all using the same code.
>> >
>> > Cheers,
>> >
>> > Richard
>> >
>> >          def debian_cmp_remap(var):
>> >>              # dpkg does not allow for '(' or ')' in a dependency name
>> >>              # replace these instances with '__' and '__'
>> >> @@ -359,6 +366,7 @@ python do_package_deb () {
>> >>          debian_cmp_remap(rsuggests)
>> >>          rprovides = bb.utils.explode_dep_versions2(localdata.getVar("RPROVIDES", True) or "")
>> >>          debian_cmp_remap(rprovides)
>> >> +        debian_cmp_purgeversion(rprovides)
>> >>          rreplaces = bb.utils.explode_dep_versions2(localdata.getVar("RREPLACES", True) or "")
>> >>          debian_cmp_remap(rreplaces)
>> >>          rconflicts = bb.utils.explode_dep_versions2(localdata.getVar("RCONFLICTS", True) or "")
>> >
>> >
>>
>>
>>
>
>

Patch

diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 2d2f3f1..905af24 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -322,6 +322,13 @@  python do_package_deb () {
 
         mapping_rename_hook(localdata)
 
+        def debian_cmp_purgeversion(var):
+            # dpkg does not allow versions on Provides.
+            # From Debian Policy Manual, Chapter 7:
+            # All of the fields except for Provides may restrict their applicability to particular versions of each named package.
+            for key in var:
+                var[key] = []
+
         def debian_cmp_remap(var):
             # dpkg does not allow for '(' or ')' in a dependency name
             # replace these instances with '__' and '__'
@@ -359,6 +366,7 @@  python do_package_deb () {
         debian_cmp_remap(rsuggests)
         rprovides = bb.utils.explode_dep_versions2(localdata.getVar("RPROVIDES", True) or "")
         debian_cmp_remap(rprovides)
+        debian_cmp_purgeversion(rprovides)
         rreplaces = bb.utils.explode_dep_versions2(localdata.getVar("RREPLACES", True) or "")
         debian_cmp_remap(rreplaces)
         rconflicts = bb.utils.explode_dep_versions2(localdata.getVar("RCONFLICTS", True) or "")