From: Kitae Kim <kt920.kim@samsung.com>
Date: Fri, 15 Mar 2013 08:46:09 +0000 (+0900)
Subject: package: modify a build script for dibs.
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~1045
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7dc272605dff3d1f05bacd61930c3b3b90e17ff0;p=sdk%2Femulator%2Fqemu.git

package: modify a build script for dibs.

The script to enable kvm driver on ubuntu32 is dependent on x86 arch.

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

diff --git a/package/emulator-qemu-common.install.ubuntu-32 b/package/emulator-qemu-common.install.ubuntu-32
deleted file mode 100755
index e2b45922b0..0000000000
--- a/package/emulator-qemu-common.install.ubuntu-32
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-TIZEN_SDK_INSTALL_PATH=`echo $INSTALLED_PATH`
-if [ -z $TIZEN_SDK_INSTALL_PATH ]
-then
-#   echo "There is no TIZEN_SDK_PATH ENV" >> /tmp/emulator.log
-   exit 2;
-fi
-
-TMP_FILE=init_tizen-kvm.sh
-echo "cp ${TIZEN_SDK_INSTALL_PATH}/tools/emulator/etc/tizen-kvm /etc/init.d/" >> $TMP_FILE
-echo "cp ${TIZEN_SDK_INSTALL_PATH}/tools/emulator/etc/45-tizen-kvm.rules /lib/udev/rules.d/" >> $TMP_FILE
-echo "/etc/init.d/tizen-kvm start" >> $TMP_FILE
-echo "update-rc.d tizen-kvm defaults" >> $TMP_FILE
-
-chmod +x $TMP_FILE
-
-GKSUDO=`which gksudo`
-if [ "$GKSUDO" = "" ]
-then
-	echo "there is no gksudo."
-	sudo ./$TMP_FILE
-else
-	gksudo ./$TMP_FILE
-fi
-
-rm $TMP_FILE
diff --git a/package/emulator-qemu-common.install.ubuntu-64 b/package/emulator-qemu-common.install.ubuntu-64
deleted file mode 100755
index e2b45922b0..0000000000
--- a/package/emulator-qemu-common.install.ubuntu-64
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-TIZEN_SDK_INSTALL_PATH=`echo $INSTALLED_PATH`
-if [ -z $TIZEN_SDK_INSTALL_PATH ]
-then
-#   echo "There is no TIZEN_SDK_PATH ENV" >> /tmp/emulator.log
-   exit 2;
-fi
-
-TMP_FILE=init_tizen-kvm.sh
-echo "cp ${TIZEN_SDK_INSTALL_PATH}/tools/emulator/etc/tizen-kvm /etc/init.d/" >> $TMP_FILE
-echo "cp ${TIZEN_SDK_INSTALL_PATH}/tools/emulator/etc/45-tizen-kvm.rules /lib/udev/rules.d/" >> $TMP_FILE
-echo "/etc/init.d/tizen-kvm start" >> $TMP_FILE
-echo "update-rc.d tizen-kvm defaults" >> $TMP_FILE
-
-chmod +x $TMP_FILE
-
-GKSUDO=`which gksudo`
-if [ "$GKSUDO" = "" ]
-then
-	echo "there is no gksudo."
-	sudo ./$TMP_FILE
-else
-	gksudo ./$TMP_FILE
-fi
-
-rm $TMP_FILE
diff --git a/package/emulator-qemu-x86.install.ubuntu-32 b/package/emulator-qemu-x86.install.ubuntu-32
new file mode 100755
index 0000000000..e2b45922b0
--- /dev/null
+++ b/package/emulator-qemu-x86.install.ubuntu-32
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+TIZEN_SDK_INSTALL_PATH=`echo $INSTALLED_PATH`
+if [ -z $TIZEN_SDK_INSTALL_PATH ]
+then
+#   echo "There is no TIZEN_SDK_PATH ENV" >> /tmp/emulator.log
+   exit 2;
+fi
+
+TMP_FILE=init_tizen-kvm.sh
+echo "cp ${TIZEN_SDK_INSTALL_PATH}/tools/emulator/etc/tizen-kvm /etc/init.d/" >> $TMP_FILE
+echo "cp ${TIZEN_SDK_INSTALL_PATH}/tools/emulator/etc/45-tizen-kvm.rules /lib/udev/rules.d/" >> $TMP_FILE
+echo "/etc/init.d/tizen-kvm start" >> $TMP_FILE
+echo "update-rc.d tizen-kvm defaults" >> $TMP_FILE
+
+chmod +x $TMP_FILE
+
+GKSUDO=`which gksudo`
+if [ "$GKSUDO" = "" ]
+then
+	echo "there is no gksudo."
+	sudo ./$TMP_FILE
+else
+	gksudo ./$TMP_FILE
+fi
+
+rm $TMP_FILE
diff --git a/package/emulator-qemu-x86.install.ubuntu-64 b/package/emulator-qemu-x86.install.ubuntu-64
new file mode 100755
index 0000000000..e2b45922b0
--- /dev/null
+++ b/package/emulator-qemu-x86.install.ubuntu-64
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+TIZEN_SDK_INSTALL_PATH=`echo $INSTALLED_PATH`
+if [ -z $TIZEN_SDK_INSTALL_PATH ]
+then
+#   echo "There is no TIZEN_SDK_PATH ENV" >> /tmp/emulator.log
+   exit 2;
+fi
+
+TMP_FILE=init_tizen-kvm.sh
+echo "cp ${TIZEN_SDK_INSTALL_PATH}/tools/emulator/etc/tizen-kvm /etc/init.d/" >> $TMP_FILE
+echo "cp ${TIZEN_SDK_INSTALL_PATH}/tools/emulator/etc/45-tizen-kvm.rules /lib/udev/rules.d/" >> $TMP_FILE
+echo "/etc/init.d/tizen-kvm start" >> $TMP_FILE
+echo "update-rc.d tizen-kvm defaults" >> $TMP_FILE
+
+chmod +x $TMP_FILE
+
+GKSUDO=`which gksudo`
+if [ "$GKSUDO" = "" ]
+then
+	echo "there is no gksudo."
+	sudo ./$TMP_FILE
+else
+	gksudo ./$TMP_FILE
+fi
+
+rm $TMP_FILE
diff --git a/tizen/src/Makefile b/tizen/src/Makefile
index 4dc67fdfe3..7a139d4d82 100755
--- a/tizen/src/Makefile
+++ b/tizen/src/Makefile
@@ -129,7 +129,7 @@ else
 endif
 
 ifdef CONFIG_DARWIN
-	install_name_tool -change /opt/local/lib/libgthread-2.0.*.dylib @loader_path/libgthread-2.0.0.dylib $(EMUL_DIR)/bin/qemu-img 
+	install_name_tool -change /opt/local/lib/libgthread-2.0.*.dylib @loader_path/libgthread-2.0.0.dylib $(EMUL_DIR)/bin/qemu-img
 	install_name_tool -change /opt/local/lib/libglib-2.0.*.dylib @loader_path/libglib-2.0.0.dylib $(EMUL_DIR)/bin/qemu-img
 	install_name_tool -change /opt/local/lib/libintl.8.dylib @loader_path/libintl.8.dylib $(EMUL_DIR)/bin/qemu-img
 	install_name_tool -change /opt/local/lib/gcc47/libgcc_s.1.dylib @loader_path/libgcc_s.1.dylib $(EMUL_DIR)/bin/qemu-img
@@ -162,6 +162,7 @@ install_dibs: all_dibs
 	mkdir -p $(DIBS_COMMON_DIR)/etc
 	mkdir -p $(DIBS_X86_DIR)/bin
 	mkdir -p $(DIBS_X86_DIR)/data
+	mkdir -p $(DIBS_X86_DIR)/etc
 	mkdir -p $(DIBS_ARM_DIR)/bin
 ifndef CONFIG_DARWIN
 	@for target in $(TARGET_DIRS); do \
@@ -211,9 +212,9 @@ ifdef CONFIG_DARWIN
 	cp sdbscript $(DIBS_COMMON_DIR)/bin
 endif
 ifdef CONFIG_LINUX
-	echo "Copying tizen-kvm to $(DIBS_COMMON_DIR)/etc"
-	cp -pPr ../distrib/initscript/tizen-kvm $(DIBS_COMMON_DIR)/etc
-	cp -pPr ../distrib/initscript/45-tizen-kvm.rules $(DIBS_COMMON_DIR)/etc
+	echo "Copying tizen-kvm to $(DIBS_X86_DIR)/etc"
+	cp -pPr ../distrib/initscript/tizen-kvm $(DIBS_X86_DIR)/etc
+	cp -pPr ../distrib/initscript/45-tizen-kvm.rules $(DIBS_X86_DIR)/etc
 endif
 
 ifndef CONFIG_DARWIN