From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dan.rpsys.net (dan.rpsys.net [93.97.175.187]) by mail.openembedded.org (Postfix) with ESMTP id 902F06BD6B for ; Tue, 25 Mar 2014 09:19:59 +0000 (UTC) Received: from localhost (dan.rpsys.net [127.0.0.1]) by dan.rpsys.net (8.14.4/8.14.4/Debian-2.1ubuntu4) with ESMTP id s2P9JjhP025146; Tue, 25 Mar 2014 09:19:45 GMT X-Virus-Scanned: Debian amavisd-new at dan.rpsys.net Received: from dan.rpsys.net ([127.0.0.1]) by localhost (dan.rpsys.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 9Mw2j9DU3Xmr; Tue, 25 Mar 2014 09:19:45 +0000 (GMT) Received: from [192.168.3.10] (rpvlan0 [192.168.3.10]) (authenticated bits=0) by dan.rpsys.net (8.14.4/8.14.4/Debian-2.1ubuntu1) with ESMTP id s2P9Jf5K025141 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); Tue, 25 Mar 2014 09:19:42 GMT Message-ID: <1395739175.24890.19.camel@ted> From: Richard Purdie To: Ricardo Ribalda Delgado Date: Tue, 25 Mar 2014 09:19:35 +0000 In-Reply-To: References: <1394724708-9894-1-git-send-email-ricardo.ribalda@gmail.com> <1395737416.24890.16.camel@ted> X-Mailer: Evolution 3.8.4-0ubuntu1 Mime-Version: 1.0 Cc: openembedded-core@lists.openembedded.org Subject: Re: [PATCH] package_deb: Remove version from Provides Field X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Mar 2014 09:20:01 -0000 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit 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 > 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 > >> --- > >> 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 > > 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 "") > > > > > > >