From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Stabellini Subject: [PATCH 3/9] raisin: add QEMU upstream component Date: Wed, 15 Apr 2015 16:14:54 +0100 Message-ID: <1429110900-8286-3-git-send-email-stefano.stabellini@eu.citrix.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xensource.com Cc: george.dunlap@eu.citrix.com, stefano.stabellini@eu.citrix.com List-Id: xen-devel@lists.xenproject.org Add a component to build upstream QEMU. Do not build upstream QEMU from xen-unstable. Signed-off-by: Stefano Stabellini --- components/qemu | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ components/series | 1 + components/xen | 2 +- defconfig | 2 ++ 4 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 components/qemu diff --git a/components/qemu b/components/qemu new file mode 100644 index 0000000..3633417 --- /dev/null +++ b/components/qemu @@ -0,0 +1,50 @@ +#!/usr/bin/env bash + +function qemu_check_package() { + local DEP_Debian_common="build-essential libglib2.0-dev libpixman-1-dev" + local DEP_Debian_x86_32="$DEP_Debian_common" + local DEP_Debian_x86_64="$DEP_Debian_common" + local DEP_Debian_arm32="$DEP_Debian_common" + local DEP_Debian_arm64="$DEP_Debian_common" + + local DEP_Fedora_common="make gcc glib2-devel pixman-devel zlib-devel" + local DEP_Fedora_x86_32="$DEP_Fedora_common" + local DEP_Fedora_x86_64="$DEP_Fedora_common" + + echo Checking QEMU dependencies + eval check-package \$DEP_"$DISTRO"_"$ARCH" +} + +function qemu_build() { + cd "$BASEDIR" + git-checkout $QEMU_UPSTREAM_URL $QEMU_UPSTREAM_REVISION qemu-dir + cd qemu-dir + ./configure --enable-xen --target-list=i386-softmmu,x86_64-softmmu --prefix=$PREFIX \ + --extra-cflags="-I$INST_DIR/$PREFIX/include" \ + --extra-ldflags="-L$INST_DIR/$PREFIX/lib -Wl,-rpath-link=$INST_DIR/$PREFIX/lib" \ + --disable-kvm \ + --disable-docs \ + --disable-guest-agent + $MAKE all + $MAKE install DESTDIR="$INST_DIR" + cd "$BASEDIR" +} + +function qemu_clean() { + cd "$BASEDIR" + if [[ -d qemu-dir ]] + then + cd qemu-dir + $MAKE distclean + cd .. + rm -rf qemu-dir + fi +} + +function qemu_configure() { + echo Nothing to configure for qemu +} + +function qemu_unconfigure() { + echo Nothing to unconfigure for qemu +} diff --git a/components/series b/components/series index 3c3124d..8f614f0 100644 --- a/components/series +++ b/components/series @@ -1,3 +1,4 @@ xen +qemu grub libvirt diff --git a/components/xen b/components/xen index 2d345a8..dcf2f92 100644 --- a/components/xen +++ b/components/xen @@ -23,7 +23,7 @@ function xen_build() { cd "$BASEDIR" git-checkout $XEN_UPSTREAM_URL $XEN_UPSTREAM_REVISION xen-dir cd xen-dir - ./configure --prefix=$PREFIX + ./configure --prefix=$PREFIX --with-system-qemu=/usr/bin/qemu-system-i386 $MAKE $MAKE install DESTDIR="$INST_DIR" chmod +x "$INST_DIR"/etc/init.d/xencommons diff --git a/defconfig b/defconfig index 2b37acc..b409fea 100644 --- a/defconfig +++ b/defconfig @@ -14,6 +14,7 @@ DESTDIR=dist #GRUB_UPSTREAM_URL="http://git.savannah.gnu.org/r/grub.git" #LIBVIRT_UPSTREAM_URL="https://gitorious.org/libvirt/libvirt.git" XEN_UPSTREAM_URL="git://xenbits.xen.org/xen.git" +QEMU_UPSTREAM_URL="git://git.qemu.org/qemu.git" GRUB_UPSTREAM_URL="git://git.savannah.gnu.org/grub.git" LIBVIRT_UPSTREAM_URL="git://libvirt.org/libvirt.git" @@ -21,5 +22,6 @@ LIBVIRT_UPSTREAM_URL="git://libvirt.org/libvirt.git" # this: GRUB_UPSTREAM_REVISION= # Grub and Libvirt needs Xen to build and run. XEN_UPSTREAM_REVISION="master" +QEMU_UPSTREAM_REVISION="master" GRUB_UPSTREAM_REVISION="master" LIBVIRT_UPSTREAM_REVISION="master" -- 1.7.10.4