From c60a5c61538e5348778fe334e4527cf78986cb04 Mon Sep 17 00:00:00 2001 From: Kitae Kim Date: Tue, 30 Oct 2012 20:56:35 +0900 Subject: [PATCH] package: Comment out build routine for arm packages. Prevents qemu from compiling arm-softmmu temporarily Signed-off-by: Kitae Kim --- package/build.macos-64 | 8 ++-- package/build.ubuntu-32 | 10 ++-- package/build.ubuntu-64 | 8 ++-- package/build.windows-32 | 2 +- .../emulator-qemu-common.install.ubuntu-32 | 19 ++++++++ .../emulator-qemu-common.install.ubuntu-64 | 19 ++++++++ package/emulator-qemu-common.remove.ubuntu-32 | 18 +++++++ package/emulator-qemu-common.remove.ubuntu-64 | 18 +++++++ package/pkginfo.manifest | 48 +++++++++---------- 9 files changed, 112 insertions(+), 38 deletions(-) create mode 100755 package/emulator-qemu-common.install.ubuntu-32 create mode 100755 package/emulator-qemu-common.install.ubuntu-64 create mode 100755 package/emulator-qemu-common.remove.ubuntu-32 create mode 100755 package/emulator-qemu-common.remove.ubuntu-64 diff --git a/package/build.macos-64 b/package/build.macos-64 index 7236d2bf74..d0e69a2f50 100755 --- a/package/build.macos-64 +++ b/package/build.macos-64 @@ -7,7 +7,7 @@ clean() cd $SRCDIR/tizen if test -e "Makefile" then - ./emulator_configure.sh + ./emulator_configure.sh x86 make clean fi rm -rf $SRCDIR/*.zip @@ -45,17 +45,17 @@ build() install() { X86_BIN_DIR=$SRCDIR/package/emulator-qemu-x86.package.${TARGET_OS}/data/tools - ARM_BIN_DIR=$SRCDIR/package/emulator-qemu-arm.package.${TARGET_OS}/data/tools +# ARM_BIN_DIR=$SRCDIR/package/emulator-qemu-arm.package.${TARGET_OS}/data/tools COMMON_BIN_DIR=$SRCDIR/package/emulator-qemu-common.package.${TARGET_OS}/data/tools mkdir -p $X86_BIN_DIR - mkdir -p $ARM_BIN_DIR +# mkdir -p $ARM_BIN_DIR mkdir -p $COMMON_BIN_DIR cd $SRCDIR/tizen make install_dibs mv x86 $X86_BIN_DIR/emulator - mv arm $ARM_BIN_DIR/emulator +# mv arm $ARM_BIN_DIR/emulator mv common $COMMON_BIN_DIR/emulator } diff --git a/package/build.ubuntu-32 b/package/build.ubuntu-32 index 7236d2bf74..d9789bc762 100755 --- a/package/build.ubuntu-32 +++ b/package/build.ubuntu-32 @@ -7,7 +7,7 @@ clean() cd $SRCDIR/tizen if test -e "Makefile" then - ./emulator_configure.sh + ./emulator_configure.sh x86 make clean fi rm -rf $SRCDIR/*.zip @@ -30,7 +30,7 @@ prepare() build() { cd $SRCDIR/tizen/ -# ./emulator_configure.sh +# ./emulator_configure.sh arm make all_dibs if [ $? -eq 0 ] then @@ -45,17 +45,17 @@ build() install() { X86_BIN_DIR=$SRCDIR/package/emulator-qemu-x86.package.${TARGET_OS}/data/tools - ARM_BIN_DIR=$SRCDIR/package/emulator-qemu-arm.package.${TARGET_OS}/data/tools +# ARM_BIN_DIR=$SRCDIR/package/emulator-qemu-arm.package.${TARGET_OS}/data/tools COMMON_BIN_DIR=$SRCDIR/package/emulator-qemu-common.package.${TARGET_OS}/data/tools mkdir -p $X86_BIN_DIR - mkdir -p $ARM_BIN_DIR +# mkdir -p $ARM_BIN_DIR mkdir -p $COMMON_BIN_DIR cd $SRCDIR/tizen make install_dibs mv x86 $X86_BIN_DIR/emulator - mv arm $ARM_BIN_DIR/emulator +# mv arm $ARM_BIN_DIR/emulator mv common $COMMON_BIN_DIR/emulator } diff --git a/package/build.ubuntu-64 b/package/build.ubuntu-64 index b88337a5e9..4e46c33937 100755 --- a/package/build.ubuntu-64 +++ b/package/build.ubuntu-64 @@ -7,7 +7,7 @@ clean() cd $SRCDIR/tizen/ if test -e "Makefile" then - ./emulator_configure.sh + ./emulator_configure.sh x86 make clean fi rm -rf $SRCDIR/*.zip @@ -45,17 +45,17 @@ build() install() { X86_BIN_DIR=$SRCDIR/package/emulator-qemu-x86.package.${TARGET_OS}/data/tools - ARM_BIN_DIR=$SRCDIR/package/emulator-qemu-arm.package.${TARGET_OS}/data/tools +# ARM_BIN_DIR=$SRCDIR/package/emulator-qemu-arm.package.${TARGET_OS}/data/tools COMMON_BIN_DIR=$SRCDIR/package/emulator-qemu-common.package.${TARGET_OS}/data/tools mkdir -p $X86_BIN_DIR - mkdir -p $ARM_BIN_DIR +# mkdir -p $ARM_BIN_DIR mkdir -p $COMMON_BIN_DIR cd $SRCDIR/tizen make install_dibs mv x86 $X86_BIN_DIR/emulator - mv arm $ARM_BIN_DIR/emulator +# mv arm $ARM_BIN_DIR/emulator mv common $COMMON_BIN_DIR/emulator } diff --git a/package/build.windows-32 b/package/build.windows-32 index 49d02b270e..ba2710c0fc 100755 --- a/package/build.windows-32 +++ b/package/build.windows-32 @@ -7,7 +7,7 @@ clean() cd $SRCDIR/tizen if test -e "Makefile" then - ./emulator_configure.sh "$BUILD_CFLAGS $BUILD_LDFLAGS" + ./emulator_configure.sh -e "$BUILD_CFLAGS $BUILD_LDFLAGS" x86 make clean fi rm -rf $SRCDIR/*.zip diff --git a/package/emulator-qemu-common.install.ubuntu-32 b/package/emulator-qemu-common.install.ubuntu-32 new file mode 100755 index 0000000000..ba1c51fbf4 --- /dev/null +++ b/package/emulator-qemu-common.install.ubuntu-32 @@ -0,0 +1,19 @@ +#!/bin/sh + +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 + +TMP_FILE=init_tizen-kvm.sh +echo "cp ${TIZEN_SDK_INSTALL_PATH}/tools/emulator/etc/tizen-kvm /etc/init.d/" >> $TMP_FILE +echo "cp ${TIZEN_SDK_INSTALL_PATH}/tools/emulator/etc/45-tizen-kvm.rules /lib/udev/rules.d/" >> $TMP_FILE +echo "/etc/init.d/tizen-kvm start" >> $TMP_FILE +echo "update-rc.d tizen-kvm defaults" >> $TMP_FILE + +chmod +x $TMP_FILE +gksudo ./$TMP_FILE + +rm $TMP_FILE diff --git a/package/emulator-qemu-common.install.ubuntu-64 b/package/emulator-qemu-common.install.ubuntu-64 new file mode 100755 index 0000000000..ba1c51fbf4 --- /dev/null +++ b/package/emulator-qemu-common.install.ubuntu-64 @@ -0,0 +1,19 @@ +#!/bin/sh + +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 + +TMP_FILE=init_tizen-kvm.sh +echo "cp ${TIZEN_SDK_INSTALL_PATH}/tools/emulator/etc/tizen-kvm /etc/init.d/" >> $TMP_FILE +echo "cp ${TIZEN_SDK_INSTALL_PATH}/tools/emulator/etc/45-tizen-kvm.rules /lib/udev/rules.d/" >> $TMP_FILE +echo "/etc/init.d/tizen-kvm start" >> $TMP_FILE +echo "update-rc.d tizen-kvm defaults" >> $TMP_FILE + +chmod +x $TMP_FILE +gksudo ./$TMP_FILE + +rm $TMP_FILE diff --git a/package/emulator-qemu-common.remove.ubuntu-32 b/package/emulator-qemu-common.remove.ubuntu-32 new file mode 100755 index 0000000000..f1f106e19c --- /dev/null +++ b/package/emulator-qemu-common.remove.ubuntu-32 @@ -0,0 +1,18 @@ +#!/bin/sh + +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 + +TMP_FILE=remove_tizen-kvm.sh +echo "update-rc.d -f tizen-kvm remove" >> $TMP_FILE +echo "rm -f /etc/init.d/tizen-kvm" >> $TMP_FILE +echo "rm -f /lib/udev/rules.d/45-tizen-kvm.rules" >> $TMP_FILE + +chmod +x $TMP_FILE +gksudo ./$TMP_FILE + +rm $TMP_FILE diff --git a/package/emulator-qemu-common.remove.ubuntu-64 b/package/emulator-qemu-common.remove.ubuntu-64 new file mode 100755 index 0000000000..f1f106e19c --- /dev/null +++ b/package/emulator-qemu-common.remove.ubuntu-64 @@ -0,0 +1,18 @@ +#!/bin/sh + +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 + +TMP_FILE=remove_tizen-kvm.sh +echo "update-rc.d -f tizen-kvm remove" >> $TMP_FILE +echo "rm -f /etc/init.d/tizen-kvm" >> $TMP_FILE +echo "rm -f /lib/udev/rules.d/45-tizen-kvm.rules" >> $TMP_FILE + +chmod +x $TMP_FILE +gksudo ./$TMP_FILE + +rm $TMP_FILE diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest index 173e7d876f..c0d61d4c4c 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -33,12 +33,12 @@ Build-dependency: emulator-lib [ ubuntu-32 ] Install-dependency: emulator-qemu-common [ ubuntu-32 ], emulator-kernel-x86 [ ubuntu-32 ], vgabios [ ubuntu-32 ] Description: Tizen x86 Emulator -Package: emulator-qemu-arm -OS: ubuntu-32 -Build-host-os: ubuntu-32 -Build-dependency: emulator-lib [ ubuntu-32 ] -Install-dependency: emulator-qemu-common [ ubuntu-32 ], emulator-kernel-arm [ ubuntu-32 ] -Description: Tizen ARM Emulator +#Package: emulator-qemu-arm +#OS: ubuntu-32 +#Build-host-os: ubuntu-32 +#Build-dependency: emulator-lib [ ubuntu-32 ] +#Install-dependency: emulator-qemu-common [ ubuntu-32 ], emulator-kernel-arm [ ubuntu-32 ] +#Description: Tizen ARM Emulator Package: emulator-qemu-x86 OS: ubuntu-64 @@ -47,12 +47,12 @@ Build-dependency: emulator-lib [ ubuntu-64 ] Install-dependency: emulator-qemu-common [ ubuntu-64 ], emulator-kernel-x86 [ ubuntu-64 ], vgabios [ ubuntu-64 ] Description: Tizen x86 Emulator -Package: emulator-qemu-arm -OS: ubuntu-64 -Build-host-os: ubuntu-64 -Build-dependency: emulator-lib [ ubuntu-64 ] -Install-dependency: emulator-qemu-common [ ubuntu-64 ], emulator-kernel-arm [ ubuntu-64 ] -Description: Tizen ARM Emulator +#Package: emulator-qemu-arm +#OS: ubuntu-64 +#Build-host-os: ubuntu-64 +#Build-dependency: emulator-lib [ ubuntu-64 ] +#Install-dependency: emulator-qemu-common [ ubuntu-64 ], emulator-kernel-arm [ ubuntu-64 ] +#Description: Tizen ARM Emulator Package: emulator-qemu-x86 OS: windows-32, windows-64 @@ -61,12 +61,12 @@ Build-dependency: SDL-1.2.14 [ windows-32 ], apache-ant-1.8.3-bin [ windows-32 ] Install-dependency: emulator-qemu-common [ windows-32 ], emulator-kernel-x86 [ windows-32 ], vgabios [ windows-32 ] Description: Tizen x86 Emulator -Package: emulator-qemu-arm -OS: windows-32, windows-64 -Build-host-os: windows-32 -Build-dependency: SDL-1.2.14 [ windows-32 ], apache-ant-1.8.3-bin [ windows-32 ], gtk-bundle_2.16.6 [ windows-32 ], directx-dev [ windows-32 ], libcurl-4 [ windows-32 ], emulator-lib [ windows-32 ] -Install-dependency: emulator-qemu-common [ windows-32 ], emulator-kernel-arm [ windows-32 ] -Description: Tizen ARM Emulator +#Package: emulator-qemu-arm +#OS: windows-32, windows-64 +#Build-host-os: windows-32 +#Build-dependency: SDL-1.2.14 [ windows-32 ], apache-ant-1.8.3-bin [ windows-32 ], gtk-bundle_2.16.6 [ windows-32 ], directx-dev [ windows-32 ], libcurl-4 [ windows-32 ], emulator-lib [ windows-32 ] +#Install-dependency: emulator-qemu-common [ windows-32 ], emulator-kernel-arm [ windows-32 ] +#Description: Tizen ARM Emulator Package: emulator-qemu-x86 OS: macos-64 @@ -75,9 +75,9 @@ Build-dependency: emulator-lib [ macos-64 ] Install-dependency: emulator-qemu-common [ macos-64 ], emulator-kernel-x86 [ macos-64 ], vgabios [ macos-64 ] Description: Tizen x86 Emulator -Package: emulator-qemu-arm -OS: macos-64 -Build-host-os: macos-64 -Build-dependency: emulator-lib [ macos-64 ] -Install-dependency: emulator-qemu-common [ macos-64 ], emulator-kernel-arm [ macos-64 ] -Description: Tizen ARM Emulator \ No newline at end of file +#Package: emulator-qemu-arm +#OS: macos-64 +#Build-host-os: macos-64 +#Build-dependency: emulator-lib [ macos-64 ] +#Install-dependency: emulator-qemu-common [ macos-64 ], emulator-kernel-arm [ macos-64 ] +#Description: Tizen ARM Emulator -- 2.34.1