From patchwork Mon Feb 13 11:41:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [bitbake-devel, 1/3] bitbake: show appropriate warnings for universe target Date: Mon, 13 Feb 2012 11:41:31 -0000 From: Paul Eggleton X-Patchwork-Id: 21187 Message-Id: To: bitbake-devel@lists.openembedded.org When building the universe target: * Show a warning about universe likely producing errors * Multiprovider errors are now shown as warnings Also remove an unused "error" variable in runqueue.py. Fixes [YOCTO #1936] Signed-off-by: Paul Eggleton --- bitbake/lib/bb/cooker.py | 4 ++++ bitbake/lib/bb/runqueue.py | 10 +++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index bb09dff..b5cf9e1 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -1083,6 +1083,7 @@ class BBCooker: if (task == None): task = self.configuration.cmd + universe = ('universe' in targets) targets = self.checkPackages(targets) def buildTargetsIdle(server, rq, abort): @@ -1126,6 +1127,8 @@ class BBCooker: taskdata.add_unresolved(localdata, self.status) rq = bb.runqueue.RunQueue(self, self.configuration.data, self.status, taskdata, runlist) + if universe: + rq.rqdata.warn_multi_bb = True self.server_registration_cb(buildTargetsIdle, rq) @@ -1179,6 +1182,7 @@ class BBCooker: pkgs_to_build.append(t) if 'universe' in pkgs_to_build: + parselog.warn("The \"universe\" target is only intended for testing and may produce errors.") parselog.debug(1, "collating packages for \"universe\"") pkgs_to_build.remove('universe') for t in self.status.universe_target: diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 7bf4320..c24841f 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py @@ -187,6 +187,7 @@ class RunQueueData: self.taskData = taskData self.targets = targets self.rq = rq + self.warn_multi_bb = False self.stampwhitelist = cfgData.getVar("BB_STAMP_WHITELIST", 1) or "" self.multi_provider_whitelist = (cfgData.getVar("MULTI_PROVIDER_WHITELIST", 1) or "").split() @@ -674,11 +675,14 @@ class RunQueueData: prov_list[prov] = [fn] elif fn not in prov_list[prov]: prov_list[prov].append(fn) - error = False for prov in prov_list: if len(prov_list[prov]) > 1 and prov not in self.multi_provider_whitelist: - error = True - logger.error("Multiple .bb files are due to be built which each provide %s (%s).\n This usually means one provides something the other doesn't and should.", prov, " ".join(prov_list[prov])) + msg = "Multiple .bb files are due to be built which each provide %s (%s)." % (prov, " ".join(prov_list[prov])) + if self.warn_multi_bb: + logger.warn(msg) + else: + msg += "\n This usually means one provides something the other doesn't and should." + logger.error(msg) # Create a whitelist usable by the stamp checks