diff options
| -rwxr-xr-x | build_tc.py | 3 | ||||
| -rw-r--r-- | cros_utils/misc.py | 13 | ||||
| -rwxr-xr-x | dejagnu/gdb_dejagnu.py | 2 | ||||
| -rwxr-xr-x | test_gcc_dejagnu.py | 2 | ||||
| -rwxr-xr-x | test_gdb_dejagnu.py | 2 |
5 files changed, 6 insertions, 16 deletions
diff --git a/build_tc.py b/build_tc.py index 4f022d29..c14b6905 100755 --- a/build_tc.py +++ b/build_tc.py @@ -59,8 +59,7 @@ class ToolchainPart(object): cross_symlink = os.path.join(self._chromeos_root, 'chroot', 'usr/local/bin/emerge-%s' % self._board) if not os.path.exists(cross_symlink): - command = ('%s/setup_board --board=%s' % (misc.CHROMEOS_SCRIPTS_DIR, - self._board)) + command = 'setup_board --board=%s' % self._board self._ce.ChrootRunCommand(self._chromeos_root, command) def Build(self): diff --git a/cros_utils/misc.py b/cros_utils/misc.py index f9034b89..58076f40 100644 --- a/cros_utils/misc.py +++ b/cros_utils/misc.py @@ -161,19 +161,11 @@ def GetBuildImageCommand(board, dev=False): def GetSetupBoardCommand(board, - gcc_version=None, - binutils_version=None, usepkg=None, force=None): """Get setup_board command.""" options = [] - if gcc_version: - options.append('--gcc_version=%s' % gcc_version) - - if binutils_version: - options.append('--binutils_version=%s' % binutils_version) - if usepkg: options.append('--usepkg') else: @@ -182,10 +174,9 @@ def GetSetupBoardCommand(board, if force: options.append('--force') - options.append('--accept_licenses=@CHROMEOS') + options.append('--accept-licenses=@CHROMEOS') - return ('%s/setup_board --board=%s %s' % (CHROMEOS_SCRIPTS_DIR, board, - ' '.join(options))) + return 'setup_board --board=%s %s' % (board, ' '.join(options)) def CanonicalizePath(path): diff --git a/dejagnu/gdb_dejagnu.py b/dejagnu/gdb_dejagnu.py index c01d909b..eb298e6a 100755 --- a/dejagnu/gdb_dejagnu.py +++ b/dejagnu/gdb_dejagnu.py @@ -196,7 +196,7 @@ class DejagnuExecuter(object): self.PrepareGdbserverDefault() def PrepareGdbserverDefault(self): - cmd = ('./setup_board --board {0}; ' + cmd = ('setup_board --board {0}; ' '{1} emerge-{0} gdb'.format(self._board, self._mount_flag)) ret = self._executer.ChrootRunCommand(self._chromeos_root, cmd, diff --git a/test_gcc_dejagnu.py b/test_gcc_dejagnu.py index cd2e0cde..4ea0c51e 100755 --- a/test_gcc_dejagnu.py +++ b/test_gcc_dejagnu.py @@ -55,7 +55,7 @@ class DejagnuAdapter(object): raise RuntimeError('Failed to create chroot.') def SetupBoard(self): - cmd = './setup_board --board=' + self._board + cmd = 'setup_board --board=' + self._board ret = self._cmd_exec.ChrootRunCommand( self._chromeos_root, cmd, terminated_timeout=4000) if ret: diff --git a/test_gdb_dejagnu.py b/test_gdb_dejagnu.py index c2a4ba9a..6f37a4c9 100755 --- a/test_gdb_dejagnu.py +++ b/test_gdb_dejagnu.py @@ -42,7 +42,7 @@ class DejagnuAdapter(object): raise RuntimeError('Failed to create chroot.') def SetupBoard(self): - cmd = './setup_board --board=' + self._board + cmd = 'setup_board --board=' + self._board ret = self._cmd_exec.ChrootRunCommand( self._chromeos_root, cmd, terminated_timeout=4000) if ret: |