[Fuchsia] Use QEMU and QEMU host tools downloaded from CIPD.

QEMU will soon be removed from the Fuchsia SDK tarball.
This CL migrates our scripts to source QEMU from CIPD instead.

Change-Id: I2347a5be598a1eecd2d7c9e6c431b55c3eab1189
Reviewed-on: https://chromium-review.googlesource.com/1178975
Commit-Queue: Kevin Marshall <kmarshall@chromium.org>
Reviewed-by: Sergey Ulanov <sergeyu@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#584238}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: e6a59a6bf0c44a45fabe15389cd29373325eb4e8
This commit is contained in:
Kevin Marshall 2018-08-17 23:37:22 +00:00 коммит произвёл Commit Bot
Родитель cbc08db949
Коммит e55dc9d150
5 изменённых файлов: 6 добавлений и 5 удалений

Просмотреть файл

@ -121,8 +121,7 @@ action("blobstore_extended_qcow2") {
] ]
args = [ args = [
rebase_path("//third_party/fuchsia-sdk/sdk/qemu/bin/qemu-img", rebase_path("//third_party/qemu/bin/qemu-img", root_build_dir),
root_build_dir),
"convert", "convert",
"-f", "-f",
"raw", "raw",

Просмотреть файл

@ -66,6 +66,7 @@ template("fuchsia_package_runner") {
_manifest_path, _manifest_path,
"//build/fuchsia/", "//build/fuchsia/",
"//build/util/lib/", "//build/util/lib/",
"//third_party/qemu",
"${fuchsia_sdk}/", "${fuchsia_sdk}/",
] ]

Просмотреть файл

@ -85,7 +85,7 @@ def _MakeQcowDisk(output_dir, disk_path):
"""Creates a QEMU copy-on-write version of |disk_path| in the output """Creates a QEMU copy-on-write version of |disk_path| in the output
directory.""" directory."""
qimg_path = os.path.join(common.SDK_ROOT, 'qemu', 'bin', 'qemu-img') qimg_path = os.path.join(common.QEMU_ROOT, 'bin', 'qemu-img')
output_path = os.path.join(output_dir, output_path = os.path.join(output_dir,
os.path.basename(disk_path) + '.qcow2') os.path.basename(disk_path) + '.qcow2')
subprocess.check_call([qimg_path, 'create', '-q', '-f', 'qcow2', subprocess.check_call([qimg_path, 'create', '-q', '-f', 'qcow2',

Просмотреть файл

@ -6,6 +6,7 @@ import os
DIR_SOURCE_ROOT = os.path.abspath( DIR_SOURCE_ROOT = os.path.abspath(
os.path.join(os.path.dirname(__file__), os.pardir, os.pardir)) os.path.join(os.path.dirname(__file__), os.pardir, os.pardir))
QEMU_ROOT = os.path.join(DIR_SOURCE_ROOT, 'third_party', 'qemu')
SDK_ROOT = os.path.join(DIR_SOURCE_ROOT, 'third_party', 'fuchsia-sdk', 'sdk') SDK_ROOT = os.path.join(DIR_SOURCE_ROOT, 'third_party', 'fuchsia-sdk', 'sdk')
def EnsurePathExists(path): def EnsurePathExists(path):

Просмотреть файл

@ -14,7 +14,7 @@ import subprocess
import sys import sys
import time import time
from common import SDK_ROOT, EnsurePathExists from common import QEMU_ROOT, EnsurePathExists
# Virtual networking configuration data for QEMU. # Virtual networking configuration data for QEMU.
@ -55,7 +55,7 @@ class QemuTarget(target.Target):
self.Shutdown() self.Shutdown()
def Start(self): def Start(self):
qemu_path = os.path.join(SDK_ROOT, 'qemu', 'bin', qemu_path = os.path.join(QEMU_ROOT, 'bin',
'qemu-system-' + self._GetTargetSdkLegacyArch()) 'qemu-system-' + self._GetTargetSdkLegacyArch())
kernel_args = boot_data.GetKernelArgs(self._output_dir) kernel_args = boot_data.GetKernelArgs(self._output_dir)