Update QEMU_CMD syntax before qemu upgrade.
The coming upgrade to qemu-kvm 0.15 appears to require a change in the
invocation of qemu in combination with chroot. This new syntax is
compatible with the current qemu-kvm version as well.
BUG=chromium-os:22309
TEST=As follows:
sudo FEATURES="test" emerge-x86-generic -1 verity
sudo FEATURES="test" emerge-arm-generic -1 verity
trybot run of x86-generic-pre-flight-queue
Change-Id: If2c82ea71ca40e5a700ea709f524a87f1a5134a6
Reviewed-on: https://gerrit.chromium.org/gerrit/11131
Reviewed-by: Matt Tennant <mtennant@chromium.org>
Tested-by: Matt Tennant <mtennant@chromium.org>
Commit-Ready: Matt Tennant <mtennant@chromium.org>
diff --git a/common.mk b/common.mk
index dbd34d1..8bc4cc3 100644
--- a/common.mk
+++ b/common.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2010 The Chromium OS Authors. All rights reserved.
+# Copyright (C) 2011 The Chromium OS Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE.makefile file.
#
@@ -368,20 +368,15 @@
endif
qemu: FORCE
-ifeq ($(USE_QEMU),1)
- $(QUIET)$(ECHO) "QEMU Preparing qemu-$(QEMU_ARCH)"
- $(QUIET)cp -f /usr/bin/qemu-$(QEMU_ARCH) $(PWD)/qemu-$(QEMU_ARCH)
- $(QUIET)chmod a+rx $(PWD)/qemu-$(QEMU_ARCH)
-endif
-
# TODO(wad) separate chroot from qemu to make it possible to cross-compile
# and test outside of the chroot.
ifeq ($(USE_QEMU),1)
- export QEMU_CMD = sudo chroot $(SYSROOT) \
- $(subst $(SYSROOT),,$(PWD))/qemu-$(QEMU_ARCH) \
+ export QEMU_CMD = sudo /usr/bin/qemu-$(QEMU_ARCH) \
+ -L $(SYSROOT) \
-drop-ld-preload \
-E LD_LIBRARY_PATH="$(SYSROOT_LDPATH)" \
- -E HOME="$(HOME)" --
+ -E HOME="$(HOME)" -- \
+ $(SYSROOT)/bin/chroot $(SYSROOT)
endif
VALGRIND_CMD =
