summaryrefslogtreecommitdiffstats
path: root/meta/classes/package_deb.bbclass
diff options
context:
space:
mode:
authorAmarnath Valluri <amarnath.valluri@intel.com>2017-02-10 15:42:17 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-15 20:06:40 -0800
commitf377eaa011a0b2104c680f4a3b054516bda54d5b (patch)
treebc285df59a1f0b3202aa268621d4e531e376e835 /meta/classes/package_deb.bbclass
parente8b1864f70f99c007e81549270970f0837f1551a (diff)
downloadpoky-f377eaa011a0b2104c680f4a3b054516bda54d5b.tar.gz
package_deb.bbclass: Ignore file paths in RPROVIDES
Unlike rpm, debian packaging does not allow file paths in 'Provides:' field. When 'usrmerge' distro feature enabled bash/busybox packages adds '/bin/sh' to it's RPROVIDES to satisfy build dependencies, this entry should be filtered out. (From OE-Core rev: a36165ea8bf8c7a061a0173076c83ae6806d65b6) Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package_deb.bbclass')
-rw-r--r--meta/classes/package_deb.bbclass4
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 4f107b58ee..1f1bc81e14 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -236,6 +236,10 @@ python do_package_deb () {
236 debian_cmp_remap(rsuggests) 236 debian_cmp_remap(rsuggests)
237 # Deliberately drop version information here, not wanted/supported by deb 237 # Deliberately drop version information here, not wanted/supported by deb
238 rprovides = dict.fromkeys(bb.utils.explode_dep_versions2(localdata.getVar("RPROVIDES") or ""), []) 238 rprovides = dict.fromkeys(bb.utils.explode_dep_versions2(localdata.getVar("RPROVIDES") or ""), [])
239 # Remove file paths if any from rprovides, debian does not support custom providers
240 for key in list(rprovides.keys()):
241 if key.startswith('/'):
242 del rprovides[key]
239 rprovides = collections.OrderedDict(sorted(rprovides.items(), key=lambda x: x[0])) 243 rprovides = collections.OrderedDict(sorted(rprovides.items(), key=lambda x: x[0]))
240 debian_cmp_remap(rprovides) 244 debian_cmp_remap(rprovides)
241 rreplaces = bb.utils.explode_dep_versions2(localdata.getVar("RREPLACES") or "") 245 rreplaces = bb.utils.explode_dep_versions2(localdata.getVar("RREPLACES") or "")