mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

oeqa/selftest/bbtests: Tweak to use no-gplv3 inc file

Browse Source 
With changes to gcc-runtime around improving debugging, python modules
are needed but this pulls in bash which breaks the tests.

Add an exclusion to the no-gplv3 include file to handle this.

(From OE-Core rev: 803060fa4e8fe98ac8f987b80162110d06788946)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2024-02-04 12:06:45 +00:00
parent 34c747f017
commit 0a9e45a413
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/conf/distro/include/no-gplv3.inc
+4
View File
@@ -22,3 +22,7 @@ CORE_IMAGE_EXTRA_INSTALL:pn-core-image-weston += "rpm"
# matchbox-terminal depends on vte, which is gpl3 # matchbox-terminal depends on vte, which is gpl3
CORE_IMAGE_BASE_INSTALL:remove:pn-core-image-weston = "matchbox-terminal" CORE_IMAGE_BASE_INSTALL:remove:pn-core-image-weston = "matchbox-terminal"
# Some python-tests use bash outside of ptest
RDEPENDS:${PN}-tests:remove:class-target:pn-python3 = "${MLPREFIX}bash"
INSANE_SKIP:${PN}-tests:pn-python3 = "file-rdeps"
meta/lib/oeqa/selftest/cases/bbtests.py
+3 -1
View File
@@ -232,7 +232,9 @@ INHERIT:remove = \"report-error\"
self.assertLess(errorpos,continuepos, msg = "bitbake didn't pass do_fail_task. bitbake output: %s" % result.output) self.assertLess(errorpos,continuepos, msg = "bitbake didn't pass do_fail_task. bitbake output: %s" % result.output)
def test_non_gplv3(self): def test_non_gplv3(self):
self.write_config('INCOMPATIBLE_LICENSE = "GPL-3.0-or-later"') self.write_config('''INCOMPATIBLE_LICENSE = "GPL-3.0-or-later"
require conf/distro/include/no-gplv3.inc
''')
result = bitbake('selftest-ed', ignore_status=True) result = bitbake('selftest-ed', ignore_status=True)
self.assertEqual(result.status, 0, "Bitbake failed, exit code %s, output %s" % (result.status, result.output)) self.assertEqual(result.status, 0, "Bitbake failed, exit code %s, output %s" % (result.status, result.output))
lic_dir = get_bb_var('LICENSE_DIRECTORY') lic_dir = get_bb_var('LICENSE_DIRECTORY')