[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4580/8267] package_deb.bbclass: Ignore file paths in RPROVIDES
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous-yocto/gnomeostree-3.28-rocko: 4580/8267] package_deb.bbclass: Ignore file paths in RPROVIDES
- Date: Sun, 17 Dec 2017 02:14:10 +0000 (UTC)
commit f377eaa011a0b2104c680f4a3b054516bda54d5b
Author: Amarnath Valluri <amarnath valluri intel com>
Date: Fri Feb 10 15:42:17 2017 +0200
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>
meta/classes/package_deb.bbclass | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 4f107b5..1f1bc81 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 "")
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]