From 40f5a289d5f3fd8b1d0f3ee1544531b85f5ab350 Mon Sep 17 00:00:00 2001 From: Joshua Watt Date: Fri, 19 Feb 2021 20:37:00 -0600 Subject: bitbake: event: Fix broken builds when multiconfig has a hyphen in the name 5f7fdf7b2d ("bitbake: event: Prevent bitbake from executing event handler for wrong multiconfig target") broke multiconfig builds contain a hyphen, since it's attempt to use the multiconfig as part of a function name and python functions are not allowed to contain a hyphen. Rework the bitbake multiconfig test to test a multiconfig with a hyphen and one with an underscore to validate this doesn't break in the future. (Bitbake rev: c3168df330a4563cbd03ba74de55a22217d823ed) Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- bitbake/lib/bb/event.py | 4 +-- .../runqueue-tests/conf/multiconfig/mc-1.conf | 2 ++ .../tests/runqueue-tests/conf/multiconfig/mc1.conf | 2 -- .../tests/runqueue-tests/conf/multiconfig/mc2.conf | 2 -- .../runqueue-tests/conf/multiconfig/mc_2.conf | 2 ++ bitbake/lib/bb/tests/runqueue-tests/recipes/f1.bb | 2 +- .../runqueue-tests/recipes/fails-mc/fails-mc1.bb | 4 +-- .../runqueue-tests/recipes/fails-mc/fails-mc2.bb | 4 +-- bitbake/lib/bb/tests/runqueue.py | 38 +++++++++++----------- 9 files changed, 30 insertions(+), 30 deletions(-) create mode 100644 bitbake/lib/bb/tests/runqueue-tests/conf/multiconfig/mc-1.conf delete mode 100644 bitbake/lib/bb/tests/runqueue-tests/conf/multiconfig/mc1.conf delete mode 100644 bitbake/lib/bb/tests/runqueue-tests/conf/multiconfig/mc2.conf create mode 100644 bitbake/lib/bb/tests/runqueue-tests/conf/multiconfig/mc_2.conf (limited to 'bitbake/lib/bb') diff --git a/bitbake/lib/bb/event.py b/bitbake/lib/bb/event.py index ff89959460..23e1f3187b 100644 --- a/bitbake/lib/bb/event.py +++ b/bitbake/lib/bb/event.py @@ -234,7 +234,7 @@ def register(name, handler, mask=None, filename=None, lineno=None, data=None): if data and data.getVar("BB_CURRENT_MC"): mc = data.getVar("BB_CURRENT_MC") - name = '%s%s' % (mc, name) + name = '%s%s' % (mc.replace('-', '_'), name) # already registered if name in _handlers: @@ -286,7 +286,7 @@ def remove(name, handler, data=None): if data: if data.getVar("BB_CURRENT_MC"): mc = data.getVar("BB_CURRENT_MC") - name = '%s%s' % (mc, name) + name = '%s%s' % (mc.replace('-', '_'), name) _handlers.pop(name) if name in _catchall_handlers: diff --git a/bitbake/lib/bb/tests/runqueue-tests/conf/multiconfig/mc-1.conf b/bitbake/lib/bb/tests/runqueue-tests/conf/multiconfig/mc-1.conf new file mode 100644 index 0000000000..f34b8dcccf --- /dev/null +++ b/bitbake/lib/bb/tests/runqueue-tests/conf/multiconfig/mc-1.conf @@ -0,0 +1,2 @@ +TMPDIR = "${TOPDIR}/mc1/" +BBMASK += "recipes/fails-mc/fails-mc1.bb" diff --git a/bitbake/lib/bb/tests/runqueue-tests/conf/multiconfig/mc1.conf b/bitbake/lib/bb/tests/runqueue-tests/conf/multiconfig/mc1.conf deleted file mode 100644 index f34b8dcccf..0000000000 --- a/bitbake/lib/bb/tests/runqueue-tests/conf/multiconfig/mc1.conf +++ /dev/null @@ -1,2 +0,0 @@ -TMPDIR = "${TOPDIR}/mc1/" -BBMASK += "recipes/fails-mc/fails-mc1.bb" diff --git a/bitbake/lib/bb/tests/runqueue-tests/conf/multiconfig/mc2.conf b/bitbake/lib/bb/tests/runqueue-tests/conf/multiconfig/mc2.conf deleted file mode 100644 index c3360fc5c8..0000000000 --- a/bitbake/lib/bb/tests/runqueue-tests/conf/multiconfig/mc2.conf +++ /dev/null @@ -1,2 +0,0 @@ -TMPDIR = "${TOPDIR}/mc2/" -BBMASK += "recipes/fails-mc/fails-mc2.bb" diff --git a/bitbake/lib/bb/tests/runqueue-tests/conf/multiconfig/mc_2.conf b/bitbake/lib/bb/tests/runqueue-tests/conf/multiconfig/mc_2.conf new file mode 100644 index 0000000000..c3360fc5c8 --- /dev/null +++ b/bitbake/lib/bb/tests/runqueue-tests/conf/multiconfig/mc_2.conf @@ -0,0 +1,2 @@ +TMPDIR = "${TOPDIR}/mc2/" +BBMASK += "recipes/fails-mc/fails-mc2.bb" diff --git a/bitbake/lib/bb/tests/runqueue-tests/recipes/f1.bb b/bitbake/lib/bb/tests/runqueue-tests/recipes/f1.bb index d45a4cff52..7b8fc592ab 100644 --- a/bitbake/lib/bb/tests/runqueue-tests/recipes/f1.bb +++ b/bitbake/lib/bb/tests/runqueue-tests/recipes/f1.bb @@ -1 +1 @@ -do_install[mcdepends] = "mc:mc1:mc2:a1:do_build" +do_install[mcdepends] = "mc:mc-1:mc_2:a1:do_build" diff --git a/bitbake/lib/bb/tests/runqueue-tests/recipes/fails-mc/fails-mc1.bb b/bitbake/lib/bb/tests/runqueue-tests/recipes/fails-mc/fails-mc1.bb index 17a181fffb..eed69c805a 100644 --- a/bitbake/lib/bb/tests/runqueue-tests/recipes/fails-mc/fails-mc1.bb +++ b/bitbake/lib/bb/tests/runqueue-tests/recipes/fails-mc/fails-mc1.bb @@ -1,5 +1,5 @@ python () { - if d.getVar("BB_CURRENT_MC") == "mc1": - bb.fatal("Multiconfig is mc1") + if d.getVar("BB_CURRENT_MC") == "mc-1": + bb.fatal("Multiconfig is mc-1") } diff --git a/bitbake/lib/bb/tests/runqueue-tests/recipes/fails-mc/fails-mc2.bb b/bitbake/lib/bb/tests/runqueue-tests/recipes/fails-mc/fails-mc2.bb index cc69e7b82d..3c172ef974 100644 --- a/bitbake/lib/bb/tests/runqueue-tests/recipes/fails-mc/fails-mc2.bb +++ b/bitbake/lib/bb/tests/runqueue-tests/recipes/fails-mc/fails-mc2.bb @@ -1,4 +1,4 @@ python () { - if d.getVar("BB_CURRENT_MC") == "mc2": - bb.fatal("Multiconfig is mc2") + if d.getVar("BB_CURRENT_MC") == "mc_2": + bb.fatal("Multiconfig is mc_2") } diff --git a/bitbake/lib/bb/tests/runqueue.py b/bitbake/lib/bb/tests/runqueue.py index d3d62b98f9..3d51779d6c 100644 --- a/bitbake/lib/bb/tests/runqueue.py +++ b/bitbake/lib/bb/tests/runqueue.py @@ -216,66 +216,66 @@ class RunQueueTests(unittest.TestCase): def test_multiconfig_setscene_optimise(self): with tempfile.TemporaryDirectory(prefix="runqueuetest") as tempdir: extraenv = { - "BBMULTICONFIG" : "mc1 mc2", + "BBMULTICONFIG" : "mc-1 mc_2", "BB_SIGNATURE_HANDLER" : "basic" } - cmd = ["bitbake", "b1", "mc:mc1:b1", "mc:mc2:b1"] + cmd = ["bitbake", "b1", "mc:mc-1:b1", "mc:mc_2:b1"] setscenetasks = ['package_write_ipk_setscene', 'package_write_rpm_setscene', 'packagedata_setscene', 'populate_sysroot_setscene', 'package_qa_setscene'] sstatevalid = "" tasks = self.run_bitbakecmd(cmd, tempdir, sstatevalid, extraenv=extraenv) expected = ['a1:' + x for x in self.alltasks] + ['b1:' + x for x in self.alltasks] + \ - ['mc1:b1:' + x for x in setscenetasks] + ['mc1:a1:' + x for x in setscenetasks] + \ - ['mc2:b1:' + x for x in setscenetasks] + ['mc2:a1:' + x for x in setscenetasks] + \ - ['mc1:b1:build', 'mc2:b1:build'] - for x in ['mc1:a1:package_qa_setscene', 'mc2:a1:package_qa_setscene', 'a1:build', 'a1:package_qa']: + ['mc-1:b1:' + x for x in setscenetasks] + ['mc-1:a1:' + x for x in setscenetasks] + \ + ['mc_2:b1:' + x for x in setscenetasks] + ['mc_2:a1:' + x for x in setscenetasks] + \ + ['mc-1:b1:build', 'mc_2:b1:build'] + for x in ['mc-1:a1:package_qa_setscene', 'mc_2:a1:package_qa_setscene', 'a1:build', 'a1:package_qa']: expected.remove(x) self.assertEqual(set(tasks), set(expected)) def test_multiconfig_bbmask(self): # This test validates that multiconfigs can independently mask off # recipes they do not want with BBMASK. It works by having recipes - # that will fail to parse for mc1 and mc2, then making each multiconfig + # that will fail to parse for mc-1 and mc_2, then making each multiconfig # build the one that does parse. This ensures that the recipes are in # each multiconfigs BBFILES, but each is masking only the one that # doesn't parse with tempfile.TemporaryDirectory(prefix="runqueuetest") as tempdir: extraenv = { - "BBMULTICONFIG" : "mc1 mc2", + "BBMULTICONFIG" : "mc-1 mc_2", "BB_SIGNATURE_HANDLER" : "basic", "EXTRA_BBFILES": "${COREBASE}/recipes/fails-mc/*.bb", } - cmd = ["bitbake", "mc:mc1:fails-mc2", "mc:mc2:fails-mc1"] + cmd = ["bitbake", "mc:mc-1:fails-mc2", "mc:mc_2:fails-mc1"] self.run_bitbakecmd(cmd, tempdir, "", extraenv=extraenv) def test_multiconfig_mcdepends(self): with tempfile.TemporaryDirectory(prefix="runqueuetest") as tempdir: extraenv = { - "BBMULTICONFIG" : "mc1 mc2", + "BBMULTICONFIG" : "mc-1 mc_2", "BB_SIGNATURE_HANDLER" : "TestMulticonfigDepends", "EXTRA_BBFILES": "${COREBASE}/recipes/fails-mc/*.bb", } - tasks = self.run_bitbakecmd(["bitbake", "mc:mc1:f1"], tempdir, "", extraenv=extraenv, cleanup=True) - expected = ["mc1:f1:%s" % t for t in self.alltasks] + \ - ["mc2:a1:%s" % t for t in self.alltasks] + tasks = self.run_bitbakecmd(["bitbake", "mc:mc-1:f1"], tempdir, "", extraenv=extraenv, cleanup=True) + expected = ["mc-1:f1:%s" % t for t in self.alltasks] + \ + ["mc_2:a1:%s" % t for t in self.alltasks] self.assertEqual(set(tasks), set(expected)) # A rebuild does nothing - tasks = self.run_bitbakecmd(["bitbake", "mc:mc1:f1"], tempdir, "", extraenv=extraenv, cleanup=True) + tasks = self.run_bitbakecmd(["bitbake", "mc:mc-1:f1"], tempdir, "", extraenv=extraenv, cleanup=True) self.assertEqual(set(tasks), set()) # Test that a signature change in the dependent task causes # mcdepends to rebuild - tasks = self.run_bitbakecmd(["bitbake", "mc:mc2:a1", "-c", "compile", "-f"], tempdir, "", extraenv=extraenv, cleanup=True) - expected = ["mc2:a1:compile"] + tasks = self.run_bitbakecmd(["bitbake", "mc:mc_2:a1", "-c", "compile", "-f"], tempdir, "", extraenv=extraenv, cleanup=True) + expected = ["mc_2:a1:compile"] self.assertEqual(set(tasks), set(expected)) rerun_tasks = self.alltasks[:] for x in ("fetch", "unpack", "patch", "prepare_recipe_sysroot", "configure", "compile"): rerun_tasks.remove(x) - tasks = self.run_bitbakecmd(["bitbake", "mc:mc1:f1"], tempdir, "", extraenv=extraenv, cleanup=True) - expected = ["mc1:f1:%s" % t for t in rerun_tasks] + \ - ["mc2:a1:%s" % t for t in rerun_tasks] + tasks = self.run_bitbakecmd(["bitbake", "mc:mc-1:f1"], tempdir, "", extraenv=extraenv, cleanup=True) + expected = ["mc-1:f1:%s" % t for t in rerun_tasks] + \ + ["mc_2:a1:%s" % t for t in rerun_tasks] self.assertEqual(set(tasks), set(expected)) @unittest.skipIf(sys.version_info < (3, 5, 0), 'Python 3.5 or later required') -- cgit v1.2.3-54-g00ecf