From: Ludwig Nussel Date: Mon, 26 Apr 2010 08:36:18 +0000 (+0200) Subject: fix emulator build without vm X-Git-Tag: obs_2.0~26 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b5a3aaa1f3cd9d0cf6e60c3e715fe73ed848b7f5;p=platform%2Fupstream%2Fbuild.git fix emulator build without vm --- diff --git a/common_functions b/common_functions index 25fe0df..69d277a 100755 --- a/common_functions +++ b/common_functions @@ -55,6 +55,10 @@ check_use_emulator() { is_emulator_arch || return + if [ -z "$VM_TYPE" ]; then + return 0 + fi + # to run the qemu initialization in the XEN chroot, we need to register it with a statically build shell case "$BUILD_HOST_ARCH" in i?86|x86_64) diff --git a/init_buildsystem b/init_buildsystem index 635d912..7124726 100755 --- a/init_buildsystem +++ b/init_buildsystem @@ -324,9 +324,11 @@ copy_qemu() # To initially run the init script, there needs to be also a # static bash to register qemu in this chroot and to start up # /.build/build - mkdir -p $BUILD_ROOT/bin - install -m755 /bin/bash-static $BUILD_ROOT/bin - install -m755 /bin/mount-static $BUILD_ROOT/bin + if [ -n "$PREPARE_VM" ]; then + mkdir -p $BUILD_ROOT/bin + install -m755 /bin/bash-static $BUILD_ROOT/bin + install -m755 /bin/mount-static $BUILD_ROOT/bin + fi } check_binfmt_registered()