From f50586bf95e8c64a5efce96f72adfb1c223e5279 Mon Sep 17 00:00:00 2001 From: "varinder.p" Date: Thu, 21 Apr 2022 20:21:27 +0530 Subject: [PATCH] Upgraded packages to 7.0 platform and fixed minor issues to boot qemu on windows Change-Id: I4ac7a86712657b1f57e4b0cd5e91c84eabd59744 Signed-off-by: varinder.p --- Makefile | 3 +- package/2.3.2-emulator-qemu-x86.install.linux | 57 ------------------- package/2.3.2-emulator-qemu-x86.remove.linux | 48 ---------------- package/2.4-emulator-qemu-x86.install.linux | 57 ------------------- package/2.4-emulator-qemu-x86.remove.linux | 48 ---------------- package/3.0-emulator-qemu-x86.install.linux | 57 ------------------- package/3.0-emulator-qemu-x86.remove.linux | 48 ---------------- package/4.0-emulator-qemu-x86.install.linux | 57 ------------------- package/4.0-emulator-qemu-x86.remove.linux | 48 ---------------- package/5.0-emulator-qemu-x86.install.linux | 57 ------------------- package/5.0-emulator-qemu-x86.remove.linux | 48 ---------------- package/6.0-emulator-qemu-x86.install.linux | 57 ------------------- package/6.0-emulator-qemu-x86.remove.linux | 48 ---------------- package/6.5-emulator-qemu-x86.install.linux | 57 ------------------- package/6.5-emulator-qemu-x86.remove.linux | 48 ---------------- package/build.common | 4 +- package/pkginfo.manifest | 42 +++++++------- tizen/src/Makefile | 14 +++-- 18 files changed, 33 insertions(+), 765 deletions(-) delete mode 100755 package/2.3.2-emulator-qemu-x86.install.linux delete mode 100755 package/2.3.2-emulator-qemu-x86.remove.linux delete mode 100755 package/2.4-emulator-qemu-x86.install.linux delete mode 100755 package/2.4-emulator-qemu-x86.remove.linux delete mode 100755 package/3.0-emulator-qemu-x86.install.linux delete mode 100755 package/3.0-emulator-qemu-x86.remove.linux delete mode 100755 package/4.0-emulator-qemu-x86.install.linux delete mode 100755 package/4.0-emulator-qemu-x86.remove.linux delete mode 100755 package/5.0-emulator-qemu-x86.install.linux delete mode 100755 package/5.0-emulator-qemu-x86.remove.linux delete mode 100755 package/6.0-emulator-qemu-x86.install.linux delete mode 100755 package/6.0-emulator-qemu-x86.remove.linux delete mode 100755 package/6.5-emulator-qemu-x86.install.linux delete mode 100755 package/6.5-emulator-qemu-x86.remove.linux diff --git a/Makefile b/Makefile index 4b03ed08c0..bc1de903da 100644 --- a/Makefile +++ b/Makefile @@ -557,7 +557,8 @@ capstone/all: .git-submodule-status slirp/all: .git-submodule-status $(call quiet-command,$(MAKE) -C $(SRC_PATH)/slirp \ BUILD_DIR="$(BUILD_DIR)/slirp" \ - PKG_CONFIG="$(PKG_CONFIG)" \ + PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)" \ + PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" \ CC="$(CC)" AR="$(AR)" LD="$(LD)" RANLIB="$(RANLIB)" \ CFLAGS="$(QEMU_CFLAGS) $(CFLAGS)" LDFLAGS="$(QEMU_LDFLAGS)") diff --git a/package/2.3.2-emulator-qemu-x86.install.linux b/package/2.3.2-emulator-qemu-x86.install.linux deleted file mode 100755 index 0392ea6848..0000000000 --- a/package/2.3.2-emulator-qemu-x86.install.linux +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash -x - -TIZEN_SDK_INSTALL_PATH=`echo ${INSTALLED_PATH}` -TIZEN_PLATFORM_ETC_PATH=$TIZEN_SDK_INSTALL_PATH/platforms/tizen-2.3.2/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-2.3.2 - -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-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 --git a/package/2.3.2-emulator-qemu-x86.remove.linux b/package/2.3.2-emulator-qemu-x86.remove.linux deleted file mode 100755 index 1b3afc2f16..0000000000 --- a/package/2.3.2-emulator-qemu-x86.remove.linux +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash -ex - -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} -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 --git a/package/2.4-emulator-qemu-x86.install.linux b/package/2.4-emulator-qemu-x86.install.linux deleted file mode 100755 index ac772fd907..0000000000 --- a/package/2.4-emulator-qemu-x86.install.linux +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash -x - -TIZEN_SDK_INSTALL_PATH=`echo ${INSTALLED_PATH}` -TIZEN_PLATFORM_ETC_PATH=$TIZEN_SDK_INSTALL_PATH/platforms/tizen-2.4/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-2.4 - -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-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 --git a/package/2.4-emulator-qemu-x86.remove.linux b/package/2.4-emulator-qemu-x86.remove.linux deleted file mode 100755 index 1b3afc2f16..0000000000 --- a/package/2.4-emulator-qemu-x86.remove.linux +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash -ex - -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} -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 --git a/package/3.0-emulator-qemu-x86.install.linux b/package/3.0-emulator-qemu-x86.install.linux deleted file mode 100755 index 314d8a34c1..0000000000 --- a/package/3.0-emulator-qemu-x86.install.linux +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash -x - -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-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 --git a/package/3.0-emulator-qemu-x86.remove.linux b/package/3.0-emulator-qemu-x86.remove.linux deleted file mode 100755 index 1b3afc2f16..0000000000 --- a/package/3.0-emulator-qemu-x86.remove.linux +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash -ex - -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} -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 --git a/package/4.0-emulator-qemu-x86.install.linux b/package/4.0-emulator-qemu-x86.install.linux deleted file mode 100755 index e2338c8847..0000000000 --- a/package/4.0-emulator-qemu-x86.install.linux +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash -x - -TIZEN_SDK_INSTALL_PATH=`echo ${INSTALLED_PATH}` -TIZEN_PLATFORM_ETC_PATH=$TIZEN_SDK_INSTALL_PATH/platforms/tizen-4.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-4.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-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 --git a/package/4.0-emulator-qemu-x86.remove.linux b/package/4.0-emulator-qemu-x86.remove.linux deleted file mode 100755 index 1b3afc2f16..0000000000 --- a/package/4.0-emulator-qemu-x86.remove.linux +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash -ex - -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} -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 --git a/package/5.0-emulator-qemu-x86.install.linux b/package/5.0-emulator-qemu-x86.install.linux deleted file mode 100755 index f2e3ba4423..0000000000 --- a/package/5.0-emulator-qemu-x86.install.linux +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash -x - -TIZEN_SDK_INSTALL_PATH=`echo ${INSTALLED_PATH}` -TIZEN_PLATFORM_ETC_PATH=$TIZEN_SDK_INSTALL_PATH/platforms/tizen-5.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-5.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-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 --git a/package/5.0-emulator-qemu-x86.remove.linux b/package/5.0-emulator-qemu-x86.remove.linux deleted file mode 100755 index 1b3afc2f16..0000000000 --- a/package/5.0-emulator-qemu-x86.remove.linux +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash -ex - -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} -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 --git a/package/6.0-emulator-qemu-x86.install.linux b/package/6.0-emulator-qemu-x86.install.linux deleted file mode 100755 index 5a771bd4f9..0000000000 --- a/package/6.0-emulator-qemu-x86.install.linux +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash -x - -TIZEN_SDK_INSTALL_PATH=`echo ${INSTALLED_PATH}` -TIZEN_PLATFORM_ETC_PATH=$TIZEN_SDK_INSTALL_PATH/platforms/tizen-6.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-6.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-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 --git a/package/6.0-emulator-qemu-x86.remove.linux b/package/6.0-emulator-qemu-x86.remove.linux deleted file mode 100755 index 1b3afc2f16..0000000000 --- a/package/6.0-emulator-qemu-x86.remove.linux +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash -ex - -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} -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 --git a/package/6.5-emulator-qemu-x86.install.linux b/package/6.5-emulator-qemu-x86.install.linux deleted file mode 100755 index ef8a9c0b68..0000000000 --- a/package/6.5-emulator-qemu-x86.install.linux +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash -x - -TIZEN_SDK_INSTALL_PATH=`echo ${INSTALLED_PATH}` -TIZEN_PLATFORM_ETC_PATH=$TIZEN_SDK_INSTALL_PATH/platforms/tizen-6.5/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-6.5 - -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-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 --git a/package/6.5-emulator-qemu-x86.remove.linux b/package/6.5-emulator-qemu-x86.remove.linux deleted file mode 100755 index 1b3afc2f16..0000000000 --- a/package/6.5-emulator-qemu-x86.remove.linux +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash -ex - -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} -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 --git a/package/build.common b/package/build.common index 217fe23fec..5a164a2ab3 100644 --- a/package/build.common +++ b/package/build.common @@ -42,7 +42,7 @@ build_common() # install_common install_common() { - TIZEN_VERSIONS="6.5 6.0 5.0 4.0 3.0 2.4 2.3.2" + TIZEN_VERSIONS="7.0 6.5 6.0 5.0 4.0 3.0 2.4 2.3.2" QEMU_VERSION=`cat ${SRCDIR}/package/pkginfo.manifest | grep Version | awk -F: '{print $2}' | xargs` for VER in ${TIZEN_VERSIONS} ; do @@ -54,7 +54,7 @@ install_common() EMULATOR_X86_DIR=$SRCDIR/package/$VER-emulator-qemu-x86.package.${TARGET_OS}/data/platforms/tizen-$VER/common mkdir -p $EMULATOR_X86_DIR - cp -pPR $SRCDIR/buildroot_x86_64/tizen/emulator $EMULATOR_X86_DIR/emulator + cp -pPR $SRCDIR/buildroot_x86_64/tizen/emulator $EMULATOR_X86_DIR/ # make install/remove script, depending on the version ORIGIN_INSTALL_FILE=$SRCDIR/package/emulator-qemu-x86.install.$TARGET_OS_CATEGORY diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest index a74cac4359..9ceb44fffe 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -1,62 +1,62 @@ -Version: 5.0.1.2 +Version: 5.0.1.3 Maintainer: SeokYeon Hwang Source: emulator -# For tizen 6.5 -Package: 6.5-emulator-qemu-common +# For tizen 7.0 +Package: 7.0-emulator-qemu-common OS: ubuntu-32 Build-host-os: ubuntu-32 Description: Common binaries for Tizen Emulator -Package: 6.5-emulator-qemu-common +Package: 7.0-emulator-qemu-common OS: ubuntu-64 Build-host-os: ubuntu-64 Description: Common binaries for Tizen Emulator -Package: 6.5-emulator-qemu-common +Package: 7.0-emulator-qemu-common OS: windows-32, windows-64 Build-host-os: ubuntu-64 Description: Common binaries for Tizen Emulator -Package: 6.5-emulator-qemu-common +Package: 7.0-emulator-qemu-common OS: macos-64 Build-host-os: macos-64 Description: Common binaries for Tizen Emulator -Package: 6.5-emulator-qemu-x86 +Package: 7.0-emulator-qemu-x86 OS: ubuntu-32 Build-host-os: ubuntu-32 -Build-dependency: 6.5-emulator-lib-dev [ ubuntu-32 ], 6.5-libav-dev [ ubuntu-32 ] -Install-dependency: 6.5-emulator-kernel-x86 [ ubuntu-32 ], 6.5-libav [ ubuntu-32 ] +Build-dependency: 7.0-emulator-lib-dev [ ubuntu-32 ], 7.0-libav-dev [ ubuntu-32 ] +Install-dependency: 7.0-emulator-kernel-x86 [ ubuntu-32 ], 7.0-libav [ ubuntu-32 ] C-Prerequisites: acl, bridge-utils, openvpn, libfontconfig1, libglib2.0-0, libjpeg-turbo8, libpixman-1-0, libpng12-0, libsdl1.2debian, libsm6, libv4l-0, libx11-xcb1, libxcb-icccm4, libxcb-image0, libxcb-randr0, libxcb-render-util0, libxcb-shape0, libxcb-xfixes0, libxi6 Description: Tizen x86 Emulator -Package: 6.5-emulator-qemu-x86 +Package: 7.0-emulator-qemu-x86 OS: ubuntu-64 Build-host-os: ubuntu-64 -Build-dependency: 6.5-emulator-lib-dev [ ubuntu-64 ], 6.5-libav-dev [ ubuntu-64] -Install-dependency: 6.5-emulator-kernel-x86 [ ubuntu-64 ], 6.5-libav [ ubuntu-64 ] +Build-dependency: 7.0-emulator-lib-dev [ ubuntu-64 ], 7.0-libav-dev [ ubuntu-64] +Install-dependency: 7.0-emulator-kernel-x86 [ ubuntu-64 ], 7.0-libav [ ubuntu-64 ] C-Prerequisites: acl, bridge-utils, openvpn, libfontconfig1, libglib2.0-0, libjpeg-turbo8, libpixman-1-0, libpng12-0, libsdl1.2debian, libsm6, libv4l-0, libx11-xcb1, libxcb-icccm4, libxcb-image0, libxcb-randr0, libxcb-render-util0, libxcb-shape0, libxcb-xfixes0, libxi6 Description: Tizen x86 Emulator -Package: 6.5-emulator-qemu-x86 +Package: 7.0-emulator-qemu-x86 OS: windows-32 Build-host-os: ubuntu-64 -Build-dependency: 6.5-emulator-lib-dev [ windows-32 ], 6.5-libav-dev [ windows-32 ] -Install-dependency: 6.5-emulator-kernel-x86, 6.5-libav +Build-dependency: 7.0-emulator-lib-dev [ windows-32 ], 7.0-libav-dev [ windows-32 ] +Install-dependency: 7.0-emulator-kernel-x86, 7.0-libav Description: Tizen x86 Emulator -Package: 6.5-emulator-qemu-x86 +Package: 7.0-emulator-qemu-x86 OS: windows-64 Build-host-os: ubuntu-64 -Build-dependency: 6.5-emulator-lib-dev [ windows-64 ], 6.5-libav-dev [ windows-64 ] -Install-dependency: 6.5-emulator-kernel-x86, 6.5-libav +Build-dependency: 7.0-emulator-lib-dev [ windows-64 ], 7.0-libav-dev [ windows-64 ] +Install-dependency: 7.0-emulator-kernel-x86, 7.0-libav Description: Tizen x86 Emulator -Package: 6.5-emulator-qemu-x86 +Package: 7.0-emulator-qemu-x86 OS: macos-64 Build-host-os: macos-64 -Build-dependency: 6.5-emulator-lib-dev [ macos-64 ], 6.5-libav-dev [ macos-64 ] -Install-dependency: cocoasudo [ macos-64 ], 6.5-emulator-kernel-x86 [ macos-64 ], 6.5-libav [ macos-64 ] +Build-dependency: 7.0-emulator-lib-dev [ macos-64 ], 7.0-libav-dev [ macos-64 ] +Install-dependency: cocoasudo [ macos-64 ], 7.0-emulator-kernel-x86 [ macos-64 ], 7.0-libav [ macos-64 ] Description: Tizen x86 Emulator diff --git a/tizen/src/Makefile b/tizen/src/Makefile index 2269cb91d7..b162ccdfb1 100755 --- a/tizen/src/Makefile +++ b/tizen/src/Makefile @@ -13,7 +13,7 @@ TARGET_DSO += #Fix me for out of tree build #BUILD_PATH = $(SRC_PATH)/buildroot_x86_64 -BUILD_PATH = "../.." +BUILD_PATH =../.. all: qemu $(TARGET_EXE) $(TARGET_DSO) qemu: build_info @@ -40,6 +40,8 @@ clean: qemu_clean distclean: clean qemu_distclean install: all + @echo "Present working directory :" $(PWD) + @echo "EMULATOR directory :" $(EMUL_DIR) mkdir -p $(EMUL_DIR)/bin mkdir -p $(EMUL_DIR)/etc mkdir -p $(EMUL_DIR)/data @@ -51,10 +53,10 @@ install: all @echo "Copying bioses to $(EMUL_DIR)/data/bios" mkdir -p $(EMUL_DIR)/data/bios - cp -pP ../../pc-bios/bios-256k.bin $(EMUL_DIR)/data/bios - cp -pP ../../pc-bios/linuxboot.bin $(EMUL_DIR)/data/bios - cp -pP ../../pc-bios/linuxboot_dma.bin $(EMUL_DIR)/data/bios - cp -pP ../../pc-bios/efi-virtio.rom $(EMUL_DIR)/data/bios + cp -pP ../../../pc-bios/bios-256k.bin $(EMUL_DIR)/data/bios + cp -pP ../../../pc-bios/linuxboot.bin $(EMUL_DIR)/data/bios + cp -pP ../../../pc-bios/linuxboot_dma.bin $(EMUL_DIR)/data/bios + cp -pP ../../../pc-bios/efi-virtio.rom $(EMUL_DIR)/data/bios cp -pP scripts/emulator.sh $(EMUL_DIR)/bin ifdef CONFIG_WIN32 @@ -99,4 +101,4 @@ else all: @echo "Please call configure before running make!" @exit 1 -endif +endif \ No newline at end of file -- 2.34.1