diff options
author | Dongxiao Xu <dongxiao.xu@intel.com> | 2011-08-16 14:57:37 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-17 15:14:55 +0100 |
commit | b51e8344ca6a20adfc4cb0f504d0dee4f77b1f61 (patch) | |
tree | d19027634eef8e919b89dc82618bc2b3677ee81f /meta/classes | |
parent | 5440cb560d43c585a67a86684a05c8743e947a6b (diff) | |
download | poky-b51e8344ca6a20adfc4cb0f504d0dee4f77b1f61.tar.gz |
rootfs_rpm: Fix DEFAULTTUNE setting in multilib case
"virtclass-multilib" is set to OVERRIDES in multilib.bbclass, remove the
duplicated settings here.
Besides, DEFAULTTUNE has overrided and it can be directly used.
[YOCTO #1368]
CC: Mark Hatle <mark.hatle@windriver.com>
(From OE-Core rev: dc78cdb318671862c5cd15711364c1c4462d9ece)
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/rootfs_rpm.bbclass | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass index 7c06064e72..7f24b9cfbd 100644 --- a/meta/classes/rootfs_rpm.bbclass +++ b/meta/classes/rootfs_rpm.bbclass | |||
@@ -215,10 +215,6 @@ python () { | |||
215 | eext = ext.split(':') | 215 | eext = ext.split(':') |
216 | if len(eext) > 1 and eext[0] == 'multilib': | 216 | if len(eext) > 1 and eext[0] == 'multilib': |
217 | localdata = bb.data.createCopy(d) | 217 | localdata = bb.data.createCopy(d) |
218 | overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + eext[1] | ||
219 | localdata.setVar("OVERRIDES", overrides) | ||
220 | # TEMP: OVERRIDES isn't working right | ||
221 | localdata.setVar("DEFAULTTUNE", localdata.getVar("DEFAULTTUNE_virtclass-multilib-" + eext[1], False) or "") | ||
222 | ml_package_archs += localdata.getVar("PACKAGE_ARCHS", True) or "" | 218 | ml_package_archs += localdata.getVar("PACKAGE_ARCHS", True) or "" |
223 | #bb.note("ML_PACKAGE_ARCHS %s %s %s" % (eext[1], localdata.getVar("PACKAGE_ARCHS", True) or "(none)", overrides)) | 219 | #bb.note("ML_PACKAGE_ARCHS %s %s %s" % (eext[1], localdata.getVar("PACKAGE_ARCHS", True) or "(none)", overrides)) |
224 | bb.data.setVar('MULTILIB_PACKAGE_ARCHS', ml_package_archs, d) | 220 | bb.data.setVar('MULTILIB_PACKAGE_ARCHS', ml_package_archs, d) |