From dcbc297aea6a159f2f5fad5de84666f23c2d17ad Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 14 Sep 2011 11:38:13 +0100 Subject: tools: Revert seabios and upstream qemu build changes These have broken the build and it seems to be difficult to fix. So we will revert the whole lot for now, and await corrected patch(es). Revert "fix the build when CONFIG_QEMU is specified by the user" Revert "tools: fix permissions of git-checkout.sh" Revert "scripts/git-checkout.sh: Is not bash specific. Invoke with /bin/sh." Revert "Clone and build Seabios by default" Revert "Clone and build upstream Qemu by default" Revert "Rename ioemu-dir as qemu-xen-traditional-dir" Revert "Move the ioemu-dir-find shell script to an external file" Signed-off-by: Ian Jackson --- scripts/git-checkout.sh | 47 ----------------------------------------------- 1 file changed, 47 deletions(-) delete mode 100755 scripts/git-checkout.sh (limited to 'scripts') diff --git a/scripts/git-checkout.sh b/scripts/git-checkout.sh deleted file mode 100755 index dd6c74efdd..0000000000 --- a/scripts/git-checkout.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh - -TREE=$1 -TAG=$2 -DIR=$3 - - -if test -d $TREE; then - mkdir -p $DIR - ROOT=$TREE -else - if test \! -d $DIR-remote; then - rm -rf $DIR-remote $DIR-remote.tmp; - mkdir $DIR-remote.tmp; rmdir $DIR-remote.tmp; - git clone $TREE $DIR-remote.tmp; - if test "$TAG" ; then - cd $DIR-remote.tmp - git branch -D dummy >/dev/null 2>&1 ||: - git checkout -b dummy $TAG - cd .. - fi - mv $DIR-remote.tmp $DIR-remote - fi - rm -f $DIR - ln -sf $DIR-remote $DIR - ROOT=. -fi - -set -e -cd $DIR -# is this qemu-xen-traditional? -if test -f $ROOT/xen-setup; then - QEMU_ROOT=$ROOT $ROOT/xen-setup $IOEMU_CONFIGURE_CROSS -# is this qemu-xen? -elif test -f $ROOT/configure; then - cd $ROOT - ./configure --enable-xen --target-list=i386-softmmu \ - --extra-cflags="-I$XEN_ROOT/tools/include \ - -I$XEN_ROOT/tools/libxc \ - -I$XEN_ROOT/tools/xenstore" \ - --extra-ldflags="-L$XEN_ROOT/tools/libxc \ - -L$XEN_ROOT/tools/libxenstore" \ - --bindir=/usr/lib/xen/bin \ - --disable-kvm \ - $IOEMU_CONFIGURE_CROSS -fi - -- cgit v1.2.3