package_deb/ipk: Remap < and > to << and >>
In deb and ipk, < means <=, while > means >=... there is a different operator << and >> that means < and >, so we map them when constructing the packages. (From OE-Core rev: bbcc78d8ff03725ce5b3b65ce24025c3da45f2ab) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
56c677a338
commit
31fcfefbfd
|
@ -334,18 +334,36 @@ python do_package_deb () {
|
||||||
|
|
||||||
mapping_rename_hook(localdata)
|
mapping_rename_hook(localdata)
|
||||||
|
|
||||||
|
def debian_cmp_remap(var):
|
||||||
|
# In debian '>' and '<' do not mean what it appears they mean
|
||||||
|
# '<' = less or equal
|
||||||
|
# '>' = greater or equal
|
||||||
|
# adjust these to the '<<' and '>>' equivalents
|
||||||
|
#
|
||||||
|
for dep in var:
|
||||||
|
if (var[dep] or "").startswith("< "):
|
||||||
|
var[dep] = var[dep].replace("< ", "<< ")
|
||||||
|
elif (var[dep] or "").startswith("> "):
|
||||||
|
var[dep] = var[dep].replace("> ", ">> ")
|
||||||
|
|
||||||
rdepends = bb.utils.explode_dep_versions(localdata.getVar("RDEPENDS", True) or "")
|
rdepends = bb.utils.explode_dep_versions(localdata.getVar("RDEPENDS", True) or "")
|
||||||
|
debian_cmp_remap(rdepends)
|
||||||
for dep in rdepends:
|
for dep in rdepends:
|
||||||
if '*' in dep:
|
if '*' in dep:
|
||||||
del rdepends[dep]
|
del rdepends[dep]
|
||||||
rrecommends = bb.utils.explode_dep_versions(localdata.getVar("RRECOMMENDS", True) or "")
|
rrecommends = bb.utils.explode_dep_versions(localdata.getVar("RRECOMMENDS", True) or "")
|
||||||
|
debian_cmp_remap(rrecommends)
|
||||||
for dep in rrecommends:
|
for dep in rrecommends:
|
||||||
if '*' in dep:
|
if '*' in dep:
|
||||||
del rrecommends[dep]
|
del rrecommends[dep]
|
||||||
rsuggests = bb.utils.explode_dep_versions(localdata.getVar("RSUGGESTS", True) or "")
|
rsuggests = bb.utils.explode_dep_versions(localdata.getVar("RSUGGESTS", True) or "")
|
||||||
|
debian_cmp_remap(rsuggests)
|
||||||
rprovides = bb.utils.explode_dep_versions(localdata.getVar("RPROVIDES", True) or "")
|
rprovides = bb.utils.explode_dep_versions(localdata.getVar("RPROVIDES", True) or "")
|
||||||
|
debian_cmp_remap(rprovides)
|
||||||
rreplaces = bb.utils.explode_dep_versions(localdata.getVar("RREPLACES", True) or "")
|
rreplaces = bb.utils.explode_dep_versions(localdata.getVar("RREPLACES", True) or "")
|
||||||
|
debian_cmp_remap(rreplaces)
|
||||||
rconflicts = bb.utils.explode_dep_versions(localdata.getVar("RCONFLICTS", True) or "")
|
rconflicts = bb.utils.explode_dep_versions(localdata.getVar("RCONFLICTS", True) or "")
|
||||||
|
debian_cmp_remap(rconflicts)
|
||||||
if rdepends:
|
if rdepends:
|
||||||
ctrlfile.write("Depends: %s\n" % unicode(bb.utils.join_deps(rdepends)))
|
ctrlfile.write("Depends: %s\n" % unicode(bb.utils.join_deps(rdepends)))
|
||||||
if rsuggests:
|
if rsuggests:
|
||||||
|
|
|
@ -372,12 +372,30 @@ python do_package_ipk () {
|
||||||
|
|
||||||
mapping_rename_hook(localdata)
|
mapping_rename_hook(localdata)
|
||||||
|
|
||||||
|
def debian_cmp_remap(var):
|
||||||
|
# In debian '>' and '<' do not mean what it appears they mean
|
||||||
|
# '<' = less or equal
|
||||||
|
# '>' = greater or equal
|
||||||
|
# adjust these to the '<<' and '>>' equivalents
|
||||||
|
#
|
||||||
|
for dep in var:
|
||||||
|
if (var[dep] or "").startswith("< "):
|
||||||
|
var[dep] = var[dep].replace("< ", "<< ")
|
||||||
|
elif (var[dep] or "").startswith("> "):
|
||||||
|
var[dep] = var[dep].replace("> ", ">> ")
|
||||||
|
|
||||||
rdepends = bb.utils.explode_dep_versions(localdata.getVar("RDEPENDS", True) or "")
|
rdepends = bb.utils.explode_dep_versions(localdata.getVar("RDEPENDS", True) or "")
|
||||||
|
debian_cmp_remap(rdepends)
|
||||||
rrecommends = bb.utils.explode_dep_versions(localdata.getVar("RRECOMMENDS", True) or "")
|
rrecommends = bb.utils.explode_dep_versions(localdata.getVar("RRECOMMENDS", True) or "")
|
||||||
|
debian_cmp_remap(rrecommends)
|
||||||
rsuggests = bb.utils.explode_dep_versions(localdata.getVar("RSUGGESTS", True) or "")
|
rsuggests = bb.utils.explode_dep_versions(localdata.getVar("RSUGGESTS", True) or "")
|
||||||
|
debian_cmp_remap(rsuggests)
|
||||||
rprovides = bb.utils.explode_dep_versions(localdata.getVar("RPROVIDES", True) or "")
|
rprovides = bb.utils.explode_dep_versions(localdata.getVar("RPROVIDES", True) or "")
|
||||||
|
debian_cmp_remap(rprovides)
|
||||||
rreplaces = bb.utils.explode_dep_versions(localdata.getVar("RREPLACES", True) or "")
|
rreplaces = bb.utils.explode_dep_versions(localdata.getVar("RREPLACES", True) or "")
|
||||||
|
debian_cmp_remap(rreplaces)
|
||||||
rconflicts = bb.utils.explode_dep_versions(localdata.getVar("RCONFLICTS", True) or "")
|
rconflicts = bb.utils.explode_dep_versions(localdata.getVar("RCONFLICTS", True) or "")
|
||||||
|
debian_cmp_remap(rconflicts)
|
||||||
|
|
||||||
if rdepends:
|
if rdepends:
|
||||||
ctrlfile.write("Depends: %s\n" % bb.utils.join_deps(rdepends))
|
ctrlfile.write("Depends: %s\n" % bb.utils.join_deps(rdepends))
|
||||||
|
|
Loading…
Reference in New Issue