mirror of
https://git.yoctoproject.org/poky
synced 2026-05-09 05:29:32 +00:00
package_deb: Dependencies with a ( or ) in them are invalid in debs
Replace ( or ) with __. This allows RPM style dependencies to be satisfied in deb style packages. (From OE-Core rev: 12acb6bb00ba665571fcfbdb0ef4668ca0a98d5b) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
2f5da1bc42
commit
ca36d34c2e
@@ -335,11 +335,21 @@ python do_package_deb () {
|
|||||||
mapping_rename_hook(localdata)
|
mapping_rename_hook(localdata)
|
||||||
|
|
||||||
def debian_cmp_remap(var):
|
def debian_cmp_remap(var):
|
||||||
|
# dpkg does not allow for '(' or ')' in a dependency name
|
||||||
|
# replace these instances with '__' and '__'
|
||||||
|
#
|
||||||
# In debian '>' and '<' do not mean what it appears they mean
|
# In debian '>' and '<' do not mean what it appears they mean
|
||||||
# '<' = less or equal
|
# '<' = less or equal
|
||||||
# '>' = greater or equal
|
# '>' = greater or equal
|
||||||
# adjust these to the '<<' and '>>' equivalents
|
# adjust these to the '<<' and '>>' equivalents
|
||||||
#
|
#
|
||||||
|
for dep in var:
|
||||||
|
if '(' in dep:
|
||||||
|
newdep = dep.replace('(', '__')
|
||||||
|
newdep = newdep.replace(')', '__')
|
||||||
|
if newdep != dep:
|
||||||
|
var[newdep] = var[dep]
|
||||||
|
del var[dep]
|
||||||
for dep in var:
|
for dep in var:
|
||||||
for i, v in enumerate(var[dep]):
|
for i, v in enumerate(var[dep]):
|
||||||
if (v or "").startswith("< "):
|
if (v or "").startswith("< "):
|
||||||
|
|||||||
Reference in New Issue
Block a user