diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-02-13 11:41:31 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-22 20:25:30 +0000 |
| commit | 5210cc40db41a470c561b7bd7193d246c3c7e1f2 (patch) | |
| tree | 15c08794ca938300f9a35ca22ce0789b8c1791ba /bitbake/lib/bb/cooker.py | |
| parent | 0aedc60b02247749ab78230e3d7dfc3542882c8a (diff) | |
| download | poky-5210cc40db41a470c561b7bd7193d246c3c7e1f2.tar.gz | |
bitbake: show appropriate warnings for universe target
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]
(Bitbake rev: 293c796e8a3d1f74ca1e51017b6dede261612281)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/cooker.py')
| -rw-r--r-- | bitbake/lib/bb/cooker.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 1a9cab7dc8..f0778e5a46 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
| @@ -1084,6 +1084,7 @@ class BBCooker: | |||
| 1084 | if (task == None): | 1084 | if (task == None): |
| 1085 | task = self.configuration.cmd | 1085 | task = self.configuration.cmd |
| 1086 | 1086 | ||
| 1087 | universe = ('universe' in targets) | ||
| 1087 | targets = self.checkPackages(targets) | 1088 | targets = self.checkPackages(targets) |
| 1088 | 1089 | ||
| 1089 | def buildTargetsIdle(server, rq, abort): | 1090 | def buildTargetsIdle(server, rq, abort): |
| @@ -1127,6 +1128,8 @@ class BBCooker: | |||
| 1127 | taskdata.add_unresolved(localdata, self.status) | 1128 | taskdata.add_unresolved(localdata, self.status) |
| 1128 | 1129 | ||
| 1129 | rq = bb.runqueue.RunQueue(self, self.configuration.data, self.status, taskdata, runlist) | 1130 | rq = bb.runqueue.RunQueue(self, self.configuration.data, self.status, taskdata, runlist) |
| 1131 | if universe: | ||
| 1132 | rq.rqdata.warn_multi_bb = True | ||
| 1130 | 1133 | ||
| 1131 | self.server_registration_cb(buildTargetsIdle, rq) | 1134 | self.server_registration_cb(buildTargetsIdle, rq) |
| 1132 | 1135 | ||
| @@ -1180,6 +1183,7 @@ class BBCooker: | |||
| 1180 | pkgs_to_build.append(t) | 1183 | pkgs_to_build.append(t) |
| 1181 | 1184 | ||
| 1182 | if 'universe' in pkgs_to_build: | 1185 | if 'universe' in pkgs_to_build: |
| 1186 | parselog.warn("The \"universe\" target is only intended for testing and may produce errors.") | ||
| 1183 | parselog.debug(1, "collating packages for \"universe\"") | 1187 | parselog.debug(1, "collating packages for \"universe\"") |
| 1184 | pkgs_to_build.remove('universe') | 1188 | pkgs_to_build.remove('universe') |
| 1185 | for t in self.status.universe_target: | 1189 | for t in self.status.universe_target: |
