From: Munkyu Im <munkyu.im@samsung.com>
Date: Sat, 20 Aug 2016 07:27:18 +0000 (+0900)
Subject: build: remove check-xxx and kvm module
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3~10^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5b0b4b981cac6e2db1f17ceadcdc822040e53669;p=sdk%2Femulator%2Fqemu.git

build: remove check-xxx and kvm module

These are moved to emulator-supplements package.

Change-Id: I29ea0d6bd15dbd6a887dca657243a650d19ace31
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>
---

diff --git a/package/2.3-emulator-qemu-x86.install.ubuntu-32 b/package/2.3-emulator-qemu-x86.install.ubuntu-32
index 281d3a7417..9e02c2601d 100755
--- a/package/2.3-emulator-qemu-x86.install.ubuntu-32
+++ b/package/2.3-emulator-qemu-x86.install.ubuntu-32
@@ -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}`
 if [ -z "${TIZEN_SDK_INSTALL_PATH}" ]
 then
@@ -30,57 +23,3 @@ if [ ! -z "${OS_NAME}" ]; then
 	OS_NAME=`echo ${OS_NAME} | tr '[:upper:]' '[:lower:]'`
 fi
 echo "Linux Distribution: ${OS_NAME}"
-
-TMP_FILE=init_tizen-kvm.sh
-echo "#!/bin/bash -ex" >> ${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 "/etc/init.d/tizen-kvm start" >> ${TMP_FILE}
-if [ "ubuntu" = "${OS_NAME}" ] ; then
-	echo "update-rc.d tizen-kvm defaults" >> ${TMP_FILE}
-fi
-
-chmod +x ${TMP_FILE}
-
-if [ "${TSUDO}" != "" ] # since installer v2.27
-then
-	TSUDO_MSG="Enter your password to enable kvm module if your machine supports hardware virtualization."
-	TMP_PATH="`pwd`/${TMP_FILE}"
-	"${TSUDO}" -m "${TSUDO_MSG}" sh "${TMP_PATH}"
-else
-	GKSUDO=`which gksudo`
-	if [ "${GKSUDO}" = "" ]
-	then
-		echo "there is no gksudo."
-		sudo ./${TMP_FILE}
-	else
-		gksudo ./${TMP_FILE}
-	fi
-fi
-
-rm ${TMP_FILE}
-
-# run check-gl and show pop-up if using gallium driver.
-CHECK_GL_CMD=${TIZEN_SDK_INSTALL_PATH}/platforms/${PLATFORM_VERSION}/emulator/bin/check-gl
-
-showGraphicDriverWarning()
-{
-	zenity --error --no-wrap --text="
-You are using invalid graphic card driver for the emulator.
-You have to use the lastest vendor-provided graphic card driver.
-
-For more information, see under ubuntu driver help page.
-https://help.ubuntu.com/community/BinaryDriverHowto/ "
-}
-
-
-$CHECK_GL_CMD
-RET=$?
-echo "check_gl return : $RET"
-if [ "$RET" = "0" ] ; then
-        echo "check-gl ... OK."
-elif [ "$RET" = "2" ] ; then
-        # show warning dialog
-        echo "check-gl ... fail."
-        showGraphicDriverWarning
-fi
diff --git a/package/2.3-emulator-qemu-x86.install.ubuntu-64 b/package/2.3-emulator-qemu-x86.install.ubuntu-64
index 281d3a7417..9e02c2601d 100755
--- a/package/2.3-emulator-qemu-x86.install.ubuntu-64
+++ b/package/2.3-emulator-qemu-x86.install.ubuntu-64
@@ -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}`
 if [ -z "${TIZEN_SDK_INSTALL_PATH}" ]
 then
@@ -30,57 +23,3 @@ if [ ! -z "${OS_NAME}" ]; then
 	OS_NAME=`echo ${OS_NAME} | tr '[:upper:]' '[:lower:]'`
 fi
 echo "Linux Distribution: ${OS_NAME}"
-
-TMP_FILE=init_tizen-kvm.sh
-echo "#!/bin/bash -ex" >> ${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 "/etc/init.d/tizen-kvm start" >> ${TMP_FILE}
-if [ "ubuntu" = "${OS_NAME}" ] ; then
-	echo "update-rc.d tizen-kvm defaults" >> ${TMP_FILE}
-fi
-
-chmod +x ${TMP_FILE}
-
-if [ "${TSUDO}" != "" ] # since installer v2.27
-then
-	TSUDO_MSG="Enter your password to enable kvm module if your machine supports hardware virtualization."
-	TMP_PATH="`pwd`/${TMP_FILE}"
-	"${TSUDO}" -m "${TSUDO_MSG}" sh "${TMP_PATH}"
-else
-	GKSUDO=`which gksudo`
-	if [ "${GKSUDO}" = "" ]
-	then
-		echo "there is no gksudo."
-		sudo ./${TMP_FILE}
-	else
-		gksudo ./${TMP_FILE}
-	fi
-fi
-
-rm ${TMP_FILE}
-
-# run check-gl and show pop-up if using gallium driver.
-CHECK_GL_CMD=${TIZEN_SDK_INSTALL_PATH}/platforms/${PLATFORM_VERSION}/emulator/bin/check-gl
-
-showGraphicDriverWarning()
-{
-	zenity --error --no-wrap --text="
-You are using invalid graphic card driver for the emulator.
-You have to use the lastest vendor-provided graphic card driver.
-
-For more information, see under ubuntu driver help page.
-https://help.ubuntu.com/community/BinaryDriverHowto/ "
-}
-
-
-$CHECK_GL_CMD
-RET=$?
-echo "check_gl return : $RET"
-if [ "$RET" = "0" ] ; then
-        echo "check-gl ... OK."
-elif [ "$RET" = "2" ] ; then
-        # show warning dialog
-        echo "check-gl ... fail."
-        showGraphicDriverWarning
-fi
diff --git a/package/2.3-emulator-qemu-x86.remove.ubuntu-32 b/package/2.3-emulator-qemu-x86.remove.ubuntu-32
index 32f7f442de..70196cda97 100755
--- a/package/2.3-emulator-qemu-x86.remove.ubuntu-32
+++ b/package/2.3-emulator-qemu-x86.remove.ubuntu-32
@@ -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
@@ -28,31 +21,3 @@ if [ ! -z "${OS_NAME}" ]; then
 	OS_NAME=`echo ${OS_NAME} | tr '[:upper:]' '[:lower:]'`
 fi
 echo "Linux Distribution: ${OS_NAME}"
-
-TMP_FILE=remove_tizen-kvm.sh
-echo "#!/bin/bash -ex" >> ${TMP_FILE}
-if [ "ubuntu" = "${OS_NAME}" ] ; then
-	echo "update-rc.d -f tizen-kvm 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}
-
-chmod +x ${TMP_FILE}
-
-if [ "${TSUDO}" != "" ] # since installer v2.27
-then
-	TSUDO_MSG="Enter your password to remove /etc/init.d/tizen-kvm."
-	TMP_PATH="`pwd`/${TMP_FILE}"
-	"$TSUDO" -m "${TSUDO_MSG}" sh "${TMP_PATH}"
-else
-	GKSUDO=`which gksudo`
-	if [ "${GKSUDO}" = "" ]
-	then
-		echo "there is no gksudo."
-		sudo ./${TMP_FILE}
-	else
-		gksudo ./${TMP_FILE}
-	fi
-fi
-
-rm ${TMP_FILE}
diff --git a/package/2.3-emulator-qemu-x86.remove.ubuntu-64 b/package/2.3-emulator-qemu-x86.remove.ubuntu-64
index 32f7f442de..70196cda97 100755
--- a/package/2.3-emulator-qemu-x86.remove.ubuntu-64
+++ b/package/2.3-emulator-qemu-x86.remove.ubuntu-64
@@ -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
@@ -28,31 +21,3 @@ if [ ! -z "${OS_NAME}" ]; then
 	OS_NAME=`echo ${OS_NAME} | tr '[:upper:]' '[:lower:]'`
 fi
 echo "Linux Distribution: ${OS_NAME}"
-
-TMP_FILE=remove_tizen-kvm.sh
-echo "#!/bin/bash -ex" >> ${TMP_FILE}
-if [ "ubuntu" = "${OS_NAME}" ] ; then
-	echo "update-rc.d -f tizen-kvm 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}
-
-chmod +x ${TMP_FILE}
-
-if [ "${TSUDO}" != "" ] # since installer v2.27
-then
-	TSUDO_MSG="Enter your password to remove /etc/init.d/tizen-kvm."
-	TMP_PATH="`pwd`/${TMP_FILE}"
-	"$TSUDO" -m "${TSUDO_MSG}" sh "${TMP_PATH}"
-else
-	GKSUDO=`which gksudo`
-	if [ "${GKSUDO}" = "" ]
-	then
-		echo "there is no gksudo."
-		sudo ./${TMP_FILE}
-	else
-		gksudo ./${TMP_FILE}
-	fi
-fi
-
-rm ${TMP_FILE}
diff --git a/tizen/distrib/initscript/45-tizen-kvm.rules b/tizen/distrib/initscript/45-tizen-kvm.rules
deleted file mode 100644
index c2f7317aac..0000000000
--- a/tizen/distrib/initscript/45-tizen-kvm.rules
+++ /dev/null
@@ -1 +0,0 @@
-KERNEL=="kvm", GROUP="kvm", MODE="0660"
diff --git a/tizen/distrib/initscript/tizen-kvm b/tizen/distrib/initscript/tizen-kvm
deleted file mode 100755
index 2f9c5c4890..0000000000
--- a/tizen/distrib/initscript/tizen-kvm
+++ /dev/null
@@ -1,56 +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 () {
-	# remove group::--- acl mistakenly placed on /dev/kvm by udev-acl
-	if [ -c /dev/kvm -a ! -L /dev/kvm ]
-	then
-		/usr/bin/setfacl -m g::rw /dev/kvm
-	fi
-
-	# 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
diff --git a/tizen/src/Makefile b/tizen/src/Makefile
index 67fa27bf66..b7c1bfff5b 100644
--- a/tizen/src/Makefile
+++ b/tizen/src/Makefile
@@ -15,14 +15,6 @@ endif
 ifneq ($(wildcard ../../config-host.mak),)
 include ../../config-host.mak
 
-TARGET_EXE += util/check-cam$(EXESUF)
-ifdef CONFIG_YAGL
-TARGET_EXE += util/check-gl$(EXESUF)
-endif
-ifndef CONFIG_LINUX
-TARGET_EXE += util/check-hax$(EXESUF)
-endif
-
 all: qemu skin_client $(TARGET_EXE)
 qemu: $(TARGET_EXE) build_info
 	cd ../../ && $(MAKE)
@@ -38,60 +30,6 @@ else
 DIBS_SWT_DIR=-Dclasspath.dibs=$(ROOTDIR)
 endif
 
-# Building check-gl
-CHECK_GL_OBJS = util/check_gl.o util/check_gl_core.o
-CHECK_GL_CFLAGS = -c -I$(SRC_PATH)/hw/yagl/yagl_inc
-CHECK_GL_LDFLAGS =
-CHECK_GL_TARGET = util/check-gl$(EXESUF)
-ifdef CONFIG_LINUX
-CHECK_GL_OBJS += util/check_gl_glx.o
-CHECK_GL_LDFLAGS += -lX11 -lXext -lglib-2.0 -ldl
-endif
-ifdef CONFIG_WIN32
-CHECK_GL_OBJS += util/check_gl_wgl.o
-CHECK_GL_LDFLAGS += -fstack-protector `pkg-config --libs glib-2.0` -lgdi32
-endif
-ifdef CONFIG_DARWIN
-CHECK_GL_OBJS += util/check_gl_cgl.o
-CHECK_GL_LDFLAGS += -mmacosx-version-min=10.4 `pkg-config --cflags --libs glib-2.0` -framework OpenGL
-endif
-
-util/check-gl$(EXESUF): $(CHECK_GL_OBJS)
-	$(CC) $(CHECK_GL_OBJS) $(CHECK_GL_LDFLAGS) -o $@
-$(CHECK_GL_OBJS): %.o: %.c
-	$(CC) $< $(CHECK_GL_CFLAGS) -o $@
-
-# Building check-cam
-CHECK_CAM_CFLAGS = -c
-ifdef CONFIG_LINUX
-CHECK_CAM_LDFLAGS = -lv4l2 -lv4lconvert
-endif
-ifdef CONFIG_WIN32
-CHECK_CAM_CFLAGS += -I.
-CHECK_CAM_LDFLAGS = -lole32 -loleaut32 -luuid -lstrmiids
-endif
-ifdef CONFIG_DARWIN
-endif
-
-util/check-cam$(EXESUF): util/check_cam.o
-	$(CC) $< -o $@ $(CHECK_CAM_LDFLAGS)
-util/check_cam.o: %.o: %.c
-	$(CC) $< -o $@ $(CHECK_CAM_CFLAGS)
-
-# Building check-hax
-CHECK_HAX_CFLAGS = -c
-ifdef CONFIG_LINUX
-endif
-ifdef CONFIG_WIN32
-endif
-ifdef CONFIG_DARWIN
-CHECK_HAX_CFLAGS += -mmacosx-version-min=10.4
-endif
-util/check-hax$(EXESUF): util/check_hax.o
-	$(CC) $< -o $@
-util/check_hax.o: %.o: %.c
-	$(CC) $< $(CHECK_HAX_CFLAGS) -o $@
-
 # Building java skin
 skin_client:
 ifdef CONFIG_USE_SHM
@@ -114,7 +52,6 @@ build_info:
 
 
 clean: qemu_clean
-	rm -f util/check-hax$(EXESUF) util/check-cam$(EXESUF) util/check-gl$(EXESUF)
 distclean: clean qemu_distclean
 
 install: all
@@ -161,21 +98,6 @@ ifdef CONFIG_USE_SHM
 endif
 endif
 
-# check capabilities of OpenGL and Webcam
-	cp -pP util/check-gl$(EXESUF) $(EMUL_DIR)/bin
-	cp -pP util/check-cam$(EXESUF) $(EMUL_DIR)/bin
-
-# Enable HW Virtualization on Linux
-ifdef CONFIG_LINUX
-	cp -pP ../distrib/initscript/tizen-kvm $(EMUL_DIR)/etc
-	cp -pP ../distrib/initscript/45-tizen-kvm.rules $(EMUL_DIR)/etc
-endif
-
-# check HW Virtualization on Windows and MAC OS X.
-ifndef CONFIG_LINUX
-	cp -pP util/check-hax$(EXESUF) $(EMUL_DIR)/bin
-endif
-
 # give a title name for sdb terminal.
 ifdef CONFIG_DARWIN
 	cp -pP scripts/sdbscript $(EMUL_DIR)/bin
@@ -252,23 +174,6 @@ ifdef CONFIG_USE_SHM
 endif
 endif
 
-# check capabilities of OpenGL and Webcam
-	cp -pP util/check-gl$(EXESUF) $(DIBS_COMMON_DIR)/bin
-	cp -pP util/check-cam$(EXESUF) $(DIBS_COMMON_DIR)/bin
-
-
-# Enable HW Virtualization on Linux
-ifdef CONFIG_LINUX
-	echo "Copying tizen-kvm to $(DIBS_X86_DIR)/etc"
-	cp -pP ../distrib/initscript/tizen-kvm $(DIBS_X86_DIR)/etc
-	cp -pP ../distrib/initscript/45-tizen-kvm.rules $(DIBS_X86_DIR)/etc
-endif
-
-# check HW Virtualization on Windows and MAC OS X.
-ifndef CONFIG_LINUX
-	cp -pP util/check-hax$(EXESUF) $(DIBS_COMMON_DIR)/bin
-endif
-
 # give a title name for sdb terminal.
 ifdef CONFIG_DARWIN
 	cp -pP scripts/sdbscript $(DIBS_COMMON_DIR)/bin