diff options
Diffstat (limited to 'meta/classes/multilib.bbclass')
| -rw-r--r-- | meta/classes/multilib.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass index 1ad654f546..5859ca8d21 100644 --- a/meta/classes/multilib.bbclass +++ b/meta/classes/multilib.bbclass | |||
| @@ -75,12 +75,12 @@ python multilib_virtclass_handler () { | |||
| 75 | e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False)) | 75 | e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False)) |
| 76 | e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override) | 76 | e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override) |
| 77 | 77 | ||
| 78 | # Expand WHITELIST_GPL-3.0 with multilib prefix | 78 | # Expand INCOMPATIBLE_LICENSE_EXCEPTIONS with multilib prefix |
| 79 | pkgs = e.data.getVar("WHITELIST_GPL-3.0") | 79 | pkgs = e.data.getVar("INCOMPATIBLE_LICENSE_EXCEPTIONS") |
| 80 | if pkgs: | 80 | if pkgs: |
| 81 | for pkg in pkgs.split(): | 81 | for pkg in pkgs.split(): |
| 82 | pkgs += " " + variant + "-" + pkg | 82 | pkgs += " " + variant + "-" + pkg |
| 83 | e.data.setVar("WHITELIST_GPL-3.0", pkgs) | 83 | e.data.setVar("INCOMPATIBLE_LICENSE_EXCEPTIONS", pkgs) |
| 84 | 84 | ||
| 85 | # DEFAULTTUNE can change TARGET_ARCH override so expand this now before update_data | 85 | # DEFAULTTUNE can change TARGET_ARCH override so expand this now before update_data |
| 86 | newtune = e.data.getVar("DEFAULTTUNE:" + "virtclass-multilib-" + variant, False) | 86 | newtune = e.data.getVar("DEFAULTTUNE:" + "virtclass-multilib-" + variant, False) |
