summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-16 23:47:30 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-20 10:40:41 +0100
commit00765258a2fd0627e0b8b15ed917e1caeda30b38 (patch)
treec0bcb3d89cbe72082588e6e46660fe9f1dd82834 /meta
parent771126cc4d4b64d7bd7e8416410a6924cda84a5e (diff)
downloadpoky-00765258a2fd0627e0b8b15ed917e1caeda30b38.tar.gz
package_ipk/deb: Drop version information from RPROVIDES
In some scenarios rpm needs version information from RPROVIDES. We can add this to the metadata where needed however we need to stop it entering the ipk/deb packages. This data is not needed due to the way opkg/dpkg handle the data. This patch ensures that data isn't used. (From OE-Core rev: c68b975693c10899ce50b4d8c2aa3985ca890ce3) 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/package_deb.bbclass3
-rw-r--r--meta/classes/package_ipk.bbclass3
2 files changed, 4 insertions, 2 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index a165a9ab9b..9e1ed28c3a 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -215,7 +215,8 @@ python do_package_deb () {
215 del rrecommends[dep] 215 del rrecommends[dep]
216 rsuggests = bb.utils.explode_dep_versions2(localdata.getVar("RSUGGESTS", True) or "") 216 rsuggests = bb.utils.explode_dep_versions2(localdata.getVar("RSUGGESTS", True) or "")
217 debian_cmp_remap(rsuggests) 217 debian_cmp_remap(rsuggests)
218 rprovides = bb.utils.explode_dep_versions2(localdata.getVar("RPROVIDES", True) or "") 218 # Deliberately drop version information here, not wanted/supported by deb
219 rprovides = dict.fromkeys(bb.utils.explode_dep_versions2(localdata.getVar("RPROVIDES", True) or ""), [])
219 debian_cmp_remap(rprovides) 220 debian_cmp_remap(rprovides)
220 rreplaces = bb.utils.explode_dep_versions2(localdata.getVar("RREPLACES", True) or "") 221 rreplaces = bb.utils.explode_dep_versions2(localdata.getVar("RREPLACES", True) or "")
221 debian_cmp_remap(rreplaces) 222 debian_cmp_remap(rreplaces)
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index e7109a9514..a0fa62c28c 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -188,7 +188,8 @@ python do_package_ipk () {
188 debian_cmp_remap(rrecommends) 188 debian_cmp_remap(rrecommends)
189 rsuggests = bb.utils.explode_dep_versions2(localdata.getVar("RSUGGESTS", True) or "") 189 rsuggests = bb.utils.explode_dep_versions2(localdata.getVar("RSUGGESTS", True) or "")
190 debian_cmp_remap(rsuggests) 190 debian_cmp_remap(rsuggests)
191 rprovides = bb.utils.explode_dep_versions2(localdata.getVar("RPROVIDES", True) or "") 191 # Deliberately drop version information here, not wanted/supported by ipk
192 rprovides = dict.fromkeys(bb.utils.explode_dep_versions2(localdata.getVar("RPROVIDES", True) or ""), [])
192 debian_cmp_remap(rprovides) 193 debian_cmp_remap(rprovides)
193 rreplaces = bb.utils.explode_dep_versions2(localdata.getVar("RREPLACES", True) or "") 194 rreplaces = bb.utils.explode_dep_versions2(localdata.getVar("RREPLACES", True) or "")
194 debian_cmp_remap(rreplaces) 195 debian_cmp_remap(rreplaces)