summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa/selftest/cases/incompatible_lic.py
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-28 14:27:33 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-02 15:44:10 +0100
commit65133015b1cf545a0c86177ce471a0b2b9340d5c (patch)
tree2d24b99d759e7b7e611217dcc686ae0fe85a671e /meta/lib/oeqa/selftest/cases/incompatible_lic.py
parentbb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (diff)
downloadpoky-65133015b1cf545a0c86177ce471a0b2b9340d5c.tar.gz
meta: Manual override fixes
The automated conversion of OE-Core to use the new override sytax isn't perfect. This patches some mis-converted lines and some lines which were missed by the automation. (From OE-Core rev: 4e9a06b64b43131b731fb59a0305f78a98e27fbd) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/selftest/cases/incompatible_lic.py')
-rw-r--r--meta/lib/oeqa/selftest/cases/incompatible_lic.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/lib/oeqa/selftest/cases/incompatible_lic.py b/meta/lib/oeqa/selftest/cases/incompatible_lic.py
index 93be434650..aa8e085754 100644
--- a/meta/lib/oeqa/selftest/cases/incompatible_lic.py
+++ b/meta/lib/oeqa/selftest/cases/incompatible_lic.py
@@ -98,7 +98,7 @@ INCOMPATIBLE_LICENSE:pn-core-image-minimal = "GPL-3.0 LGPL-3.0"
98 raise AssertionError(result.output) 98 raise AssertionError(result.output)
99 99
100 def test_bash_and_license(self): 100 def test_bash_and_license(self):
101 self.write_config(self.default_config() + '\nLICENSE_append_pn-bash = " & SomeLicense"') 101 self.write_config(self.default_config() + '\nLICENSE:append:pn-bash = " & SomeLicense"')
102 error_msg = "ERROR: core-image-minimal-1.0-r0 do_rootfs: Package bash cannot be installed into the image because it has incompatible license(s): GPL-3.0-or-later" 102 error_msg = "ERROR: core-image-minimal-1.0-r0 do_rootfs: Package bash cannot be installed into the image because it has incompatible license(s): GPL-3.0-or-later"
103 103
104 result = bitbake('core-image-minimal', ignore_status=True) 104 result = bitbake('core-image-minimal', ignore_status=True)
@@ -106,12 +106,12 @@ INCOMPATIBLE_LICENSE:pn-core-image-minimal = "GPL-3.0 LGPL-3.0"
106 raise AssertionError(result.output) 106 raise AssertionError(result.output)
107 107
108 def test_bash_or_license(self): 108 def test_bash_or_license(self):
109 self.write_config(self.default_config() + '\nLICENSE_append_pn-bash = " | SomeLicense"') 109 self.write_config(self.default_config() + '\nLICENSE:append:pn-bash = " | SomeLicense"')
110 110
111 bitbake('core-image-minimal') 111 bitbake('core-image-minimal')
112 112
113 def test_bash_whitelist(self): 113 def test_bash_whitelist(self):
114 self.write_config(self.default_config() + '\nWHITELIST_GPL-3.0_pn-core-image-minimal = "bash"') 114 self.write_config(self.default_config() + '\nWHITELIST_GPL-3.0:pn-core-image-minimal = "bash"')
115 115
116 bitbake('core-image-minimal') 116 bitbake('core-image-minimal')
117 117