raisin: build QEMU more specifically for Xen and install under /usr/lib/xen/bin

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

diff --git a/components/qemu b/components/qemu
index 85db58e1bf11154ed8acb41fa0bc942f48ae8609..6ba03c87d7f0d0437047263787a0631364bcc883 100644 (file)
--- a/components/qemu
+++ b/components/qemu
@@ -19,12 +19,14 @@ function qemu_build() {
     cd "$BASEDIR"
     git-checkout $QEMU_URL $QEMU_REVISION qemu-dir
     cd qemu-dir
-    ./configure --enable-xen --target-list=i386-softmmu,x86_64-softmmu --prefix=$PREFIX \
+    ./configure --enable-xen --target-list=i386-softmmu --prefix=$PREFIX \
         --extra-cflags="-I$INST_DIR/$PREFIX/include" \
         --extra-ldflags="-L$INST_DIR/$PREFIX/lib -Wl,-rpath-link=$INST_DIR/$PREFIX/lib \
                          -L$INST_DIR/$PREFIX/lib64 -Wl,-rpath-link=$INST_DIR/$PREFIX/lib64" \
         --disable-kvm \
         --disable-docs \
+        --bindir=$PREFIX/lib/xen/bin \
+        --datadir=$PREFIX/share/qemu-xen \
         --disable-guest-agent
     $RAISIN_MAKE all
     $RAISIN_MAKE install DESTDIR="$INST_DIR"

diff --git a/components/xen b/components/xen
index a0c003480603b01d8a90fc2127877b58e790bdb1..f8959bed36762456f6c8cecd8818026e522de911 100644 (file)
--- a/components/xen
+++ b/components/xen
@@ -23,7 +23,7 @@ function xen_build() {
     cd "$BASEDIR"
     git-checkout $XEN_URL $XEN_REVISION xen-dir
     cd xen-dir
-    ./configure --prefix=$PREFIX --with-system-qemu=/usr/bin/qemu-system-i386
+    ./configure --prefix=$PREFIX --with-system-qemu=$PREFIX/lib/xen/bin/qemu-system-i386
     $RAISIN_MAKE
     $RAISIN_MAKE install DESTDIR="$INST_DIR"
     cd "$BASEDIR"