mirror of
https://git.yoctoproject.org/poky
synced 2026-07-16 03:47:03 +00:00
package(_ipk).bbclass: opkg using ALL_MULTILIB_PACKAGE_ARCHS
[YOCTO #1345] The new variable ALL_MULTILIB_PACKAGE_ARCHS contains all the values of PACKAGE_ARCHS for each multilib variants. The opkg backend now uses this new value insteald of the PACKAGE_ARCHS to update the opkg indexes and to generate the opkg configuration files. This allows the normal packages and multilib packages may be installed into the same rootfs. (From OE-Core rev: b774bf44ef004276da12a83ebd69715c00b596ac) Signed-off-by: Lianhao Lu <lianhao.lu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
f759bde4f7
commit
57bd62ad5c
@@ -352,12 +352,16 @@ def extend_variants(d, var, extend, delim=':'):
|
||||
variants.append(eext[1])
|
||||
return " ".join(variants)
|
||||
|
||||
def all_multilib_tune_values(d, var, unique=True):
|
||||
def all_multilib_tune_values(d, var, unique = True, need_split = True, delim = ' '):
|
||||
"""Return a string of all ${var} in all multilib tune configuration"""
|
||||
values = []
|
||||
value = d.getVar(var, True) or ""
|
||||
if value != "":
|
||||
values.append(value)
|
||||
if need_split:
|
||||
for item in value.split(delim):
|
||||
values.append(item)
|
||||
else:
|
||||
values.append(value)
|
||||
variants = d.getVar("MULTILIB_VARIANTS", True) or ""
|
||||
for item in variants.split():
|
||||
localdata = bb.data.createCopy(d)
|
||||
@@ -366,7 +370,17 @@ def all_multilib_tune_values(d, var, unique=True):
|
||||
bb.data.update_data(localdata)
|
||||
value = localdata.getVar(var, True) or ""
|
||||
if value != "":
|
||||
values.append(value)
|
||||
if need_split:
|
||||
for item in value.split(delim):
|
||||
values.append(item)
|
||||
else:
|
||||
values.append(value)
|
||||
if unique:
|
||||
values = set(values)
|
||||
return " ".join(values)
|
||||
#we do this to keep order as much as possible
|
||||
ret = []
|
||||
for value in values:
|
||||
if not value in ret:
|
||||
ret.append(value)
|
||||
else:
|
||||
ret = values
|
||||
return " ".join(ret)
|
||||
|
||||
Reference in New Issue
Block a user