[Xen-devel] [PATCH 4/9] raisin: add a component to build qemu_traditional

[Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>]

Introduce a component to build qemu-traditional out of xen-unstable.
Do not compile qemu-traditional from xen-unstable by passing the right
command line option to configure.

Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
---
 components/qemu_traditional |   49 +++++++++++++++++++++++++++++++++++++++++++
 components/series           |    1 +
 components/xen              |    3 ++-
 defconfig                   |    2 ++
 4 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 components/qemu_traditional

diff --git a/components/qemu_traditional b/components/qemu_traditional
new file mode 100644
index 0000000..cb71c94
--- /dev/null
+++ b/components/qemu_traditional
@@ -0,0 +1,49 @@
+#!/usr/bin/env bash
+
+function qemu_traditional_check_package() {
+    local DEP_Debian_common="build-essential zlib1g-dev pciutils-dev 
pkg-config \
+              libncurses5-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 zlib-devel ncurses-devel pciutils-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_traditional_build() {
+    cd "$BASEDIR"
+    git-checkout $QEMU_TRADITIONAL_UPSTREAM_URL 
$QEMU_TRADITIONAL_UPSTREAM_REVISION qemu_traditional-dir
+    cd qemu_traditional-dir
+
+    export CONFIG_BLKTAP1=n
+    export XEN_ROOT="$BASEDIR"/xen-dir
+    ./xen-setup
+    $MAKE all
+    $MAKE install DESTDIR="$INST_DIR"
+    cd "$BASEDIR"
+}
+
+function qemu_traditional_clean() {
+    cd "$BASEDIR"
+    if [[ -d qemu_traditional-dir ]]
+    then
+        cd qemu_traditional-dir
+        $MAKE distclean
+        cd ..
+        rm -rf qemu_traditional-dir
+    fi
+}
+
+function qemu_traditional_configure() {
+    echo Nothing to configure for qemu_traditional
+}
+
+function qemu_traditional_unconfigure() {
+    echo Nothing to unconfigure for qemu_traditional
+}
diff --git a/components/series b/components/series
index 8f614f0..d21243a 100644
--- a/components/series
+++ b/components/series
@@ -1,4 +1,5 @@
 xen
 qemu
+qemu_traditional
 grub
 libvirt
diff --git a/components/xen b/components/xen
index dcf2f92..9fdf37f 100644
--- a/components/xen
+++ b/components/xen
@@ -23,7 +23,8 @@ function xen_build() {
     cd "$BASEDIR"
     git-checkout $XEN_UPSTREAM_URL $XEN_UPSTREAM_REVISION xen-dir
     cd xen-dir
-    ./configure --prefix=$PREFIX --with-system-qemu=/usr/bin/qemu-system-i386
+    ./configure --prefix=$PREFIX --with-system-qemu=/usr/bin/qemu-system-i386 \
+        --disable-qemu-traditional
     $MAKE
     $MAKE install DESTDIR="$INST_DIR"
     chmod +x "$INST_DIR"/etc/init.d/xencommons
diff --git a/defconfig b/defconfig
index b409fea..5fd4e54 100644
--- a/defconfig
+++ b/defconfig
@@ -15,6 +15,7 @@ DESTDIR=dist
 #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"
+QEMU_TRADITIONAL_UPSTREAM_URL="git://xenbits.xen.org/qemu-xen-unstable.git"
 GRUB_UPSTREAM_URL="git://git.savannah.gnu.org/grub.git"
 LIBVIRT_UPSTREAM_URL="git://libvirt.org/libvirt.git"
 
@@ -23,5 +24,6 @@ LIBVIRT_UPSTREAM_URL="git://libvirt.org/libvirt.git"
 # Grub and Libvirt needs Xen to build and run.
 XEN_UPSTREAM_REVISION="master"
 QEMU_UPSTREAM_REVISION="master"
+QEMU_TRADITIONAL_UPSTREAM_REVISION="master"
 GRUB_UPSTREAM_REVISION="master"
 LIBVIRT_UPSTREAM_REVISION="master"
-- 
1.7.10.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel