From 68a0efd8c1079a8063caa33f4d94a64d491ea15c Mon Sep 17 00:00:00 2001 From: "minkee.lee" Date: Thu, 11 Jun 2015 16:14:02 +0900 Subject: [PATCH] Package: Modified install script - Moved graphic driver checking to emulator-qemu-common's install script because binary(check-gl) is in common package. Change-Id: I4778b1c1ac6d658d1e083b25074e4eee4c21c56b Signed-off-by: minkee.lee --- package/emulator-qemu-common.install.ubuntu-32 | 38 ++++++++++++++++++++++++++ package/emulator-qemu-common.install.ubuntu-64 | 38 ++++++++++++++++++++++++++ package/emulator-qemu-x86.install.ubuntu-32 | 29 -------------------- package/emulator-qemu-x86.install.ubuntu-64 | 29 -------------------- 4 files changed, 76 insertions(+), 58 deletions(-) create mode 100755 package/emulator-qemu-common.install.ubuntu-32 create mode 100755 package/emulator-qemu-common.install.ubuntu-64 diff --git a/package/emulator-qemu-common.install.ubuntu-32 b/package/emulator-qemu-common.install.ubuntu-32 new file mode 100755 index 0000000..e3af1a6 --- /dev/null +++ b/package/emulator-qemu-common.install.ubuntu-32 @@ -0,0 +1,38 @@ +#!/bin/bash -x + +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 + +# run check-gl and show pop-up if using gallium driver. +CHECK_GL_CMD=${TIZEN_SDK_INSTALL_PATH}/tools/emulator/bin/check-gl + +GL_WARNING_MSG="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/ " + +showGraphicDriverWarning() +{ + zenity --error --no-wrap --text=" +$GL_WARNING_MSG" +} + +$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." + if [ "$INSTALLMANAGER_UI" = "GUI" ] ; then + showGraphicDriverWarning + else + echo "Warning : $GL_WARNING_MSG" + fi +fi diff --git a/package/emulator-qemu-common.install.ubuntu-64 b/package/emulator-qemu-common.install.ubuntu-64 new file mode 100755 index 0000000..e3af1a6 --- /dev/null +++ b/package/emulator-qemu-common.install.ubuntu-64 @@ -0,0 +1,38 @@ +#!/bin/bash -x + +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 + +# run check-gl and show pop-up if using gallium driver. +CHECK_GL_CMD=${TIZEN_SDK_INSTALL_PATH}/tools/emulator/bin/check-gl + +GL_WARNING_MSG="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/ " + +showGraphicDriverWarning() +{ + zenity --error --no-wrap --text=" +$GL_WARNING_MSG" +} + +$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." + if [ "$INSTALLMANAGER_UI" = "GUI" ] ; then + showGraphicDriverWarning + else + echo "Warning : $GL_WARNING_MSG" + fi +fi diff --git a/package/emulator-qemu-x86.install.ubuntu-32 b/package/emulator-qemu-x86.install.ubuntu-32 index 15eb412..d00d02e 100755 --- a/package/emulator-qemu-x86.install.ubuntu-32 +++ b/package/emulator-qemu-x86.install.ubuntu-32 @@ -58,32 +58,3 @@ fi rm ${TMP_FILE} -# run check-gl and show pop-up if using gallium driver. -CHECK_GL_CMD=${TIZEN_SDK_INSTALL_PATH}/tools/emulator/bin/check-gl - -GL_WARNING_MSG="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/ " - -showGraphicDriverWarning() -{ - zenity --error --no-wrap --text=" -$GL_WARNING_MSG" -} - -$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." - if [ "$INSTALLMANAGER_UI" = "GUI" ] ; then - showGraphicDriverWarning - else - echo "Warning : $GL_WARNING_MSG" - fi -fi diff --git a/package/emulator-qemu-x86.install.ubuntu-64 b/package/emulator-qemu-x86.install.ubuntu-64 index 15eb412..d00d02e 100755 --- a/package/emulator-qemu-x86.install.ubuntu-64 +++ b/package/emulator-qemu-x86.install.ubuntu-64 @@ -58,32 +58,3 @@ fi rm ${TMP_FILE} -# run check-gl and show pop-up if using gallium driver. -CHECK_GL_CMD=${TIZEN_SDK_INSTALL_PATH}/tools/emulator/bin/check-gl - -GL_WARNING_MSG="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/ " - -showGraphicDriverWarning() -{ - zenity --error --no-wrap --text=" -$GL_WARNING_MSG" -} - -$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." - if [ "$INSTALLMANAGER_UI" = "GUI" ] ; then - showGraphicDriverWarning - else - echo "Warning : $GL_WARNING_MSG" - fi -fi -- 2.7.4