runqueue: add 'default' mc translation to mcdepends
PATCH 1/1 runqueue: add 'default' mc translation to mcdepends
The default mc is '' (blank), however BB_CURRENT_MC returns 'default'. Allow a user to specify a mcdepend such as:
mc:${BB_CURRENT_MC}:m2:recipe:taskBoth '' (blank) and 'default' are now supported and have equivalent meaning.
Signed-off-by Mark Hatle <[email protected]>
--- bitbake/lib/bb/runqueue.py | 4 ++++ bitbake/lib/bb/tests/runqueue-tests/recipes/g1.bb | 2 ++ bitbake/lib/bb/tests/runqueue-tests/recipes/h1.bb | 0 bitbake/lib/bb/tests/runqueue-tests/recipes/i1.bb | 0 bitbake/lib/bb/tests/runqueue.py | 7 +++++++ 5 files changed, 13 insertions(+) create mode 100644 bitbake/lib/bb/tests/runqueue-tests/recipes/g1.bb create mode 100644 bitbake/lib/bb/tests/runqueue-tests/recipes/h1.bb create mode 100644 bitbake/lib/bb/tests/runqueue-tests/recipes/i1.bb
bitbake/lib/bb/runqueue.py +4 -0
@@ -723,7 +723,11 @@ class RunQueueData: mcdependency = dep.split(':') pn = mcdependency[3] frommc = mcdependency[1] + if frommc == 'default': + frommc = '' mcdep = mcdependency[2] + if mcdep == 'default': + mcdep = '' deptask = mcdependency[4] if mcdep not in taskData: bb.fatal("Multiconfig '%s' is referenced in multiconfig dependency '%s' but not enabled in BBMULTICONFIG?" % (mcdep, dep))
bitbake/lib/bb/tests/runqueue-tests/recipes/g1.bb new file +2 -0
@@ -0,0 +1,2 @@ +do_build[mcdepends] = "mc::mc-1:h1:do_build mc:default:mc_2:i1:do_build" +
bitbake/lib/bb/tests/runqueue-tests/recipes/h1.bb new file +0 -0
bitbake/lib/bb/tests/runqueue-tests/recipes/i1.bb new file +0 -0
bitbake/lib/bb/tests/runqueue.py +7 -0
@@ -314,6 +314,13 @@ class RunQueueTests(unittest.TestCase): ["mc_2:a1:%s" % t for t in rerun_tasks] self.assertEqual(set(tasks), set(expected)) + # Test that mc::... and mc:default:... both work + tasks = self.run_bitbakecmd(["bitbake", "g1"], tempdir, "", extraenv=extraenv, cleanup=True) + expected = ["g1:%s" % t for t in self.alltasks] + \ + ["mc-1:h1:%s" % t for t in self.alltasks] + \ + ["mc_2:i1:%s" % t for t in self.alltasks] + self.assertEqual(set(tasks), set(expected)) + self.shutdown(tempdir) def test_hashserv_single(self):
Signature · 1 line
2.34.1