mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

multilib.bbclass: save multilib variables before executing the gcc-cross-canadian statements

Browse Source 
(From OE-Core rev: 45528026c190c7c3b121e9fb65747d050b2bb21a)

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Constantin Musca
2013-02-11 18:04:10 +02:00
committed by Richard Purdie
parent 2c87657be9
commit e9aa4c22d6
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/multilib.bbclass
+6 -5
View File
@@ -15,6 +15,12 @@ python multilib_virtclass_handler () {
if "virtual/kernel" in provides or bb.data.inherits_class('module-base', e.data): if "virtual/kernel" in provides or bb.data.inherits_class('module-base', e.data):
raise bb.parse.SkipPackage("We shouldn't have multilib variants for the kernel") raise bb.parse.SkipPackage("We shouldn't have multilib variants for the kernel")
save_var_name=e.data.getVar("MULTILIB_SAVE_VARNAME", True) or ""
for name in save_var_name.split():
val=e.data.getVar(name, True)
if val:
e.data.setVar(name + "_MULTILIB_ORIGINAL", val)
if bb.data.inherits_class('image', e.data): if bb.data.inherits_class('image', e.data):
e.data.setVar("MLPREFIX", variant + "-") e.data.setVar("MLPREFIX", variant + "-")
e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False)) e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False))
@@ -36,11 +42,6 @@ python multilib_virtclass_handler () {
if bb.data.inherits_class('allarch', e.data) and not bb.data.inherits_class('packagegroup', e.data): if bb.data.inherits_class('allarch', e.data) and not bb.data.inherits_class('packagegroup', e.data):
raise bb.parse.SkipPackage("Don't extend allarch recipes which are not packagegroups") raise bb.parse.SkipPackage("Don't extend allarch recipes which are not packagegroups")
save_var_name=e.data.getVar("MULTILIB_SAVE_VARNAME", True) or ""
for name in save_var_name.split():
val=e.data.getVar(name, True)
if val:
e.data.setVar(name + "_MULTILIB_ORIGINAL", val)
# Expand this since this won't work correctly once we set a multilib into place # Expand this since this won't work correctly once we set a multilib into place
e.data.setVar("ALL_MULTILIB_PACKAGE_ARCHS", e.data.getVar("ALL_MULTILIB_PACKAGE_ARCHS", True)) e.data.setVar("ALL_MULTILIB_PACKAGE_ARCHS", e.data.getVar("ALL_MULTILIB_PACKAGE_ARCHS", True))