fix emulator build without vm
authorLudwig Nussel <ludwig.nussel@suse.de>
Mon, 26 Apr 2010 08:36:18 +0000 (10:36 +0200)
committerLudwig Nussel <ludwig.nussel@suse.de>
Mon, 26 Apr 2010 08:36:18 +0000 (10:36 +0200)
common_functions
init_buildsystem

index 25fe0df..69d277a 100755 (executable)
@@ -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)
index 635d912..7124726 100755 (executable)
@@ -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()