raisin: add QEMU upstream component

Add a component to build upstream QEMU.
Do not build upstream QEMU from xen-unstable.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: George Dunlap <george.dunlap@eu.citrix.com>

diff --git a/components/qemu b/components/qemu
new file mode 100644 (file)
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 3c3124d8ff29d50c91458d7e0174bc35ec6e8d28..8f614f00939cf9ae76efc213f9ab62223740d09f 100644 (file)
--- a/components/series
+++ b/components/series
@@ -1,3 +1,4 @@
 xen
+qemu
 grub
 libvirt

diff --git a/components/xen b/components/xen
index 2d345a89c5bf6f7107e27bf7e0ba03011ec3b26f..dcf2f928b9b0d060896a3de7ecea5c99c501240a 100644 (file)
--- 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 2b37acc320331e93f55ab3ff9cc729fb72045857..b409fea4e3f3cf7c2effc4189085079c9a8a6a2a 100644 (file)
--- 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"