Merge branch 'develop' into platform_2.3.2

Change-Id: I44caa47106765fdd23d7a5ab9beaec42b04b32a7
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

diff --cc package/2.3.2-emulator-qemu-x86.install.linux
index 4d56faf1446f438ea4a95dbe8310d816facb236a,0000000000000000000000000000000000000000..314d8a34c1a324a6bb4abc3ee7335d75b05727fa
mode 100755,000000..100755
--- 1/package/2.3.2-emulator-qemu-x86.install.linux
--- /dev/null
+++ b/package/2.3.2-emulator-qemu-x86.install.linux
@@@ -1,68 -1,0 +1,57 @@@
- 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
- 
 +#!/bin/bash -x
 +
- 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}
 +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}" ]
 +then
 +#   echo "There is no TIZEN_SDK_PATH ENV" >> /tmp/emulator.log
 +   exit 2;
 +fi
 +
 +PLATFORM_VERSION=tizen-3.0
 +
 +LSB_RELEASE=`which lsb_release`
 +if [ "${LSB_RELEASE}" = "" ]; then
 +      if [ -e /etc/os-release ]; then
 +              OS_NAME=`cat /etc/os-release | grep ID | head -n 1 | awk -F= '{print $2}'`
 +      fi
 +      # TODO: Detect other linux distributions.
 +else
 +      OS_NAME=`lsb_release --id --short`
 +fi
 +
 +if [ ! -z "${OS_NAME}" ]; then
 +      OS_NAME=`echo ${OS_NAME} | tr '[:upper:]' '[:lower:]'`
 +fi
 +echo "Linux Distribution: ${OS_NAME}"
 +
 +# need sudo to enable kvm module and set qemu sudoers
 +TMP_FILE=init_tizen.sh
 +echo "#!/bin/bash -x" >> ${TMP_FILE}
 +echo "TIZEN_SDK_INSTALL_PATH=$TIZEN_SDK_INSTALL_PATH" >> ${TMP_FILE}
- echo "/etc/init.d/tizen-kvm start" >> ${TMP_FILE}
- echo "/etc/init.d/tizen-vhost-net start" >> ${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 "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
 +echo "fi" >> $TMP_FILE
 +echo "cp \"${TIZEN_PLATFORM_ETC_PATH}/tizen-sudoers.rules\" /etc/sudoers.d/tizen-emulator" >> $TMP_FILE
 +echo "chmod 0440 /etc/sudoers.d/tizen-emulator" >> $TMP_FILE
 +chmod +x ${TMP_FILE}
 +if [ "${TSUDO}" != "" ] # since installer v2.27
 +then
 +      TSUDO_MSG="Enter your password to install Tizen Emulator"
 +      TMP_PATH="`pwd`/${TMP_FILE}"
 +      ${TSUDO} -m "${TSUDO_MSG}" bash -x "${TMP_PATH}"
 +else
 +      GKSUDO=`which gksudo`
 +      if [ "${GKSUDO}" = "" ]
 +      then
 +              echo "there is no gksudo."
 +              sudo bash -x ./${TMP_FILE}
 +      else
 +              gksudo bash -x ./${TMP_FILE}
 +      fi
 +fi
 +
 +rm ${TMP_FILE}

diff --cc package/2.3.2-emulator-qemu-x86.remove.linux
index 5728dc6ca131b45d657b3715203bed7cb8053371,0000000000000000000000000000000000000000..1b3afc2f166f6f5845208dd5e60f78fdcab56931
mode 100755,000000..100755
--- 1/package/2.3.2-emulator-qemu-x86.remove.linux
--- /dev/null
+++ b/package/2.3.2-emulator-qemu-x86.remove.linux
@@@ -1,61 -1,0 +1,48 @@@
- 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
- 
 +#!/bin/bash -ex
 +
- 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}
 +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
 +
 +LSB_RELEASE=`which lsb_release`
 +if [ "${LSB_RELEASE}" = "" ]; then
 +      if [ -e /etc/os-release ]; then
 +              OS_NAME=`cat /etc/os-release | grep ID | head -n 1 | awk -F= '{print $2}'`
 +      fi
 +      # TODO: Detect other linux distributions.
 +else
 +      OS_NAME=`lsb_release --id --short`
 +fi
 +
 +if [ ! -z "${OS_NAME}" ]; then
 +      OS_NAME=`echo ${OS_NAME} | tr '[:upper:]' '[:lower:]'`
 +fi
 +echo "Linux Distribution: ${OS_NAME}"
 +
 +TMP_FILE=remove_tizen-init.sh
 +echo "#!/bin/bash -ex" >> ${TMP_FILE}
-       TSUDO_MSG="Enter your password to remove /etc/init.d/tizen-kvm, /etc/init.d/tizen-vhost-net."
 +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}
 +
 +chmod +x ${TMP_FILE}
 +
 +if [ "${TSUDO}" != "" ] # since installer v2.27
 +then
++      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
 +      GKSUDO=`which gksudo`
 +      if [ "${GKSUDO}" = "" ]
 +      then
 +              echo "there is no gksudo."
 +              sudo ./${TMP_FILE}
 +      else
 +              gksudo ./${TMP_FILE}
 +      fi
 +fi
 +
 +rm ${TMP_FILE}

diff --cc package/pkginfo.manifest
Simple merge