From: SeokYeon Hwang Date: Wed, 8 Jun 2016 06:58:30 +0000 (+0900) Subject: package: remove spice-server dependancy X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~38^2~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d60b233115e145d87038a65d5f21a4b2ac30e0b7;p=sdk%2Femulator%2Fqemu.git package: remove spice-server dependancy "spice-server" has a build problem now. So we remove its dependancy temporarily. Redundant "install" / "remove" scripts are removed. Change-Id: I4a499df8bda3fd7299a3d6281b1d01b794ac5c24 Signed-off-by: SeokYeon Hwang --- diff --git a/package/3.0-emulator-qemu-x86.install.linux b/package/3.0-emulator-qemu-x86.install.linux new file mode 100755 index 0000000000..4d56faf144 --- /dev/null +++ b/package/3.0-emulator-qemu-x86.install.linux @@ -0,0 +1,68 @@ +#!/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}" ] +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 "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 +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 --git a/package/3.0-emulator-qemu-x86.install.macos b/package/3.0-emulator-qemu-x86.install.macos new file mode 100755 index 0000000000..37da1a76b5 --- /dev/null +++ b/package/3.0-emulator-qemu-x86.install.macos @@ -0,0 +1,133 @@ +#!/bin/sh -e + +TIZEN_SDK_INSTALL_PATH="`echo $INSTALLED_PATH`" +OLD_SHMMAXSIZE=`sysctl -n kern.sysv.shmmax` +SYSCTL_FILE=sysctl.conf +COCOASUDO_PATH=$TIZEN_SDK_INSTALL_PATH/tools/emulator/bin +TIZEN_BIN_PATH=$TIZEN_SDK_INSTALL_PATH/platforms/tizen-3.0/common/emulator/bin +TIZEN_PLATFORM_ETC_PATH=$TIZEN_SDK_INSTALL_PATH/platforms/tizen-3.0/common/emulator/etc +TIZEN_TOOL_ETC_PATH=$TIZEN_SDK_INSTALL_PATH/tools/emulator/etc +TMP_FILE=emulator-install.sh +NEW_SHMMAXSIZE=83886080 + +if [ -z "$TIZEN_SDK_INSTALL_PATH" ] +then + echo "There is no TIZEN_SDK_PATH ENV" >> /tmp/emulator.log + # exit 2; +fi + +function remove_tmp_file { + if [ -e "$TMP_FILE" ] + then + echo "delete $TMP_FILE" + rm -f "$TMP_FILE" + fi +} + +function generate_tap_kext_cmd { + echo "cp -pR \"${TIZEN_PLATFORM_ETC_PATH}/emulator-ifup.sh\" /etc/" >> "$TMP_FILE" + echo "mkdir -p /Library/Extensions" >> "$TMP_FILE" + echo "cp -pR \"${TIZEN_TOOL_ETC_PATH}/tap.kext\" /Library/Extensions" >> "$TMP_FILE" + echo "rm -rf \"${TIZEN_TOOL_ETC_PATH}/tap.kext\"" >> "$TMP_FILE" + echo "chown -R root:wheel /Library/Extensions/tap.kext" >> "$TMP_FILE" + echo "mkdir -p /Library/LaunchDaemons" >> "$TMP_FILE" + echo "cp /Library/Extensions/tap.kext/Contents/net.sf.tuntaposx.tap.plist /Library/LaunchDaemons" >> "$TMP_FILE" + echo "kextutil -nt /Library/Extensions/tap.kext" >> "$TMP_FILE" + echo "/sbin/kextload /Library/Extensions/tap.kext" >> "$TMP_FILE" +} + +function generate_sudoer_cmd { + cat << 'EOF' >> $TMP_FILE +FILE=/etc/sudoers +BACKFILE=/etc/sudoers.bak +TMPFILE=/etc/sudoers.tmp +MESSAGE="# Tizen SDK generated the following script. Do not modify." +LINE1="User_Alias QEMUERS=" +LINE2="Cmnd_Alias QEMU=/etc/emulator-ifup.sh, /etc/emulator-ifdown.sh" +LINE3="QEMUERS ALL=(ALL) NOPASSWD: QEMU" +count=0 + +if [[ "$USER" == "" ]] +then + echo "user is not set. aborting..." + exit 1 +fi + +while read line +do + echo $line + count=$((count+1)) + if [[ $line == $LINE1* ]] + then + echo "find original script" + NAMES=`echo $line | cut -d = -f2` + if [[ "$NAMES"x == ""x ]] + then + cp $FILE $BACKFILE + # in case of blank user + eval sed -e "$count"c\"$line $USER\" $FILE > $TMPFILE + exit 0 + fi + for i in $(echo $NAMES | tr "," "\n") + do + if [[ "$i" == "$USER" ]] + then + echo "already added the same user" + exit 0 + fi + done + cp $FILE $BACKFILE + # new user is added with comma behind the original users. + eval sed -e "$count"c\"$line, $USER\" $FILE > $TMPFILE + mv $TMPFILE $FILE + exit 0 + fi +done < $FILE + +cp $FILE $BACKFILE +echo "do not find qemu sudoer. add it" +echo "$MESSAGE" >> $FILE +echo "$LINE1$USER" >> $FILE +echo "$LINE2" >> $FILE +echo "$LINE3" >> $FILE +exit 0 +EOF +} + +function prepare { + TAP_ZIP_FILE="$TIZEN_TOOL_ETC_PATH/tap.zip" + TAP_KEXT="$TIZEN_TOOL_ETC_PATH/tap.kext" + USER=`id -un` + echo "create $TMP_FILE" + echo "#!/bin/sh" > "$TMP_FILE" + echo "TIZEN_SDK_INSTALL_PATH=$TIZEN_SDK_INSTALL_PATH" >> "$TMP_FILE" + echo "USER=$USER" >> "$TMP_FILE" +} + +function generate { + generate_tap_kext_cmd; + generate_sudoer_cmd; +} + +function execute { + /bin/chmod +x "$TMP_FILE" + "$COCOASUDO_PATH/cocoasudo" --prompt="Please enter your password to install Tizen Emulator." sh -x "$TMP_FILE" +} + +function cleanup { + remove_tmp_file; +} + +prepare; +generate; +execute; +cleanup; + +CURRENT_SHMMAXSIZE=`sysctl -n kern.sysv.shmmax` + +if [ ! $OLD_SHMMAXSIZE -eq $CURRENT_SHMMAXSIZE ] +then + echo 'need reboot' + exit 99 +fi + diff --git a/package/3.0-emulator-qemu-x86.install.macos-64 b/package/3.0-emulator-qemu-x86.install.macos-64 deleted file mode 100755 index 37da1a76b5..0000000000 --- a/package/3.0-emulator-qemu-x86.install.macos-64 +++ /dev/null @@ -1,133 +0,0 @@ -#!/bin/sh -e - -TIZEN_SDK_INSTALL_PATH="`echo $INSTALLED_PATH`" -OLD_SHMMAXSIZE=`sysctl -n kern.sysv.shmmax` -SYSCTL_FILE=sysctl.conf -COCOASUDO_PATH=$TIZEN_SDK_INSTALL_PATH/tools/emulator/bin -TIZEN_BIN_PATH=$TIZEN_SDK_INSTALL_PATH/platforms/tizen-3.0/common/emulator/bin -TIZEN_PLATFORM_ETC_PATH=$TIZEN_SDK_INSTALL_PATH/platforms/tizen-3.0/common/emulator/etc -TIZEN_TOOL_ETC_PATH=$TIZEN_SDK_INSTALL_PATH/tools/emulator/etc -TMP_FILE=emulator-install.sh -NEW_SHMMAXSIZE=83886080 - -if [ -z "$TIZEN_SDK_INSTALL_PATH" ] -then - echo "There is no TIZEN_SDK_PATH ENV" >> /tmp/emulator.log - # exit 2; -fi - -function remove_tmp_file { - if [ -e "$TMP_FILE" ] - then - echo "delete $TMP_FILE" - rm -f "$TMP_FILE" - fi -} - -function generate_tap_kext_cmd { - echo "cp -pR \"${TIZEN_PLATFORM_ETC_PATH}/emulator-ifup.sh\" /etc/" >> "$TMP_FILE" - echo "mkdir -p /Library/Extensions" >> "$TMP_FILE" - echo "cp -pR \"${TIZEN_TOOL_ETC_PATH}/tap.kext\" /Library/Extensions" >> "$TMP_FILE" - echo "rm -rf \"${TIZEN_TOOL_ETC_PATH}/tap.kext\"" >> "$TMP_FILE" - echo "chown -R root:wheel /Library/Extensions/tap.kext" >> "$TMP_FILE" - echo "mkdir -p /Library/LaunchDaemons" >> "$TMP_FILE" - echo "cp /Library/Extensions/tap.kext/Contents/net.sf.tuntaposx.tap.plist /Library/LaunchDaemons" >> "$TMP_FILE" - echo "kextutil -nt /Library/Extensions/tap.kext" >> "$TMP_FILE" - echo "/sbin/kextload /Library/Extensions/tap.kext" >> "$TMP_FILE" -} - -function generate_sudoer_cmd { - cat << 'EOF' >> $TMP_FILE -FILE=/etc/sudoers -BACKFILE=/etc/sudoers.bak -TMPFILE=/etc/sudoers.tmp -MESSAGE="# Tizen SDK generated the following script. Do not modify." -LINE1="User_Alias QEMUERS=" -LINE2="Cmnd_Alias QEMU=/etc/emulator-ifup.sh, /etc/emulator-ifdown.sh" -LINE3="QEMUERS ALL=(ALL) NOPASSWD: QEMU" -count=0 - -if [[ "$USER" == "" ]] -then - echo "user is not set. aborting..." - exit 1 -fi - -while read line -do - echo $line - count=$((count+1)) - if [[ $line == $LINE1* ]] - then - echo "find original script" - NAMES=`echo $line | cut -d = -f2` - if [[ "$NAMES"x == ""x ]] - then - cp $FILE $BACKFILE - # in case of blank user - eval sed -e "$count"c\"$line $USER\" $FILE > $TMPFILE - exit 0 - fi - for i in $(echo $NAMES | tr "," "\n") - do - if [[ "$i" == "$USER" ]] - then - echo "already added the same user" - exit 0 - fi - done - cp $FILE $BACKFILE - # new user is added with comma behind the original users. - eval sed -e "$count"c\"$line, $USER\" $FILE > $TMPFILE - mv $TMPFILE $FILE - exit 0 - fi -done < $FILE - -cp $FILE $BACKFILE -echo "do not find qemu sudoer. add it" -echo "$MESSAGE" >> $FILE -echo "$LINE1$USER" >> $FILE -echo "$LINE2" >> $FILE -echo "$LINE3" >> $FILE -exit 0 -EOF -} - -function prepare { - TAP_ZIP_FILE="$TIZEN_TOOL_ETC_PATH/tap.zip" - TAP_KEXT="$TIZEN_TOOL_ETC_PATH/tap.kext" - USER=`id -un` - echo "create $TMP_FILE" - echo "#!/bin/sh" > "$TMP_FILE" - echo "TIZEN_SDK_INSTALL_PATH=$TIZEN_SDK_INSTALL_PATH" >> "$TMP_FILE" - echo "USER=$USER" >> "$TMP_FILE" -} - -function generate { - generate_tap_kext_cmd; - generate_sudoer_cmd; -} - -function execute { - /bin/chmod +x "$TMP_FILE" - "$COCOASUDO_PATH/cocoasudo" --prompt="Please enter your password to install Tizen Emulator." sh -x "$TMP_FILE" -} - -function cleanup { - remove_tmp_file; -} - -prepare; -generate; -execute; -cleanup; - -CURRENT_SHMMAXSIZE=`sysctl -n kern.sysv.shmmax` - -if [ ! $OLD_SHMMAXSIZE -eq $CURRENT_SHMMAXSIZE ] -then - echo 'need reboot' - exit 99 -fi - diff --git a/package/3.0-emulator-qemu-x86.install.ubuntu-32 b/package/3.0-emulator-qemu-x86.install.ubuntu-32 deleted file mode 100755 index 4d56faf144..0000000000 --- a/package/3.0-emulator-qemu-x86.install.ubuntu-32 +++ /dev/null @@ -1,68 +0,0 @@ -#!/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}" ] -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 "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 -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 --git a/package/3.0-emulator-qemu-x86.install.ubuntu-64 b/package/3.0-emulator-qemu-x86.install.ubuntu-64 deleted file mode 100755 index 4d56faf144..0000000000 --- a/package/3.0-emulator-qemu-x86.install.ubuntu-64 +++ /dev/null @@ -1,68 +0,0 @@ -#!/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}" ] -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 "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 -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 --git a/package/3.0-emulator-qemu-x86.remove.linux b/package/3.0-emulator-qemu-x86.remove.linux new file mode 100755 index 0000000000..5728dc6ca1 --- /dev/null +++ b/package/3.0-emulator-qemu-x86.remove.linux @@ -0,0 +1,61 @@ +#!/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 +# 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} +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} + +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." + 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 --git a/package/3.0-emulator-qemu-x86.remove.ubuntu-32 b/package/3.0-emulator-qemu-x86.remove.ubuntu-32 deleted file mode 100755 index 5728dc6ca1..0000000000 --- a/package/3.0-emulator-qemu-x86.remove.ubuntu-32 +++ /dev/null @@ -1,61 +0,0 @@ -#!/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 -# 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} -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} - -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." - 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 --git a/package/3.0-emulator-qemu-x86.remove.ubuntu-64 b/package/3.0-emulator-qemu-x86.remove.ubuntu-64 deleted file mode 100755 index 5728dc6ca1..0000000000 --- a/package/3.0-emulator-qemu-x86.remove.ubuntu-64 +++ /dev/null @@ -1,61 +0,0 @@ -#!/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 -# 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} -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} - -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." - 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 --git a/package/pkginfo.manifest b/package/pkginfo.manifest index 1403fe2600..96a4925fad 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -25,16 +25,16 @@ Description: Common binaries for Tizen Emulator Package: 3.0-emulator-qemu-x86 OS: ubuntu-32 Build-host-os: ubuntu-32 -Build-dependency: 3.0-emulator-lib-dev [ ubuntu-32 ], emulator-spice-server-dev [ ubuntu-32 ], 3.0-libav-dev [ ubuntu-32 ] -Install-dependency: 3.0-emulator-kernel-x86 [ ubuntu-32 ], emulator-spice-server [ ubuntu-32 ], 3.0-libav [ ubuntu-32 ] +Build-dependency: 3.0-emulator-lib-dev [ ubuntu-32 ], 3.0-libav-dev [ ubuntu-32 ] +Install-dependency: 3.0-emulator-kernel-x86 [ ubuntu-32 ], 3.0-libav [ ubuntu-32 ] C-Prerequisites: libsdl1.2debian, libglib2.0-0, acl, zlib1g, libpixman-1-0, bridge-utils, openvpn Description: Tizen x86 Emulator Package: 3.0-emulator-qemu-x86 OS: ubuntu-64 Build-host-os: ubuntu-64 -Build-dependency: 3.0-emulator-lib-dev [ ubuntu-64 ], emulator-spice-server-dev [ ubuntu-64 ], 3.0-libav-dev [ ubuntu-64] -Install-dependency: 3.0-emulator-kernel-x86 [ ubuntu-64 ], emulator-spice-server [ ubuntu-64 ], 3.0-libav [ ubuntu-64 ] +Build-dependency: 3.0-emulator-lib-dev [ ubuntu-64 ], 3.0-libav-dev [ ubuntu-64] +Install-dependency: 3.0-emulator-kernel-x86 [ ubuntu-64 ], 3.0-libav [ ubuntu-64 ] C-Prerequisites: libsdl1.2debian, libglib2.0-0, acl, zlib1g, libpixman-1-0, bridge-utils, openvpn Description: Tizen x86 Emulator