OLD | NEW |
1 # Copyright (c) 2011 The Chromium OS Authors. All rights reserved. | 1 # Copyright (c) 2011 The Chromium OS Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 """Module containing the various stages that a builder runs.""" | 5 """Module containing the various stages that a builder runs.""" |
6 | 6 |
7 import os | 7 import os |
8 import re | 8 import re |
9 import sys | 9 import sys |
10 import tempfile | 10 import tempfile |
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
312 | 312 |
313 class BuildTargetStage(BuilderStage): | 313 class BuildTargetStage(BuilderStage): |
314 """This stage builds Chromium OS for a target. | 314 """This stage builds Chromium OS for a target. |
315 | 315 |
316 Specifically, we build Chromium OS packages and perform imaging to get | 316 Specifically, we build Chromium OS packages and perform imaging to get |
317 the images we want per the build spec.""" | 317 the images we want per the build spec.""" |
318 def _PerformStage(self): | 318 def _PerformStage(self): |
319 BuilderStage.new_binhost = self._GetPortageEnvVar(_FULL_BINHOST) | 319 BuilderStage.new_binhost = self._GetPortageEnvVar(_FULL_BINHOST) |
320 emptytree = (BuilderStage.old_binhost and | 320 emptytree = (BuilderStage.old_binhost and |
321 BuilderStage.old_binhost != BuilderStage.new_binhost) | 321 BuilderStage.old_binhost != BuilderStage.new_binhost) |
322 env=[] | |
323 if self._build_config['useflags']: | |
324 env.append('USE="%s"' % ' '.join(self._build_config['useflags'])) | |
325 | 322 |
326 commands.Build( | 323 commands.Build( |
327 self._build_root, emptytree, usepkg=self._build_config['usepkg'], | 324 self._build_root, emptytree, usepkg=self._build_config['usepkg'], |
328 build_autotest=(self._build_config['vm_tests'] and self._options.tests), | 325 build_autotest=(self._build_config['vm_tests'] and self._options.tests)) |
329 extra_env=env) | |
330 | 326 |
331 # TODO(sosa): Do this optimization in a better way. | 327 # TODO(sosa): Do this optimization in a better way. |
332 if self._build_type == 'full': | 328 if self._build_type == 'full': |
333 commands.UploadPrebuilts( | 329 commands.UploadPrebuilts( |
334 self._build_root, self._build_config['board'], | 330 self._build_root, self._build_config['board'], |
335 self._build_config['rev_overlays'], [], self._build_type, | 331 self._build_config['rev_overlays'], [], self._build_type, |
336 False) | 332 False) |
337 | 333 |
338 commands.BuildImage(self._build_root) | 334 commands.BuildImage(self._build_root) |
339 | 335 |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
396 def _PerformStage(self): | 392 def _PerformStage(self): |
397 if self._build_type in ('preflight', 'chrome'): | 393 if self._build_type in ('preflight', 'chrome'): |
398 commands.UploadPrebuilts( | 394 commands.UploadPrebuilts( |
399 self._build_root, self._build_config['board'], | 395 self._build_root, self._build_config['board'], |
400 self._build_config['rev_overlays'], [BuilderStage.new_binhost], | 396 self._build_config['rev_overlays'], [BuilderStage.new_binhost], |
401 self._build_type, self._options.chrome_rev) | 397 self._build_type, self._options.chrome_rev) |
402 | 398 |
403 commands.UprevPush(self._build_root, self._options.tracking_branch, | 399 commands.UprevPush(self._build_root, self._options.tracking_branch, |
404 self._build_config['board'], BuilderStage.push_overlays, | 400 self._build_config['board'], BuilderStage.push_overlays, |
405 self._options.debug) | 401 self._options.debug) |
OLD | NEW |