package: modify tizen Makefile.

Remove to copy kvmvapic.bin file in the Makefile, because
it make qemu to be crashed with haxm.

Signed-off-by: Kitae Kim <kt920.kim@samsung.com>

diff --git a/package/changelog b/package/changelog
index 07958e7..a5b1cda 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,7 +1,11 @@
+* 1.3.69
+- Fix the crashed problem of emulator with haxm.
+- haxm has conflicted with kvmvapic.bin file.
+== Kitae Kim <kt920.kim@samsung.com> 2012-11-01
 * 1.3.68
 - The camera device for Windows supports RGB24 and I420 image formats, in additionally.
 - The range of brightness level has been changed.(1 ~ 24 => 0 ~ 100)
-== Jinhyung Jo <jinhyung.jo@samsung.com> 2012-1031
+== Jinhyung Jo <jinhyung.jo@samsung.com> 2012-10-31
 * 1.3.67
 - Fix build error on macos.
 - vga_common_init function has been changed since QEMU 1.2.

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 9ead546..0de5a48 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version: 1.3.68
+Version: 1.3.69
 Maintainer: Yeong-Kyoon Lee<yeongkyoon.lee@samsung.com>
 Source: emulator
 

diff --git a/tizen/src/Makefile b/tizen/src/Makefile
index f71dd8b..40d94fb 100755 (executable)
--- a/tizen/src/Makefile
+++ b/tizen/src/Makefile
@@ -80,7 +80,6 @@ ifndef CONFIG_DARWIN
                echo "Copying bioses to $(EMUL_DIR)/data/bios" ;\
                cp -dpr ../../pc-bios/bios.bin $(EMUL_DIR)/data/bios ;\
                cp -dpr ../../pc-bios/linuxboot.bin $(EMUL_DIR)/data/bios ;\
-               cp -dpr ../../pc-bios/kvmvapic.bin $(EMUL_DIR)/data/bios ;\
                cp -dpr ../../pc-bios/pxe-virtio.rom $(EMUL_DIR)/data/bios ;\
                ;; \
        arm-softmmu) \
@@ -103,7 +102,6 @@ else
                echo "Copying bioses to $(EMUL_DIR)/data/bios" ;\
                cp -pPR ../../pc-bios/bios.bin $(EMUL_DIR)/data/bios ;\
                cp -pPR ../../pc-bios/linuxboot.bin $(EMUL_DIR)/data/bios ;\
-               cp -pPR ../../pc-bios/kvmvapic.bin $(EMUL_DIR)/data/bios ;\
                cp -pPR ../../pc-bios/pxe-virtio.rom $(EMUL_DIR)/data/bios ;\
                ;; \
        arm-softmmu) \
@@ -163,7 +161,6 @@ ifndef CONFIG_DARWIN
                echo "Copying bioses to $(DIBS_X86_DIR)/data/bios" ;\
                cp -dpr ../../pc-bios/bios.bin $(DIBS_X86_DIR)/data/bios ;\
                cp -dpr ../../pc-bios/linuxboot.bin $(DIBS_X86_DIR)/data/bios ;\
-               cp -dpr ../../pc-bios/kvmvapic.bin $(DIBS_X86_DIR)/data/bios ;\
                cp -dpr ../../pc-bios/pxe-virtio.rom $(DIBS_X86_DIR)/data/bios ;\
                ;; \
        arm-softmmu) \
@@ -186,7 +183,6 @@ else
                echo "Copying bioses to $(DIBS_X86_DIR)/data/bios" ;\
                cp -pPR ../../pc-bios/bios.bin $(DIBS_X86_DIR)/data/bios ;\
                cp -pPR ../../pc-bios/linuxboot.bin $(DIBS_X86_DIR)/data/bios ;\
-               cp -pPR ../../pc-bios/kvmvapic.bin $(DIBS_X86_DIR)/data/bios ;\
                cp -pPR ../../pc-bios/pxe-virtio.rom $(DIBS_X86_DIR)/data/bios ;\
                ;; \
        arm-softmmu) \