[Title] change tizen-kvm, package install and remove script files.

[Type] bug fix
[Module] emulator / dibs
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

diff --git a/package/emulator-qemu-x86.install.ubuntu-32 b/package/emulator-qemu-x86.install.ubuntu-32
new file mode 100755 (executable)
index 0000000..ceccd00
--- /dev/null
+++ b/package/emulator-qemu-x86.install.ubuntu-32
@@ -0,0 +1,13 @@
+#!/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
+
+gksudo cp ${TIZEN_SDK_INSTALL_PATH}/tools/emulator/etc/tizen-kvm /etc/init.d/
+gksudo cp ${TIZEN_SDK_INSTALL_PATH}/tools/emulator/etc/45-tizen-kvm.rules /lib/udev/rules.d/
+gksudo update-rc.d tizen-kvm defaults
+

diff --git a/package/emulator-qemu-x86.install.ubuntu-64 b/package/emulator-qemu-x86.install.ubuntu-64
new file mode 100755 (executable)
index 0000000..ceccd00
--- /dev/null
+++ b/package/emulator-qemu-x86.install.ubuntu-64
@@ -0,0 +1,13 @@
+#!/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
+
+gksudo cp ${TIZEN_SDK_INSTALL_PATH}/tools/emulator/etc/tizen-kvm /etc/init.d/
+gksudo cp ${TIZEN_SDK_INSTALL_PATH}/tools/emulator/etc/45-tizen-kvm.rules /lib/udev/rules.d/
+gksudo update-rc.d tizen-kvm defaults
+

diff --git a/package/emulator-qemu-x86.remove.ubuntu-32 b/package/emulator-qemu-x86.remove.ubuntu-32
new file mode 100755 (executable)
index 0000000..5760887
--- /dev/null
+++ b/package/emulator-qemu-x86.remove.ubuntu-32
@@ -0,0 +1,12 @@
+#!/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
+
+gksudo update-rc.d tizen-kvm remove
+gksudo rm -f /etc/init.d/tizen-kvm
+gksudo rm -f /lib/udev/rules.d/45-tizen-kvm.rules

diff --git a/package/emulator-qemu-x86.remove.ubuntu-64 b/package/emulator-qemu-x86.remove.ubuntu-64
new file mode 100755 (executable)
index 0000000..5760887
--- /dev/null
+++ b/package/emulator-qemu-x86.remove.ubuntu-64
@@ -0,0 +1,12 @@
+#!/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
+
+gksudo update-rc.d tizen-kvm remove
+gksudo rm -f /etc/init.d/tizen-kvm
+gksudo rm -f /lib/udev/rules.d/45-tizen-kvm.rules

diff --git a/package/emulator.install.ubuntu-32 b/package/emulator.install.ubuntu-32
deleted file mode 100755 (executable)
index 9bc2e33..0000000
--- a/package/emulator.install.ubuntu-32
+++ /dev/null
@@ -1,13 +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
-
-gksudo cp ${TIZEN_SDK_INSTALL_PATH}/tools/emulator/etc/tizen_kvm /etc/init.d/
-gksudo cp ${TIZEN_SDK_INSTALL_PATH}/tools/emulator/etc/45-tizen-kvm.rules /lib/udev/rules.d/
-gksudo update-rc.d tizen-kvm defaults
-

diff --git a/package/emulator.install.ubuntu-64 b/package/emulator.install.ubuntu-64
deleted file mode 100755 (executable)
index 9bc2e33..0000000
--- a/package/emulator.install.ubuntu-64
+++ /dev/null
@@ -1,13 +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
-
-gksudo cp ${TIZEN_SDK_INSTALL_PATH}/tools/emulator/etc/tizen_kvm /etc/init.d/
-gksudo cp ${TIZEN_SDK_INSTALL_PATH}/tools/emulator/etc/45-tizen-kvm.rules /lib/udev/rules.d/
-gksudo update-rc.d tizen-kvm defaults
-

diff --git a/package/emulator.remove.ubuntu-32 b/package/emulator.remove.ubuntu-32
deleted file mode 100755 (executable)
index 67d2bd7..0000000
--- a/package/emulator.remove.ubuntu-32
+++ /dev/null
@@ -1,12 +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
-
-gksudo update-rc.d tizen-kvm remove
-gksudo rm -f /etc/init.d/tizen_kvm
-

diff --git a/package/emulator.remove.ubuntu-64 b/package/emulator.remove.ubuntu-64
deleted file mode 100755 (executable)
index 67d2bd7..0000000
--- a/package/emulator.remove.ubuntu-64
+++ /dev/null
@@ -1,12 +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
-
-gksudo update-rc.d tizen-kvm remove
-gksudo rm -f /etc/init.d/tizen_kvm
-

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 22cd625ecf9561e19798fcf39b83e420e3cb8517..ac42bee9f33f4697798e0c0ff607b6bdcbf90894 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version: 1.3.38
+Version: 1.3.39
 Maintainer: Yeong-Kyoon Lee<yeongkyoon.lee@samsung.com>
 Source: emulator
 

diff --git a/tizen/distrib/initscript/tizen-kvm b/tizen/distrib/initscript/tizen-kvm
new file mode 100755 (executable)
index 0000000..0900792
--- /dev/null
+++ b/tizen/distrib/initscript/tizen-kvm
@@ -0,0 +1,24 @@
+#!/bin/sh
+do_start () {
+       if grep -qs "^flags.* vmx" /proc/cpuinfo; then
+               modprobe -b kvm_intel
+       elif grep -qs "^flags.* svm" /proc/cpuinfo; then
+               modprobe -b kvm_amd
+       fi
+}
+
+case "$1" in
+  start)
+       do_start
+       ;;
+  restart|reload|force-reload)
+       # No-op
+       ;;
+  stop)
+       # No-op
+       ;;
+  *)
+       echo "Usage: $0 start|stop" >&2
+       exit 3
+       ;;
+esac

diff --git a/tizen/distrib/initscript/tizen_kvm b/tizen/distrib/initscript/tizen_kvm
deleted file mode 100755 (executable)
index 0900792..0000000
--- a/tizen/distrib/initscript/tizen_kvm
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-do_start () {
-       if grep -qs "^flags.* vmx" /proc/cpuinfo; then
-               modprobe -b kvm_intel
-       elif grep -qs "^flags.* svm" /proc/cpuinfo; then
-               modprobe -b kvm_amd
-       fi
-}
-
-case "$1" in
-  start)
-       do_start
-       ;;
-  restart|reload|force-reload)
-       # No-op
-       ;;
-  stop)
-       # No-op
-       ;;
-  *)
-       echo "Usage: $0 start|stop" >&2
-       exit 3
-       ;;
-esac

diff --git a/tizen/src/Makefile b/tizen/src/Makefile
index b6d230ed77f4437a63cf82069e97f29e481de824..9b50833daa24968365ea7892195eb14512d285d9 100755 (executable)
--- a/tizen/src/Makefile
+++ b/tizen/src/Makefile
@@ -86,7 +86,7 @@ else
 endif
 
 ifdef CONFIG_LINUX
-       cp -pPr ../distrib/initscript/tizen_kvm $(EMUL_DIR)/etc
+       cp -pPr ../distrib/initscript/tizen-kvm $(EMUL_DIR)/etc
        cp -pPr ../distrib/initscript/45-tizen-kvm.rules $(EMUL_DIR)/etc
 else
 
@@ -129,7 +129,7 @@ else
 endif
 
 ifdef CONFIG_LINUX
-       cp -pPr ../distrib/initscript/tizen_kvm $(EMUL_DIR)/etc
+       cp -pPr ../distrib/initscript/tizen-kvm $(EMUL_DIR)/etc
        cp -pPr ../distrib/initscript/45-tizen-kvm.rules $(EMUL_DIR)/etc
 else