From: Kitae Kim Date: Tue, 30 Oct 2012 08:28:33 +0000 (+0900) Subject: package: Modified build scripts for arm packages. X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~1401 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3e248abdc915f1fab2ef023a794ad620c851745f;p=sdk%2Femulator%2Fqemu.git package: Modified build scripts for arm packages. Since arm emulator has been supported, an emulator package needs to divide into three packages which are x86, arm and common. Signed-off-by: Kitae Kim --- diff --git a/package/build.macos-64 b/package/build.macos-64 index 52bc72122a..7236d2bf74 100755 --- a/package/build.macos-64 +++ b/package/build.macos-64 @@ -4,7 +4,7 @@ clean() { prepare - cd $SRCDIR/tizen/ + cd $SRCDIR/tizen if test -e "Makefile" then ./emulator_configure.sh @@ -32,24 +32,31 @@ build() cd $SRCDIR/tizen/ # ./emulator_configure.sh make all_dibs - if [ $? -eq 0 ] - then - echo "build success" - else - echo "build failure" - exit 1 - fi + if [ $? -eq 0 ] + then + echo "build success" + else + echo "build failure" + exit 1 + fi } # install install() { - BIN_DIR=$SRCDIR/package/emulator-qemu-x86.package.${TARGET_OS}/data/tools - mkdir -p $BIN_DIR + 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 + 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 $COMMON_BIN_DIR cd $SRCDIR/tizen make install_dibs - mv emulator $BIN_DIR + + mv x86 $X86_BIN_DIR/emulator + mv arm $ARM_BIN_DIR/emulator + mv common $COMMON_BIN_DIR/emulator } [ "$1" = "clean" ] && clean diff --git a/package/build.ubuntu-32 b/package/build.ubuntu-32 index 25adf3826d..7236d2bf74 100755 --- a/package/build.ubuntu-32 +++ b/package/build.ubuntu-32 @@ -4,7 +4,7 @@ clean() { prepare - cd $SRCDIR/tizen/ + cd $SRCDIR/tizen if test -e "Makefile" then ./emulator_configure.sh @@ -44,12 +44,19 @@ build() # install install() { - BIN_DIR=$SRCDIR/package/emulator-qemu-x86.package.${TARGET_OS}/data/tools - mkdir -p $BIN_DIR + 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 + 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 $COMMON_BIN_DIR cd $SRCDIR/tizen make install_dibs - mv emulator $BIN_DIR + + mv x86 $X86_BIN_DIR/emulator + mv arm $ARM_BIN_DIR/emulator + mv common $COMMON_BIN_DIR/emulator } [ "$1" = "clean" ] && clean diff --git a/package/build.ubuntu-64 b/package/build.ubuntu-64 index 52bc72122a..b88337a5e9 100755 --- a/package/build.ubuntu-64 +++ b/package/build.ubuntu-64 @@ -32,24 +32,31 @@ build() cd $SRCDIR/tizen/ # ./emulator_configure.sh make all_dibs - if [ $? -eq 0 ] - then - echo "build success" - else - echo "build failure" - exit 1 - fi + if [ $? -eq 0 ] + then + echo "build success" + else + echo "build failure" + exit 1 + fi } # install install() { - BIN_DIR=$SRCDIR/package/emulator-qemu-x86.package.${TARGET_OS}/data/tools - mkdir -p $BIN_DIR + 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 + 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 $COMMON_BIN_DIR cd $SRCDIR/tizen make install_dibs - mv emulator $BIN_DIR + + mv x86 $X86_BIN_DIR/emulator + mv arm $ARM_BIN_DIR/emulator + mv common $COMMON_BIN_DIR/emulator } [ "$1" = "clean" ] && clean diff --git a/package/build.windows-32 b/package/build.windows-32 index 1e6444e325..49d02b270e 100755 --- a/package/build.windows-32 +++ b/package/build.windows-32 @@ -1,6 +1,5 @@ #!/bin/sh -xe # clean - clean() { prepare @@ -45,37 +44,44 @@ prepare() } # build -build() +build() { prepare cd $SRCDIR/tizen # ./emulator_configure.sh "$BUILD_CFLAGS $BUILD_LDFLAGS" make all_dibs - if [ $? -eq 0 ] - then - echo "build success" - else - echo "build failure" - exit 1 - fi + if [ $? -eq 0 ] + then + echo "build success" + else + echo "build failure" + exit 1 + fi } # install -install() +install() { prepare - BIN_DIR=$SRCDIR/package/emulator-qemu-x86.package.${TARGET_OS}/data/tools - - mkdir -p $BIN_DIR + 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 + 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 $COMMON_BIN_DIR cd $SRCDIR/tizen make install_dibs - mv emulator $BIN_DIR + + mv x86 $X86_BIN_DIR/emulator + mv arm $ARM_BIN_DIR/emulator + mv common $COMMON_BIN_DIR/emulator } [ "$1" = "clean" ] && clean [ "$1" = "build" ] && build [ "$1" = "install" ] && install -echo "Success" + +echo "success" diff --git a/package/emulator-qemu-common.install.macos-64 b/package/emulator-qemu-common.install.macos-64 new file mode 100755 index 0000000000..ef88dec417 --- /dev/null +++ b/package/emulator-qemu-common.install.macos-64 @@ -0,0 +1,63 @@ +#!/bin/sh + +TIZEN_SDK_INSTALL_PATH=`echo $INSTALLED_PATH` +SIZE=83886080 +SHMMAXSIZE=`sysctl -n kern.sysv.shmmax` +COCOASUDOPATH="./cocoasudo" +SYSCTL_FILE=sysctl.conf +if [ -z $TIZEN_SDK_INSTALL_PATH ] +then + echo "There is no TIZEN_SDK_PATH ENV" >> /tmp/emulator.log +# exit 2; +fi + +echo 'make sysctl.conf file' + +echo "kern.sysv.shmmax=83886080" >> $SYSCTL_FILE +echo "kern.sysv.shmmin=1" >> $SYSCTL_FILE +echo "kern.sysv.shmmni=128" >> $SYSCTL_FILE +echo "kern.sysv.shmseg=32" >> $SYSCTL_FILE +echo "kern.sysv.shmall=20480" >> $SYSCTL_FILE + +TIZEN_BIN_PATH=$TIZEN_SDK_INSTALLED_PATH/tools/emulator/bin +#TIZEN_BIN_PATH=./ +TMP_FILE=setshmmax.sh +NEW_SHMMAXSIZE=268435456 +if [ $SHMMAXSIZE -lt $SIZE ] +then + if [ -e /etc/$SYSCTL_FILE ] + then + echo "mv -f /etc/sysctl.conf /etc/sysctl.conf.old" >> $TMP_FILE + echo "cp -f ./$SYSCTL_FILE /etc/." >> $TMP_FILE + echo "sysctl -w kern.sysv.shmmax=$NEW_SHMMAXSIZE" >> $TMP_FILE + chmod +x $TMP_FILE + + $TIZEN_BIN_PATH/cocoasudo "--prompt=Changing /etc/sysctl.conf file requires that you type your password.(The original file will be removed to sysctl.conf.old)" sh -x ./$TMP_FILE + else + echo "cp -f ./$SYSCTL_FILE /etc/." >> $TMP_FILE + echo "sysctl -w kern.sysv.shmmax=$NEW_SHMMAXSIZE" >> $TMP_FILE + chmod +x $TMP_FILE + + $TIZEN_BIN_PATH/cocoasudo "--prompt=Make a new /etc/sysctl.conf file requires that you type your password." sh -x ./$TMP_FILE + fi +fi + +NEW_SHMMAXSIZE=`sysctl -n kern.sysv.shmmax` + +if [ -e $TMP_FILE ] +then + rm -f $TMP_FILE +fi + +if [ -e $SYSCTL_FILE ] +then + rm -f $SYSCTL_FILE +fi + +if [ ! $SHMMAXSIZE -eq $NEW_SHMMAXSIZE ] +then + + echo 'need reboot' + exit 99 +fi + diff --git a/package/emulator-qemu-x86.install.macos-64 b/package/emulator-qemu-x86.install.macos-64 deleted file mode 100755 index ef88dec417..0000000000 --- a/package/emulator-qemu-x86.install.macos-64 +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/sh - -TIZEN_SDK_INSTALL_PATH=`echo $INSTALLED_PATH` -SIZE=83886080 -SHMMAXSIZE=`sysctl -n kern.sysv.shmmax` -COCOASUDOPATH="./cocoasudo" -SYSCTL_FILE=sysctl.conf -if [ -z $TIZEN_SDK_INSTALL_PATH ] -then - echo "There is no TIZEN_SDK_PATH ENV" >> /tmp/emulator.log -# exit 2; -fi - -echo 'make sysctl.conf file' - -echo "kern.sysv.shmmax=83886080" >> $SYSCTL_FILE -echo "kern.sysv.shmmin=1" >> $SYSCTL_FILE -echo "kern.sysv.shmmni=128" >> $SYSCTL_FILE -echo "kern.sysv.shmseg=32" >> $SYSCTL_FILE -echo "kern.sysv.shmall=20480" >> $SYSCTL_FILE - -TIZEN_BIN_PATH=$TIZEN_SDK_INSTALLED_PATH/tools/emulator/bin -#TIZEN_BIN_PATH=./ -TMP_FILE=setshmmax.sh -NEW_SHMMAXSIZE=268435456 -if [ $SHMMAXSIZE -lt $SIZE ] -then - if [ -e /etc/$SYSCTL_FILE ] - then - echo "mv -f /etc/sysctl.conf /etc/sysctl.conf.old" >> $TMP_FILE - echo "cp -f ./$SYSCTL_FILE /etc/." >> $TMP_FILE - echo "sysctl -w kern.sysv.shmmax=$NEW_SHMMAXSIZE" >> $TMP_FILE - chmod +x $TMP_FILE - - $TIZEN_BIN_PATH/cocoasudo "--prompt=Changing /etc/sysctl.conf file requires that you type your password.(The original file will be removed to sysctl.conf.old)" sh -x ./$TMP_FILE - else - echo "cp -f ./$SYSCTL_FILE /etc/." >> $TMP_FILE - echo "sysctl -w kern.sysv.shmmax=$NEW_SHMMAXSIZE" >> $TMP_FILE - chmod +x $TMP_FILE - - $TIZEN_BIN_PATH/cocoasudo "--prompt=Make a new /etc/sysctl.conf file requires that you type your password." sh -x ./$TMP_FILE - fi -fi - -NEW_SHMMAXSIZE=`sysctl -n kern.sysv.shmmax` - -if [ -e $TMP_FILE ] -then - rm -f $TMP_FILE -fi - -if [ -e $SYSCTL_FILE ] -then - rm -f $SYSCTL_FILE -fi - -if [ ! $SHMMAXSIZE -eq $NEW_SHMMAXSIZE ] -then - - echo 'need reboot' - exit 99 -fi - diff --git a/package/emulator-qemu-x86.install.ubuntu-32 b/package/emulator-qemu-x86.install.ubuntu-32 deleted file mode 100755 index ba1c51fbf4..0000000000 --- a/package/emulator-qemu-x86.install.ubuntu-32 +++ /dev/null @@ -1,19 +0,0 @@ -#!/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-x86.install.ubuntu-64 b/package/emulator-qemu-x86.install.ubuntu-64 deleted file mode 100755 index ba1c51fbf4..0000000000 --- a/package/emulator-qemu-x86.install.ubuntu-64 +++ /dev/null @@ -1,19 +0,0 @@ -#!/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-x86.remove.ubuntu-32 b/package/emulator-qemu-x86.remove.ubuntu-32 deleted file mode 100755 index f1f106e19c..0000000000 --- a/package/emulator-qemu-x86.remove.ubuntu-32 +++ /dev/null @@ -1,18 +0,0 @@ -#!/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-x86.remove.ubuntu-64 b/package/emulator-qemu-x86.remove.ubuntu-64 deleted file mode 100755 index f1f106e19c..0000000000 --- a/package/emulator-qemu-x86.remove.ubuntu-64 +++ /dev/null @@ -1,18 +0,0 @@ -#!/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 55c984be8e..173e7d876f 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -1,31 +1,83 @@ -Version: 1.3.65 +Version: 1.3.66 Maintainer: Yeong-Kyoon Lee Source: emulator +Package: emulator-qemu-common +OS: ubuntu-32 +Build-host-os: ubuntu-32 +Build-dependency: emulator-lib [ ubuntu-32 ] +Description: Common binaries for Tizen Emulator + +Package: emulator-qemu-common +OS: ubuntu-64 +Build-host-os: ubuntu-64 +Build-dependency: emulator-lib [ ubuntu-64 ] +Description: Common binaries for Tizen Emulator + +Package: emulator-qemu-common +OS: windows-32, windows-64 +Build-host-os: windows-32 +Build-dependency: emulator-lib [ windows-32 ] +Description: Common binaries for Tizen Emulator + +Package: emulator-qemu-common +OS: macos-64 +Build-host-os: macos-64 +Build-dependency: emulator-lib [ macos-64 ] +Description: Common binaries for Tizen Emulator + Package: emulator-qemu-x86 OS: ubuntu-32 Build-host-os: ubuntu-32 Build-dependency: emulator-lib [ ubuntu-32 ] -Install-dependency: emulator-kernel-x86 [ ubuntu-32 ], vgabios [ ubuntu-32 ] -Description: Tizen Emulator +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-x86 OS: ubuntu-64 Build-host-os: ubuntu-64 Build-dependency: emulator-lib [ ubuntu-64 ] -Install-dependency: emulator-kernel-x86 [ ubuntu-64 ], vgabios [ ubuntu-64 ] -Description: Tizen Emulator +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-x86 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-kernel-x86 [ windows-32 ], vgabios [ windows-32 ] -Description: Tizen Emulator +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-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-x86 OS: macos-64 Build-host-os: macos-64 Build-dependency: emulator-lib [ macos-64 ] -Install-dependency: emulator-kernel-x86 [ macos-64 ], vgabios [ macos-64 ] -Description: Tizen Emulator +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 diff --git a/tizen/src/Makefile b/tizen/src/Makefile index c2d98df3a8..e8732b5925 100755 --- a/tizen/src/Makefile +++ b/tizen/src/Makefile @@ -1,4 +1,7 @@ EMUL_DIR=../emulator +DIBS_X86_DIR=../x86 +DIBS_ARM_DIR=../arm +DIBS_COMMON_DIR=../common ifneq ($(wildcard ../../config-host.mak),) include ../../config-host.mak @@ -77,7 +80,7 @@ ifndef CONFIG_DARWIN echo "Copying bioses to $(EMUL_DIR)/data/bios" ;\ cp -dpr ../../pc-bios/bios.bin $(EMUL_DIR)/data/bios ;\ cp -dpr ../../pc-bios/linuxboot.bin $(EMUL_DIR)/data/bios ;\ - cp -dpr ../../pc-bios/pxe-rtl8139.rom $(EMUL_DIR)/data/bios ;\ + cp -dpr ../../pc-bios/kvmvapic.bin $(EMUL_DIR)/data/bios ;\ cp -dpr ../../pc-bios/pxe-virtio.rom $(EMUL_DIR)/data/bios ;\ ;; \ arm-softmmu) \ @@ -100,7 +103,7 @@ else echo "Copying bioses to $(EMUL_DIR)/data/bios" ;\ cp -pPR ../../pc-bios/bios.bin $(EMUL_DIR)/data/bios ;\ cp -pPR ../../pc-bios/linuxboot.bin $(EMUL_DIR)/data/bios ;\ - cp -pPR ../../pc-bios/pxe-rtl8139.rom $(EMUL_DIR)/data/bios ;\ + cp -pPR ../../pc-bios/kvmvapic.bin $(EMUL_DIR)/data/bios ;\ cp -pPR ../../pc-bios/pxe-virtio.rom $(EMUL_DIR)/data/bios ;\ ;; \ arm-softmmu) \ @@ -125,8 +128,6 @@ endif ifdef CONFIG_LINUX cp -pPr ../distrib/initscript/tizen-kvm $(EMUL_DIR)/etc cp -pPr ../distrib/initscript/45-tizen-kvm.rules $(EMUL_DIR)/etc -else - endif ifndef CONFIG_DARWIN @@ -147,29 +148,30 @@ all_dibs: qemu skin_client_dibs skin_client_dibs: ant -buildfile skin/client/build.xml -Dclasspath.dibs=$(ROOTDIR)/tools/emulator/bin make-jar-dibs install_dibs: all_dibs - mkdir -p $(EMUL_DIR)/bin - mkdir -p $(EMUL_DIR)/etc - mkdir -p $(EMUL_DIR)/data - mkdir -p $(EMUL_DIR)/data/bios + mkdir -p $(DIBS_COMMON_DIR)/bin + mkdir -p $(DIBS_COMMON_DIR)/etc + mkdir -p $(DIBS_X86_DIR)/bin + mkdir -p $(DIBS_X86_DIR)/data + mkdir -p $(DIBS_ARM_DIR)/bin ifndef CONFIG_DARWIN @for target in $(TARGET_DIRS); do \ case "$$target" in \ i386-softmmu) \ - mkdir -p $(EMUL_DIR)/data/bios ;\ - echo "Copying i386-softmmu/qemu-system-i386 to $(EMUL_DIR)/bin/emulator-x86" ;\ - cp ../../i386-softmmu/qemu-system-i386 $(EMUL_DIR)/bin/emulator-x86 ;\ - echo "Copying bioses to $(EMUL_DIR)/data/bios" ;\ - cp -dpr ../../pc-bios/bios.bin $(EMUL_DIR)/data/bios ;\ - cp -dpr ../../pc-bios/linuxboot.bin $(EMUL_DIR)/data/bios ;\ - cp -dpr ../../pc-bios/pxe-rtl8139.rom $(EMUL_DIR)/data/bios ;\ - cp -dpr ../../pc-bios/pxe-virtio.rom $(EMUL_DIR)/data/bios ;\ + mkdir -p $(DIBS_X86_DIR)/data/bios ;\ + echo "Copying i386-softmmu/qemu-system-i386 to $(DIBS_X86__DIR)/bin/emulator-x86" ;\ + cp ../../i386-softmmu/qemu-system-i386 $(DIBS_X86_DIR)/bin/emulator-x86 ;\ + echo "Copying bioses to $(DIBS_X86_DIR)/data/bios" ;\ + cp -dpr ../../pc-bios/bios.bin $(DIBS_X86_DIR)/data/bios ;\ + cp -dpr ../../pc-bios/linuxboot.bin $(DIBS_X86_DIR)/data/bios ;\ + cp -dpr ../../pc-bios/kvmvapic.bin $(DIBS_X86_DIR)/data/bios ;\ + cp -dpr ../../pc-bios/pxe-virtio.rom $(DIBS_X86_DIR)/data/bios ;\ ;; \ arm-softmmu) \ - echo "Copying arm-softmmu/qemu-system-arm to $(EMUL_DIR)/bin/emulator-arm" ;\ - cp ../../arm-softmmu/qemu-system-arm $(EMUL_DIR)/bin/emulator-arm ;\ + echo "Copying arm-softmmu/qemu-system-arm to $(DIBS_ARM_DIR)/bin/emulator-arm" ;\ + cp ../../arm-softmmu/qemu-system-arm $(DIBS_ARM_DIR)/bin/emulator-arm ;\ if [ ! -z "$$CONFIG_OPENGLES" ] ; then \ - echo "Copying OpenGLES libraries to $(EMUL_DIR)/bin/" ;\ - cp -dp -t $(EMUL_DIR)/bin/ $(GLESLIBS_LIST) ;\ + echo "Copying OpenGLES libraries to $(DIBS_ARM_DIR)/bin/" ;\ + cp -dp -t $(DIBS_ARM_DIR)/bin/ $(GLESLIBS_LIST) ;\ fi ;\ ;; \ esac; \ @@ -178,50 +180,48 @@ else @for target in $(TARGET_DIRS); do \ case "$$target" in \ i386-softmmu) \ - mkdir -p $(EMUL_DIR)/data/bios ;\ - echo "Copying i386-softmmu/qemu-system-i386 to $(EMUL_DIR)/bin/emulator-x86" ;\ - cp ../../i386-softmmu/qemu-system-i386 $(EMUL_DIR)/bin/emulator-x86 ;\ - echo "Copying bioses to $(EMUL_DIR)/data/bios" ;\ - cp -pPR ../../pc-bios/bios.bin $(EMUL_DIR)/data/bios ;\ - cp -pPR ../../pc-bios/linuxboot.bin $(EMUL_DIR)/data/bios ;\ - cp -pPR ../../pc-bios/pxe-rtl8139.rom $(EMUL_DIR)/data/bios ;\ - cp -pPR ../../pc-bios/pxe-virtio.rom $(EMUL_DIR)/data/bios ;\ + mkdir -p $(DIBS_X86_DIR)/data/bios ;\ + echo "Copying i386-softmmu/qemu-system-i386 to $(DIBS_X86_DIR)/bin/emulator-x86" ;\ + cp ../../i386-softmmu/qemu-system-i386 $(DIBS_X86_DIR)/bin/emulator-x86 ;\ + echo "Copying bioses to $(DIBS_X86_DIR)/data/bios" ;\ + cp -pPR ../../pc-bios/bios.bin $(DIBS_X86_DIR)/data/bios ;\ + cp -pPR ../../pc-bios/linuxboot.bin $(DIBS_X86_DIR)/data/bios ;\ + cp -pPR ../../pc-bios/kvmvapic.bin $(DIBS_X86_DIR)/data/bios ;\ + cp -pPR ../../pc-bios/pxe-virtio.rom $(DIBS_X86_DIR)/data/bios ;\ ;; \ arm-softmmu) \ - echo "Copying arm-softmmu/qemu-system-arm to $(EMUL_DIR)/bin/emulator-arm" ;\ - cp ../../arm-softmmu/qemu-system-arm $(EMUL_DIR)/bin/emulator-arm ;\ + echo "Copying arm-softmmu/qemu-system-arm to $(DIBS_ARM_DIR)/bin/emulator-arm" ;\ + cp ../../arm-softmmu/qemu-system-arm $(DIBS_ARM_DIR)/bin/emulator-arm ;\ if [ ! -z "$$CONFIG_OPENGLES" ] ; then \ - echo "Copying OpenGLES libraries to $(EMUL_DIR)/bin/" ;\ - cp -pP -t $(EMUL_DIR)/bin/ $(GLESLIBS_LIST) ;\ + echo "Copying OpenGLES libraries to $(DIBS_ARM_DIR)/bin/" ;\ + cp -pP -t $(DIBS_ARM_DIR)/bin/ $(GLESLIBS_LIST) ;\ fi ;\ ;; \ esac; \ done endif - cp skin/client/emulator-skin.jar $(EMUL_DIR)/bin + cp skin/client/emulator-skin.jar $(DIBS_COMMON_DIR)/bin ifdef CONFIG_WIN32 - cp check-hax.exe $(EMUL_DIR)/bin + cp check-hax.exe $(DIBS_COMMON_DIR)/bin endif ifdef CONFIG_DARWIN cp check-hax $(EMUL_DIR)/bin endif ifdef CONFIG_LINUX - echo "Copying tizen-kvm to $(EMUL_DIR)/etc" - cp -pPr ../distrib/initscript/tizen-kvm $(EMUL_DIR)/etc - cp -pPr ../distrib/initscript/45-tizen-kvm.rules $(EMUL_DIR)/etc -else - + echo "Copying tizen-kvm to $(DIBS_COMMON_DIR)/etc" + cp -pPr ../distrib/initscript/tizen-kvm $(DIBS_COMMON_DIR)/etc + cp -pPr ../distrib/initscript/45-tizen-kvm.rules $(DIBS_COMMON_DIR)/etc endif ifndef CONFIG_DARWIN - cp ../../qemu-img $(EMUL_DIR)/bin - cp -dpr ../license $(EMUL_DIR) - cp -dpr skin/client/skins $(EMUL_DIR) + cp ../../qemu-img $(DIBS_COMMON_DIR)/bin + cp -dpr ../license $(DIBS_COMMON_DIR) + cp -dpr skin/client/skins $(DIBS_COMMON_DIR) else - cp ../../qemu-img $(EMUL_DIR)/bin - cp -pPR ../license $(EMUL_DIR) - cp -pPR skin/client/skins $(EMUL_DIR) - cp -pPR skin/client/native_src/libshared.dylib $(EMUL_DIR)/bin + cp ../../qemu-img $(DIBS_COMMON_DIR)/bin + cp -pPR ../license $(DIBS_COMMON_DIR) + cp -pPR skin/client/skins $(DIBS_COMMON_DIR) + cp -pPR skin/client/native_src/libshared.dylib $(DIBS_COMMON_DIR)/bin endif