From 00765258a2fd0627e0b8b15ed917e1caeda30b38 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 16 Jul 2015 23:47:30 +0100 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/package_deb.bbclass | 3 ++- meta/classes/package_ipk.bbclass | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'meta') 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 () { del rrecommends[dep] rsuggests = bb.utils.explode_dep_versions2(localdata.getVar("RSUGGESTS", True) or "") debian_cmp_remap(rsuggests) - rprovides = bb.utils.explode_dep_versions2(localdata.getVar("RPROVIDES", True) or "") + # Deliberately drop version information here, not wanted/supported by deb + rprovides = dict.fromkeys(bb.utils.explode_dep_versions2(localdata.getVar("RPROVIDES", True) or ""), []) debian_cmp_remap(rprovides) rreplaces = bb.utils.explode_dep_versions2(localdata.getVar("RREPLACES", True) or "") 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 () { debian_cmp_remap(rrecommends) rsuggests = bb.utils.explode_dep_versions2(localdata.getVar("RSUGGESTS", True) or "") debian_cmp_remap(rsuggests) - rprovides = bb.utils.explode_dep_versions2(localdata.getVar("RPROVIDES", True) or "") + # Deliberately drop version information here, not wanted/supported by ipk + rprovides = dict.fromkeys(bb.utils.explode_dep_versions2(localdata.getVar("RPROVIDES", True) or ""), []) debian_cmp_remap(rprovides) rreplaces = bb.utils.explode_dep_versions2(localdata.getVar("RREPLACES", True) or "") debian_cmp_remap(rreplaces) -- cgit v1.2.3-54-g00ecf