diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-02-28 15:45:43 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-01 23:44:59 +0000 |
| commit | e5c521661e6c20699b50e24f9de34a6ac05ff6cc (patch) | |
| tree | bb4de9197e81ec084c9226a9079b00313da5c464 /meta/classes/multilib.bbclass | |
| parent | ed323de4dcb600dd71d544f5994f52307b6db564 (diff) | |
| download | poky-e5c521661e6c20699b50e24f9de34a6ac05ff6cc.tar.gz | |
mutlilib: Handle WHITELIST_GPL-3.0 being unset
The code doesn't work if the variable is unset, fix that.
(From OE-Core rev: b5248cc232629b021d8934899326468c3ef46351)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/multilib.bbclass')
| -rw-r--r-- | meta/classes/multilib.bbclass | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass index ec2013198c..1ad654f546 100644 --- a/meta/classes/multilib.bbclass +++ b/meta/classes/multilib.bbclass | |||
| @@ -77,9 +77,10 @@ python multilib_virtclass_handler () { | |||
| 77 | 77 | ||
| 78 | # Expand WHITELIST_GPL-3.0 with multilib prefix | 78 | # Expand WHITELIST_GPL-3.0 with multilib prefix |
| 79 | pkgs = e.data.getVar("WHITELIST_GPL-3.0") | 79 | pkgs = e.data.getVar("WHITELIST_GPL-3.0") |
| 80 | for pkg in pkgs.split(): | 80 | if pkgs: |
| 81 | pkgs += " " + variant + "-" + pkg | 81 | for pkg in pkgs.split(): |
| 82 | e.data.setVar("WHITELIST_GPL-3.0", pkgs) | 82 | pkgs += " " + variant + "-" + pkg |
| 83 | e.data.setVar("WHITELIST_GPL-3.0", pkgs) | ||
| 83 | 84 | ||
| 84 | # 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 |
| 85 | newtune = e.data.getVar("DEFAULTTUNE:" + "virtclass-multilib-" + variant, False) | 86 | newtune = e.data.getVar("DEFAULTTUNE:" + "virtclass-multilib-" + variant, False) |