]> code.ossystems Code Review - openembedded-core.git/commitdiff
package_deb.bbclass: Ignore file paths in RPROVIDES
authorAmarnath Valluri <amarnath.valluri@intel.com>
Fri, 10 Feb 2017 13:42:17 +0000 (15:42 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 16 Feb 2017 03:58:06 +0000 (19:58 -0800)
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>
meta/classes/package_deb.bbclass

index 4f107b58eec5e01ce3fb5f5606e5e9c18ca062b2..1f1bc81e14f0f9ff644716203d5b234d02b5a162 100644 (file)
@@ -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 "")