aboutsummaryrefslogtreecommitdiffstats
path: root/meta/classes
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 19:58:06 -0800
commita36165ea8bf8c7a061a0173076c83ae6806d65b6 (patch)
tree4882ae24bccdaa4049d8cce9caf9daf6dd8bfe2f /meta/classes
parent8345f834a080737f03bee3f0c615dd9654401d93 (diff)
downloadopenembedded-core-contrib-a36165ea8bf8c7a061a0173076c83ae6806d65b6.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. Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/classes')
-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 () {
debian_cmp_remap(rsuggests)
# Deliberately drop version information here, not wanted/supported by deb
rprovides = dict.fromkeys(bb.utils.explode_dep_versions2(localdata.getVar("RPROVIDES") or ""), [])
+ # Remove file paths if any from rprovides, debian does not support custom providers
+ for key in list(rprovides.keys()):
+ if key.startswith('/'):
+ del rprovides[key]
rprovides = collections.OrderedDict(sorted(rprovides.items(), key=lambda x: x[0]))
debian_cmp_remap(rprovides)
rreplaces = bb.utils.explode_dep_versions2(localdata.getVar("RREPLACES") or "")