[PATCH 0/2] raisin: build qemu-traditional and seabios

[PATCH 0/2] raisin: build qemu-traditional and seabios

[Stefano Stabellini]

Hi all,

This patch series builds qemu-traditional and seabios separately from the
Xen tree. It also change the QEMU build to be more Xen specific,
installing the QEMU binary under /usr/lib/xen/bin.


Changes compared to the previous version of the qemu-traditional patch:
- --enable-rombios (otherwise automatically disabled by
  --disable-qemu-traditional)
- suppress unhelpful echo in configure and unconfigure



Stefano Stabellini (2):
      raisin: add a component to build qemu_traditional
      raisin: introduce seabios component

 components/qemu_traditional |   49 +++++++++++++++++++++++++++++++++++++
 components/seabios          |   57 +++++++++++++++++++++++++++++++++++++++++++
 components/series           |    2 ++
 components/xen              |    4 ++-
 defconfig                   |    4 +++
 5 files changed, 115 insertions(+), 1 deletion(-)
 create mode 100644 components/qemu_traditional
 create mode 100644 components/seabios



Cheers,

Stefano

[PATCH v2 1/2] raisin: add a component to build qemu_traditional

[Stefano Stabellini]

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>
---
 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..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 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 f8959be..d150efb 100644
--- a/components/xen
+++ b/components/xen
@@ -23,7 +23,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 23c76eb..d45e2df 100644
--- a/defconfig
+++ b/defconfig
@@ -15,6 +15,7 @@ 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"
 
@@ -23,5 +24,6 @@ LIBVIRT_URL="git://libvirt.org/libvirt.git"
 # Grub and Libvirt needs Xen to build and run.
 XEN_REVISION="master"
 QEMU_REVISION="master"
+QEMU_TRADITIONAL_REVISION="master"
 GRUB_REVISION="master"
 LIBVIRT_REVISION="master"
-- 
1.7.10.4

[PATCH 2/2] raisin: introduce seabios component

[Stefano Stabellini]

Build SeaBIOS as a separate component.
Pass --with-system-seabios to the xen configure script.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
 components/seabios |   57 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 components/series  |    1 +
 components/xen     |    3 ++-
 defconfig          |    2 ++
 4 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 components/seabios

diff --git a/components/seabios b/components/seabios
new file mode 100644
index 0000000..960a538
--- /dev/null
+++ b/components/seabios
@@ -0,0 +1,57 @@
+#!/usr/bin/env bash
+
+function seabios_check_package() {
+    local DEP_Debian_common="build-essential iasl"
+    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 acpica-tools"
+    local DEP_Fedora_x86_32="$DEP_Fedora_common"
+    local DEP_Fedora_x86_64="$DEP_Fedora_common"
+
+
+    if [[ $ARCH != "x86_64" && $ARCH != "x86_32" ]]
+    then
+        echo seabios is only supported on x86_32 and x86_64
+        return
+    fi
+    echo Checking SeaBIOS dependencies
+    eval check-package \$DEP_"$DISTRO"_"$ARCH"
+}
+
+
+function seabios_build() {
+    if [[ $ARCH != "x86_64" && $ARCH != "x86_32" ]]
+    then
+        echo seabios is only supported on x86_32 and x86_64
+        return
+    fi
+
+    cd "$BASEDIR"
+    git-checkout $SEABIOS_URL $SEABIOS_REVISION seabios-dir
+    cd seabios-dir
+    $RAISIN_MAKE defconfig
+    $RAISIN_MAKE
+    cd "$BASEDIR"
+}
+
+function seabios_clean() {
+    cd "$BASEDIR"
+    if [[ -d seabios-dir ]]
+    then
+        cd seabios-dir
+        $RAISIN_MAKE distclean
+        cd ..
+        rm -rf seabios-dir
+    fi
+}
+
+function seabios_configure() {
+    :
+}
+
+function seabios_unconfigure() {
+    :
+}
diff --git a/components/series b/components/series
index d21243a..f0f3cfa 100644
--- a/components/series
+++ b/components/series
@@ -1,3 +1,4 @@
+seabios
 xen
 qemu
 qemu_traditional
diff --git a/components/xen b/components/xen
index d150efb..f64afe6 100644
--- a/components/xen
+++ b/components/xen
@@ -24,7 +24,8 @@ function xen_build() {
     git-checkout $XEN_URL $XEN_REVISION xen-dir
     cd xen-dir
     ./configure --prefix=$PREFIX --with-system-qemu=$PREFIX/lib/xen/bin/qemu-system-i386 \
-        --disable-qemu-traditional --enable-rombios
+        --disable-qemu-traditional --enable-rombios \
+        --with-system-seabios="$BASEDIR"/seabios-dir/out/bios.bin
     $RAISIN_MAKE
     $RAISIN_MAKE install DESTDIR="$INST_DIR"
     cd "$BASEDIR"
diff --git a/defconfig b/defconfig
index d45e2df..b1a0590 100644
--- a/defconfig
+++ b/defconfig
@@ -16,6 +16,7 @@ DESTDIR=dist
 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"
+SEABIOS_URL="git://xenbits.xen.org/seabios.git"
 GRUB_URL="git://git.savannah.gnu.org/grub.git"
 LIBVIRT_URL="git://libvirt.org/libvirt.git"
 
@@ -25,5 +26,6 @@ LIBVIRT_URL="git://libvirt.org/libvirt.git"
 XEN_REVISION="master"
 QEMU_REVISION="master"
 QEMU_TRADITIONAL_REVISION="master"
+SEABIOS_REVISION="master"
 GRUB_REVISION="master"
 LIBVIRT_REVISION="master"
-- 
1.7.10.4

Re: [PATCH 0/2] raisin: build qemu-traditional and seabios

[George Dunlap]

On 04/17/2015 02:08 PM, Stefano Stabellini wrote:
> Hi all,
> 
> This patch series builds qemu-traditional and seabios separately from the
> Xen tree. It also change the QEMU build to be more Xen specific,
> installing the QEMU binary under /usr/lib/xen/bin.
> 
> 
> Changes compared to the previous version of the qemu-traditional patch:
> - --enable-rombios (otherwise automatically disabled by
>   --disable-qemu-traditional)
> - suppress unhelpful echo in configure and unconfigure
> 
> 
> 
> Stefano Stabellini (2):
>       raisin: add a component to build qemu_traditional
>       raisin: introduce seabios component

I've looked them over; I don't have any strong opinions, but FWIW:

Acked-by: George Dunlap <george.dunlap@eu.citrix.com>

Re: [PATCH 0/2] raisin: build qemu-traditional and seabios

[Stefano Stabellini]

On Mon, 20 Apr 2015, George Dunlap wrote:
> On 04/17/2015 02:08 PM, Stefano Stabellini wrote:
> > Hi all,
> > 
> > This patch series builds qemu-traditional and seabios separately from the
> > Xen tree. It also change the QEMU build to be more Xen specific,
> > installing the QEMU binary under /usr/lib/xen/bin.
> > 
> > 
> > Changes compared to the previous version of the qemu-traditional patch:
> > - --enable-rombios (otherwise automatically disabled by
> >   --disable-qemu-traditional)
> > - suppress unhelpful echo in configure and unconfigure
> > 
> > 
> > 
> > Stefano Stabellini (2):
> >       raisin: add a component to build qemu_traditional
> >       raisin: introduce seabios component
> 
> I've looked them over; I don't have any strong opinions, but FWIW:
> 
> Acked-by: George Dunlap <george.dunlap@eu.citrix.com>

Thank you, I committed them.