diff options
-rw-r--r-- | meta/classes/multilib.bbclass | 1 | ||||
-rw-r--r-- | meta/lib/oe/package_manager.py | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass index 2a90d9ef29..eea2fd59a1 100644 --- a/meta/classes/multilib.bbclass +++ b/meta/classes/multilib.bbclass | |||
@@ -63,6 +63,7 @@ python multilib_virtclass_handler () { | |||
63 | newtune = e.data.getVar("DEFAULTTUNE_" + "virtclass-multilib-" + variant, False) | 63 | newtune = e.data.getVar("DEFAULTTUNE_" + "virtclass-multilib-" + variant, False) |
64 | if newtune: | 64 | if newtune: |
65 | e.data.setVar("DEFAULTTUNE", newtune) | 65 | e.data.setVar("DEFAULTTUNE", newtune) |
66 | e.data.setVar('DEFAULTTUNE_ML_%s' % variant, newtune) | ||
66 | } | 67 | } |
67 | 68 | ||
68 | addhandler multilib_virtclass_handler | 69 | addhandler multilib_virtclass_handler |
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index ffb83b2cba..e1ec75e52b 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py | |||
@@ -63,6 +63,9 @@ class RpmIndexer(Indexer): | |||
63 | localdata = bb.data.createCopy(self.d) | 63 | localdata = bb.data.createCopy(self.d) |
64 | default_tune_key = "DEFAULTTUNE_virtclass-multilib-" + eext[1] | 64 | default_tune_key = "DEFAULTTUNE_virtclass-multilib-" + eext[1] |
65 | default_tune = localdata.getVar(default_tune_key, False) | 65 | default_tune = localdata.getVar(default_tune_key, False) |
66 | if default_tune is None: | ||
67 | default_tune_key = "DEFAULTTUNE_ML_" + eext[1] | ||
68 | default_tune = localdata.getVar(default_tune_key, False) | ||
66 | if default_tune: | 69 | if default_tune: |
67 | localdata.setVar("DEFAULTTUNE", default_tune) | 70 | localdata.setVar("DEFAULTTUNE", default_tune) |
68 | bb.data.update_data(localdata) | 71 | bb.data.update_data(localdata) |