commit a5d8b55f50d2643c4fa7d94a25c4bcb0a20717c9
author Bertrand SIMONNET <bsimonnet@chromium.org> Wed Mar 25 16:03:34 2015 -0700
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Fri Mar 27 22:21:22 2015 +0000
tree 92e547e5282a93975d7a4425508cee1f9672f291
parent e116fff921f4e2625026921f26f4868ca6559c19

Use sysroot_lib to generate sysroot configuration.

When creating sysroots, use sysroot_lib to generate configuration. This
preserve the invariant that all sysroot have a valid standard
configuration file (etc/make.conf.board_setup) that other tools can use.

BUG=brillo:662
TEST=unittests
TEST=trybot run on daisy.

CQ-DEPEND=CL:262376

Change-Id: I41848c193321428ebc18a37f7709ce4479a554d9
Reviewed-on: https://chromium-review.googlesource.com/262485
Trybot-Ready: Bertrand Simonnet <bsimonnet@chromium.org>
Tested-by: Bertrand Simonnet <bsimonnet@chromium.org>
Reviewed-by: Steve Fung <stevefung@chromium.org>
Commit-Queue: Bertrand Simonnet <bsimonnet@chromium.org>

scripts/cros_generate_sysroot.py

diff --git a/scripts/cros_generate_sysroot.py b/scripts/cros_generate_sysroot.py
index 662dfc1..bd48d7a 100644
--- a/scripts/cros_generate_sysroot.py
+++ b/scripts/cros_generate_sysroot.py
@@ -16,6 +16,7 @@
 from chromite.lib import commandline
 from chromite.lib import osutils
 from chromite.lib import sudo
+from chromite.lib import sysroot_lib
 
 DEFAULT_NAME = 'sysroot_%(package)s.tar.xz'
 PACKAGE_SEPARATOR = '/'
@@ -68,6 +69,9 @@
     cros_build_lib.SudoRunCommand(cmd, **kwargs)
 
   def _InstallToolchain(self):
+    # Create the sysroot's config.
+    config = sysroot_lib.GenerateBoardConfig(self.sysroot, self.options.board)
+    sysroot_lib.WriteSysrootConfig(self.sysroot, config)
     cros_build_lib.RunCommand(
         [os.path.join(constants.CROSUTILS_DIR, 'install_toolchain'),
          '--noconfigure', '--board_root', self.sysroot, '--board',