From: Kitae Kim Date: Mon, 3 Sep 2012 05:19:11 +0000 (+0900) Subject: [Title] change tizen-kvm, package install and remove script files. X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~1444^2~41 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b571f16eca6818235fb48a6fd95dabcf0e1cbf56;p=sdk%2Femulator%2Fqemu.git [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 index 0000000000..ceccd00bd0 --- /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 index 0000000000..ceccd00bd0 --- /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 index 0000000000..5760887d25 --- /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 index 0000000000..5760887d25 --- /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 index 9bc2e33344..0000000000 --- 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 index 9bc2e33344..0000000000 --- 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 index 67d2bd7233..0000000000 --- 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 index 67d2bd7233..0000000000 --- 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 22cd625ecf..ac42bee9f3 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -1,4 +1,4 @@ -Version: 1.3.38 +Version: 1.3.39 Maintainer: Yeong-Kyoon Lee Source: emulator diff --git a/tizen/distrib/initscript/tizen-kvm b/tizen/distrib/initscript/tizen-kvm new file mode 100755 index 0000000000..0900792135 --- /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 index 0900792135..0000000000 --- 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 b6d230ed77..9b50833daa 100755 --- 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