[Title]remove targetlist.ini

[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

Conflicts:

	package/pkginfo.manifest

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index ffa5c85..4c9e578 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,5 +1,5 @@
 Package: emulator
-Version: 1.2.5
+Version: 1.2.9
 OS: linux
 Build-host-os: linux
 Maintainer: Yeong-Kyoon Lee<yeongkyoon.lee@samsung.com>
@@ -8,7 +8,7 @@ Source: emulator
 Description: Tizen Emulator
 
 Package: emulator
-Version: 1.2.5
+Version: 1.2.9
 OS: windows
 Build-host-os: windows
 Maintainer: Yeong-Kyoon Lee<yeongkyoon.lee@samsung.com>

diff --git a/tizen/Makefile.in b/tizen/Makefile.in
index e8a9467..3a7f248 100644 (file)
--- a/tizen/Makefile.in
+++ b/tizen/Makefile.in
@@ -13,7 +13,6 @@ install:
        cd src && $(MAKE) install
        cp -dpr ./skins $(PHONE_DIR)
        cp -dpr ./data $(PHONE_DIR)/x86
-       cp -dpr ./conf $(PHONE_DIR)/x86
        cp -dpr ./license $(PHONE_DIR)
        cp -a ./src/config_x86.ini $(PHONE_DIR)/x86/conf/config.ini
 

diff --git a/tizen/conf/targetlist.ini b/tizen/conf/targetlist.ini
deleted file mode 100644 (file)
index 974377e..0000000
--- a/tizen/conf/targetlist.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[TARGET_LIST]
-default=

diff --git a/tizen/src/Makefile.in b/tizen/src/Makefile.in
index 4649cd8..bf0192b 100644 (file)
--- a/tizen/src/Makefile.in
+++ b/tizen/src/Makefile.in
@@ -222,14 +222,12 @@ endif
        mkdir -p $(PHONE_DIR)/arm
        mkdir -p $(PHONE_DIR)/x86
        mkdir -p $(PHONE_DIR)/etc
-#      mkdir -p $(PHONE_DIR)/x86/data
-#      mkdir -p $(PHONE_DIR)/x86/data/kernel-img
+       mkdir -p $(PHONE_DIR)/x86/conf
        install emulator-x86 $(PHONE_DIR)/bin/emulator-x86
 #      install emulator-arm $(PHONE_DIR)/bin/emulator-arm
        cp -a $(VTM) $(PHONE_DIR)/bin
        cp -a ../../qemu-img $(PHONE_DIR)/bin
        cp -a vtm.glade $(PHONE_DIR)/etc
-#      cp -a config_x86.ini $(PHONE_DIR)/x86/conf/config.ini
 
 %/__dir_clean__: dummy
        cd `dirname $@` && $(MAKE) clean