From f377eaa011a0b2104c680f4a3b054516bda54d5b Mon Sep 17 00:00:00 2001 From: Amarnath Valluri Date: Fri, 10 Feb 2017 15:42:17 +0200 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/package_deb.bbclass | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'meta/classes') 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 "") -- cgit v1.2.3-54-g00ecf