raisin: add a component to build qemu_traditional

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@eu.citrix.com>
Acked-by: George Dunlap <george.dunlap@eu.citrix.com>

diff --git a/components/qemu_traditional b/components/qemu_traditional
new file mode 100644 (file)
index 0000000..500cbed
--- /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_URL $QEMU_TRADITIONAL_REVISION qemu_traditional-dir
+    cd qemu_traditional-dir
+
+    export CONFIG_BLKTAP1=n
+    export XEN_ROOT="$BASEDIR"/xen-dir
+    ./xen-setup
+    $RAISIN_MAKE all
+    $RAISIN_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() {
+    :
+}
+
+function qemu_traditional_unconfigure() {
+    :
+}

diff --git a/components/series b/components/series
index 8f614f00939cf9ae76efc213f9ab62223740d09f..d21243ac52204ebeab98edea6c42b1a31c36edaf 100644 (file)
--- 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 1721ebc50ce13061ce112f69f3d17076857e5e2b..9f13a4594cff30767a7efdb770a9d1df26616919 100644 (file)
--- a/components/xen
+++ b/components/xen
@@ -27,7 +27,8 @@ function xen_build() {
     cd "$BASEDIR"
     git-checkout $XEN_URL $XEN_REVISION xen-dir
     cd xen-dir
-    ./configure --prefix=$PREFIX --with-system-qemu=$PREFIX/lib/xen/bin/qemu-system-i386
+    ./configure --prefix=$PREFIX --with-system-qemu=$PREFIX/lib/xen/bin/qemu-system-i386 \
+        --disable-qemu-traditional --enable-rombios
     $RAISIN_MAKE
     $RAISIN_MAKE install DESTDIR="$INST_DIR"
     cd "$BASEDIR"

diff --git a/defconfig b/defconfig
index 1aa4319d58b7434fc918c633ef884289a22c186b..d3880cd6af25a014e0d175eee719a76c7309b3d7 100644 (file)
--- a/defconfig
+++ b/defconfig
@@ -1,12 +1,12 @@
 # Config variables for raisin
 
 # Components
-## All components: xen qemu grub libvirt
+## All components: xen qemu qemu_traditional grub libvirt
 ## Core xen functionality: xen
 ## Remove a component from the list below, if you want to disable it
 ## You can manually overwrite this list using the COMPONENTS
 ## environmental variable.
-ENABLED_COMPONENTS="xen qemu grub libvirt"
+ENABLED_COMPONENTS="xen qemu qemu_traditional grub libvirt"
 
 # Build config
 ## Make command to run
@@ -23,11 +23,13 @@ DESTDIR=dist
 #LIBVIRT_URL="https://gitorious.org/libvirt/libvirt.git"
 XEN_URL="git://xenbits.xen.org/xen.git"
 QEMU_URL="git://git.qemu.org/qemu.git"
+QEMU_TRADITIONAL_URL="git://xenbits.xen.org/qemu-xen-unstable.git"
 GRUB_URL="git://git.savannah.gnu.org/grub.git"
 LIBVIRT_URL="git://libvirt.org/libvirt.git"
 
 # Software versions.
 XEN_REVISION="master"
 QEMU_REVISION="master"
+QEMU_TRADITIONAL_REVISION="master"
 GRUB_REVISION="master"
 LIBVIRT_REVISION="master"