From b51e8344ca6a20adfc4cb0f504d0dee4f77b1f61 Mon Sep 17 00:00:00 2001 From: Dongxiao Xu Date: Tue, 16 Aug 2011 14:57:37 +0800 Subject: 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 (From OE-Core rev: dc78cdb318671862c5cd15711364c1c4462d9ece) Signed-off-by: Dongxiao Xu Signed-off-by: Richard Purdie --- meta/classes/rootfs_rpm.bbclass | 4 ---- 1 file changed, 4 deletions(-) (limited to 'meta/classes/rootfs_rpm.bbclass') 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 () { eext = ext.split(':') if len(eext) > 1 and eext[0] == 'multilib': localdata = bb.data.createCopy(d) - overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + eext[1] - localdata.setVar("OVERRIDES", overrides) - # TEMP: OVERRIDES isn't working right - localdata.setVar("DEFAULTTUNE", localdata.getVar("DEFAULTTUNE_virtclass-multilib-" + eext[1], False) or "") ml_package_archs += localdata.getVar("PACKAGE_ARCHS", True) or "" #bb.note("ML_PACKAGE_ARCHS %s %s %s" % (eext[1], localdata.getVar("PACKAGE_ARCHS", True) or "(none)", overrides)) bb.data.setVar('MULTILIB_PACKAGE_ARCHS', ml_package_archs, d) -- cgit v1.2.3-54-g00ecf