summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-16 23:48:51 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-20 10:40:40 +0100
commit771126cc4d4b64d7bd7e8416410a6924cda84a5e (patch)
tree1b8f2fb985ac3dcf73d3181b611e8f9c861d6fbd /meta
parent920819f3c1629ceabdf9bc5c8a3e0680c5589cd0 (diff)
downloadpoky-771126cc4d4b64d7bd7e8416410a6924cda84a5e.tar.gz
debian: Add versions to RPROVIDES
Recently, libspeexdsp-dev added RCONFLICTS = "speex-dev < 1.2rc2". where libspeexdsp is 1.2rc3. That all seems reasonable, except there is a problem. debian.bbclass renames speex-dev to libspeex-dev and adds a "Provides: speex-dev" which the packaging backends duly note. The trouble is rpm sees that as having no version at all. This means that "speex-dev < 1.2rc2" conflicts with "speex-dev" and the -dev package simply cannot be installed. We can't simply version all Provides for rpm since some dependencies clearly shouldn't be versioned (e.g. the locale ones). The solution that seems to work best is to add the versions in debian.bbclass. If the backend doesn't like these, the backend can then strip them off (separate patch does this). (From OE-Core rev: 8b9df5112443c1b712cb5c63128bebbbd38cd7fc) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/debian.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/debian.bbclass b/meta/classes/debian.bbclass
index ada2fb5760..1b6979a285 100644
--- a/meta/classes/debian.bbclass
+++ b/meta/classes/debian.bbclass
@@ -57,7 +57,7 @@ python debian_package_name_hook () {
57 if newpkg and newpkg != pkg: 57 if newpkg and newpkg != pkg:
58 provs = (d.getVar('RPROVIDES_' + pkg, True) or "").split() 58 provs = (d.getVar('RPROVIDES_' + pkg, True) or "").split()
59 if pkg not in provs: 59 if pkg not in provs:
60 d.appendVar('RPROVIDES_' + pkg, " " + pkg) 60 d.appendVar('RPROVIDES_' + pkg, " " + pkg + " (=" + d.getVar("PKGV", True) + ")")
61 61
62 def auto_libname(packages, orig_pkg): 62 def auto_libname(packages, orig_pkg):
63 sonames = [] 63 sonames = []