@@ -184,8 +184,6 @@ def deb_write_pkg(pkg, d):
# '<' = less or equal
# '>' = greater or equal
# adjust these to the '<<' and '>>' equivalents
- # Also, "=" specifiers only work if they have the PR in, so 1.2.3 != 1.2.3-r0
- # so to avoid issues, map this to ">= 1.2.3 << 1.2.3.0"
for dep in list(var.keys()):
if '(' in dep or '/' in dep:
newdep = re.sub(r'[(:)/]', '__', dep)
@@ -200,10 +198,6 @@ def deb_write_pkg(pkg, d):
var[dep][i] = var[dep][i].replace("< ", "<< ")
elif (v or "").startswith("> "):
var[dep][i] = var[dep][i].replace("> ", ">> ")
- elif (v or "").startswith("= ") and "-r" not in v:
- ver = var[dep][i].replace("= ", "")
- var[dep][i] = var[dep][i].replace("= ", ">= ")
- var[dep].append("<< " + ver + ".0")
rdepends = bb.utils.explode_dep_versions2(localdata.getVar("RDEPENDS") or "")
debian_cmp_remap(rdepends)
@@ -220,8 +214,7 @@ def deb_write_pkg(pkg, d):
del rrecommends[dep]
rsuggests = bb.utils.explode_dep_versions2(localdata.getVar("RSUGGESTS") or "")
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 ""), [])
+ rprovides = 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('/'):
dpkg and apt seem to handle versioned provides correctly now [1] so this workaround is not needed anymore. This fixes [Yocto #14995] for package_deb. [1] https://www.debian.org/doc/debian-policy/ch-relationships.html#virtual-packages-provides Signed-off-by: Pavel Zhukov <pavel@zhukoff.net> --- meta/classes-global/package_deb.bbclass | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)