From cb37f53db30c23804f008932b03f283ece32ef4b Mon Sep 17 00:00:00 2001 From: Kitae Kim Date: Thu, 1 Nov 2012 15:41:51 +0900 Subject: [PATCH] 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 --- package/changelog | 6 +++++- package/pkginfo.manifest | 2 +- tizen/src/Makefile | 4 ---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/changelog b/package/changelog index 07958e70b6..a5b1cdafb4 100644 --- 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 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 2012-1031 +== Jinhyung Jo 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 9ead546f0e..0de5a4804c 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -1,4 +1,4 @@ -Version: 1.3.68 +Version: 1.3.69 Maintainer: Yeong-Kyoon Lee Source: emulator diff --git a/tizen/src/Makefile b/tizen/src/Makefile index f71dd8bb6e..40d94fbc6d 100755 --- 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) \ -- 2.34.1