From d60b233115e145d87038a65d5f21a4b2ac30e0b7 Mon Sep 17 00:00:00 2001 From: SeokYeon Hwang Date: Wed, 8 Jun 2016 15:58:30 +0900 Subject: [PATCH] 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 --- ...untu-64 => 3.0-emulator-qemu-x86.install.linux} | 0 ...acos-64 => 3.0-emulator-qemu-x86.install.macos} | 0 package/3.0-emulator-qemu-x86.install.ubuntu-32 | 68 ---------------------- ...buntu-64 => 3.0-emulator-qemu-x86.remove.linux} | 0 package/3.0-emulator-qemu-x86.remove.ubuntu-32 | 61 ------------------- package/pkginfo.manifest | 8 +-- 6 files changed, 4 insertions(+), 133 deletions(-) rename package/{3.0-emulator-qemu-x86.install.ubuntu-64 => 3.0-emulator-qemu-x86.install.linux} (100%) rename package/{3.0-emulator-qemu-x86.install.macos-64 => 3.0-emulator-qemu-x86.install.macos} (100%) delete mode 100755 package/3.0-emulator-qemu-x86.install.ubuntu-32 rename package/{3.0-emulator-qemu-x86.remove.ubuntu-64 => 3.0-emulator-qemu-x86.remove.linux} (100%) delete mode 100755 package/3.0-emulator-qemu-x86.remove.ubuntu-32 diff --git a/package/3.0-emulator-qemu-x86.install.ubuntu-64 b/package/3.0-emulator-qemu-x86.install.linux similarity index 100% rename from package/3.0-emulator-qemu-x86.install.ubuntu-64 rename to package/3.0-emulator-qemu-x86.install.linux diff --git a/package/3.0-emulator-qemu-x86.install.macos-64 b/package/3.0-emulator-qemu-x86.install.macos similarity index 100% rename from package/3.0-emulator-qemu-x86.install.macos-64 rename to package/3.0-emulator-qemu-x86.install.macos 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 4d56faf..0000000 --- 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.remove.ubuntu-64 b/package/3.0-emulator-qemu-x86.remove.linux similarity index 100% rename from package/3.0-emulator-qemu-x86.remove.ubuntu-64 rename to package/3.0-emulator-qemu-x86.remove.linux 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 5728dc6..0000000 --- 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/pkginfo.manifest b/package/pkginfo.manifest index 1403fe2..96a4925 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 -- 2.7.4