From: Munkyu Im Date: Sat, 20 Aug 2016 08:07:32 +0000 (+0900) Subject: build: remove kvm module X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~28^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1d25fadeec86fe82b65a42d20d416023f71e4129;p=sdk%2Femulator%2Fqemu.git build: remove kvm module It is moved to emulator-supplements package. Change-Id: I6b4861e4ff9dd7117948fbe8d1f4be2ea4c0b2c7 Signed-off-by: Munkyu Im --- diff --git a/package/3.0-emulator-qemu-x86.install.linux b/package/3.0-emulator-qemu-x86.install.linux index 4d56faf144..314d8a34c1 100755 --- a/package/3.0-emulator-qemu-x86.install.linux +++ b/package/3.0-emulator-qemu-x86.install.linux @@ -1,12 +1,5 @@ #!/bin/bash -x -TIZEN_KVM_SCRIPT=/etc/init.d/tizen-kvm-multi -if [ -f ${TIZEN_KVM_SCRIPT} ] -then - echo "tizen-kvm-multi does exist. tizen-kvm does not need to be installed." - exit 0; -fi - TIZEN_SDK_INSTALL_PATH=`echo ${INSTALLED_PATH}` TIZEN_PLATFORM_ETC_PATH=$TIZEN_SDK_INSTALL_PATH/platforms/tizen-3.0/common/emulator/etc if [ -z "${TIZEN_SDK_INSTALL_PATH}" ] @@ -36,12 +29,8 @@ echo "Linux Distribution: ${OS_NAME}" TMP_FILE=init_tizen.sh echo "#!/bin/bash -x" >> ${TMP_FILE} echo "TIZEN_SDK_INSTALL_PATH=$TIZEN_SDK_INSTALL_PATH" >> ${TMP_FILE} -echo "cp \"${TIZEN_SDK_INSTALL_PATH}/platforms/${PLATFORM_VERSION}/common/emulator/etc/tizen-kvm\" /etc/init.d/" >> ${TMP_FILE} -echo "cp \"${TIZEN_SDK_INSTALL_PATH}/platforms/${PLATFORM_VERSION}/common/emulator/etc/45-tizen-kvm.rules\" /lib/udev/rules.d/" >> ${TMP_FILE} echo "cp \"${TIZEN_SDK_INSTALL_PATH}/platforms/${PLATFORM_VERSION}/common/emulator/etc/tizen-vhost-net\" /etc/init.d/" >> ${TMP_FILE} echo "cp \"${TIZEN_SDK_INSTALL_PATH}/platforms/${PLATFORM_VERSION}/common/emulator/etc/45-tizen-vhost-net.rules\" /lib/udev/rules.d/" >> ${TMP_FILE} -echo "/etc/init.d/tizen-kvm start" >> ${TMP_FILE} -echo "/etc/init.d/tizen-vhost-net start" >> ${TMP_FILE} echo "cp \"${TIZEN_PLATFORM_ETC_PATH}/emulator-ifup.sh\" /etc" >> $TMP_FILE echo "if [ ! -d /etc/sudoers.d ];then" >> $TMP_FILE echo "mkdir /etc/sudoers.d" >> $TMP_FILE diff --git a/package/3.0-emulator-qemu-x86.remove.linux b/package/3.0-emulator-qemu-x86.remove.linux index 5728dc6ca1..1b3afc2f16 100755 --- a/package/3.0-emulator-qemu-x86.remove.linux +++ b/package/3.0-emulator-qemu-x86.remove.linux @@ -1,12 +1,5 @@ #!/bin/bash -ex -TIZEN_KVM_SCRIPT="/etc/init.d/tizen-kvm-multi" -if [ -f ${TIZEN_KVM_SCRIPT} ] -then - echo "tizen-kvm-multi does exist. tizen-kvm does not need to be uninstalled." - exit 0; -fi - TIZEN_SDK_INSTALL_PATH=`echo ${INSTALLED_PATH}` if [ -z "${TIZEN_SDK_INSTALL_PATH}" ] then @@ -31,12 +24,6 @@ echo "Linux Distribution: ${OS_NAME}" TMP_FILE=remove_tizen-init.sh echo "#!/bin/bash -ex" >> ${TMP_FILE} -if [ "ubuntu" = "${OS_NAME}" ] ; then - echo "update-rc.d -f tizen-kvm remove" >> ${TMP_FILE} - echo "update-rc.d -f tizen-vhost-net remove" >> ${TMP_FILE} -fi -echo "rm -f /etc/init.d/tizen-kvm" >> ${TMP_FILE} -echo "rm -f /lib/udev/rules.d/45-tizen-kvm.rules" >> ${TMP_FILE} echo "rm -f /etc/init.d/tizen-vhost-net" >> ${TMP_FILE} echo "rm -f /lib/udev/rules.d/45-tizen-vhost-net.rules" >> ${TMP_FILE} @@ -44,7 +31,7 @@ chmod +x ${TMP_FILE} if [ "${TSUDO}" != "" ] # since installer v2.27 then - TSUDO_MSG="Enter your password to remove /etc/init.d/tizen-kvm, /etc/init.d/tizen-vhost-net." + TSUDO_MSG="Enter your password to remove /etc/init.d/tizen-vhost-net." TMP_PATH="`pwd`/${TMP_FILE}" $TSUDO -m "${TSUDO_MSG}" bash "${TMP_PATH}" else diff --git a/tizen/src/Makefile b/tizen/src/Makefile index c39b01ac1c..f7185f52c0 100755 --- a/tizen/src/Makefile +++ b/tizen/src/Makefile @@ -68,12 +68,6 @@ ifdef CONFIG_DARWIN endif endif -# Enable HW Virtualization on Linux -ifdef CONFIG_LINUX - cp -pP ../supplements/SDK/tizen-kvm $(EMUL_DIR)/etc - cp -pP ../supplements/SDK/45-tizen-kvm.rules $(EMUL_DIR)/etc -endif - # Enable vhost-net on Linux ifdef CONFIG_LINUX cp -pP ../supplements/SDK/tizen-vhost-net $(EMUL_DIR)/etc diff --git a/tizen/supplements/SDK/45-tizen-kvm.rules b/tizen/supplements/SDK/45-tizen-kvm.rules deleted file mode 100644 index c2f7317aac..0000000000 --- a/tizen/supplements/SDK/45-tizen-kvm.rules +++ /dev/null @@ -1 +0,0 @@ -KERNEL=="kvm", GROUP="kvm", MODE="0660" diff --git a/tizen/supplements/SDK/tizen-kvm b/tizen/supplements/SDK/tizen-kvm deleted file mode 100755 index 49546ad8ac..0000000000 --- a/tizen/supplements/SDK/tizen-kvm +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: tizen-kvm -# Required-Start: $local_fs $syslog -# Required-Stop: $local_fs $syslog -# Should-Start: udev -# Should-Stop: udev -# Default-Start: 2 3 4 5 -# Default-Stop: 1 -# Short-Description: modprobe kvm module. -# Description: enable kvm module to use hardware virtualization. -### END INIT INFO - -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 -} - -add_group () { - # Add the kvm group unless it's already there - if ! getent group kvm > /dev/null; then - addgroup --quiet --system kvm || true - fi -} - -do_udev () { - # udev rules for /dev/kvm have changed, so have udev recalculate - udevadm trigger --subsystem-match=misc --action=change -} - -case "$1" in - start) - do_start -# add_group - do_udev - ;; - restart|reload|force-reload) - # No-op - ;; - stop) - # No-op - ;; - *) - echo "Usage: $0 start|stop" >&2 - exit 3 - ;; -esac