Improve dependency installation

Simplify libvirt's configure. Install Xen on the system before
proceeding.

diff --git a/build.sh b/build.sh
index 26240f07ce8a12057723c9968bbc1e7abf9322fb..888b28d341026384b40a77b0b4c215dba4e29c97 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -123,6 +123,12 @@ then
     xen_clean
     xen_build
 fi
+
+# need xen installed in order to build the rest
+if test "$GRUB_UPSTREAM_REVISION" || test "$LIBVIRT_UPSTREAM_REVISION"
+then
+    xen_install
+fi
 if test "$GRUB_UPSTREAM_REVISION"
 then
     grub_clean

diff --git a/libvirt.sh b/libvirt.sh
index 9f8a676f3b4379de2ad7beb7a27986bda07add08..e290f1ccb358d40d5d789013413e9575f97fffd4 100644 (file)
--- a/libvirt.sh
+++ b/libvirt.sh
@@ -14,7 +14,8 @@ function libvirt_build() {
         $SUDO apt-get install -y git build-essential libtool autoconf \
                                  autopoint xsltproc libxml2-utils     \
                                  pkg-config python-dev libxml-xpath-perl \
-                                 libyajl-dev libxml2-dev
+                                 libyajl-dev libxml2-dev gettext \
+                                 libdevmapper-dev
         ;;
         * )
         echo "I don't know how to install libvirt dependencies on $DISTRO"
@@ -24,14 +25,12 @@ function libvirt_build() {
 
     ./git-checkout.sh $LIBVIRT_UPSTREAM_URL $LIBVIRT_UPSTREAM_REVISION libvirt-dir
     cd libvirt-dir
-    ./autogen.sh --disable-threads --with-xen --without-qemu --without-uml     \
-        --without-outopenvz --without-vmware --without-libssh2 --without-phyp  \
-        --without-xenapi --with-libxl --without-vbox --without-lxc             \
-        --without-esx --without-hyperv --without-parallels --without-test      \
-        --without-remote --with-libvirtd --without-sasl --with-yajl            \
-        --without-dbus --without-selinux --without-python --without-apparmor   \
-        --without-macvtap --without-avahi --without-openvz --without-dbus      \
-        --prefix=$PREFIX
+    ./autogen.sh
+    ./configure --with-xen --without-qemu --without-uml --without-openvz  \
+        --without-vmware --without-phyp --without-xenapi --with-libxl     \
+        --without-vbox --without-lxc --without-esx --without-hyperv       \
+        --without-parallels --without-test --with-libvirtd --without-sasl \
+        --with-yajl --without-macvtap --without-avahi  --prefix=$PREFIX
     $MAKE
     $MAKE --ignore-errors install DESTDIR=$INST_DIR
     cd ..

diff --git a/xen.sh b/xen.sh
index 54cd9aa73e4cefd8ed7d7dadcb3186f68475c4e2..2dc2bf20612a6b1d5dccae9188c477037b6f6930 100644 (file)
--- a/xen.sh
+++ b/xen.sh
@@ -14,7 +14,7 @@ function xen_build() {
           uuid-dev libncurses5-dev libyajl-dev libaio-dev
         if test $ARCH = "x86_32" || test $ARCH = "x86_64"
         then
-                $SUDO apt-get install -y bcc iasl bin86 libglib2.0-0 \
+                $SUDO apt-get install -y bcc iasl bin86 libglib2.0-dev \
                   libpixman-1-dev
         fi
         if test $ARCH = "x86_64"
@@ -35,3 +35,8 @@ function xen_build() {
     $MAKE install DESTDIR="$INST_DIR"
     cd ..
 }
+
+function xen_install() {
+    cd xen-dir
+    $MAKE install
+}