diff options
Diffstat (limited to 'meta/classes/base.bbclass')
| -rw-r--r-- | meta/classes/base.bbclass | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index d5798f9c48..7c42cf95e1 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass | |||
| @@ -520,19 +520,18 @@ python () { | |||
| 520 | incompatwl = [] | 520 | incompatwl = [] |
| 521 | for lic in bad_licenses: | 521 | for lic in bad_licenses: |
| 522 | spdx_license = return_spdx(d, lic) | 522 | spdx_license = return_spdx(d, lic) |
| 523 | for w in ["LGPLv2_WHITELIST_", "WHITELIST_"]: | 523 | whitelist.extend((d.getVar("WHITELIST_" + lic) or "").split()) |
| 524 | whitelist.extend((d.getVar(w + lic) or "").split()) | 524 | if spdx_license: |
| 525 | if spdx_license: | 525 | whitelist.extend((d.getVar("WHITELIST_" + spdx_license) or "").split()) |
| 526 | whitelist.extend((d.getVar(w + spdx_license) or "").split()) | 526 | ''' |
| 527 | ''' | 527 | We need to track what we are whitelisting and why. If pn is |
| 528 | We need to track what we are whitelisting and why. If pn is | 528 | incompatible we need to be able to note that the image that |
| 529 | incompatible we need to be able to note that the image that | 529 | is created may infact contain incompatible licenses despite |
| 530 | is created may infact contain incompatible licenses despite | 530 | INCOMPATIBLE_LICENSE being set. |
| 531 | INCOMPATIBLE_LICENSE being set. | 531 | ''' |
| 532 | ''' | 532 | incompatwl.extend((d.getVar("WHITELIST_" + lic) or "").split()) |
| 533 | incompatwl.extend((d.getVar(w + lic) or "").split()) | 533 | if spdx_license: |
| 534 | if spdx_license: | 534 | incompatwl.extend((d.getVar("WHITELIST_" + spdx_license) or "").split()) |
| 535 | incompatwl.extend((d.getVar(w + spdx_license) or "").split()) | ||
| 536 | 535 | ||
| 537 | if not pn in whitelist: | 536 | if not pn in whitelist: |
| 538 | pkgs = d.getVar('PACKAGES').split() | 537 | pkgs = d.getVar('PACKAGES').split() |