From 56a764ff644ec03c84c6a53d3d5839f2ed701c76 Mon Sep 17 00:00:00 2001
From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Date: Wed, 18 Mar 2015 18:36:02 +0000
Subject: [PATCH] Fedora fixes

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
 build.sh            | 6 +++---
 common-functions.sh | 1 +
 grub.sh             | 9 +++++----
 libvirt.sh          | 4 ++--
 xen.sh              | 2 +-
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/build.sh b/build.sh
index 1dc50c1..0e5239c 100755
--- a/build.sh
+++ b/build.sh
@@ -37,9 +37,9 @@ then
 fi
 
 # parameters check
+INST=0
 export NO_DEPS=0
 export VERBOSE=0
-export INSTALL=0
 while test $# -ge 1
 do
   if test "$1" = "-n" || test "$1" = "--no-deps"
@@ -52,7 +52,7 @@ do
     shift 1
   elif test "$1" = "-i" || test "$1" = "--install"
   then
-    INSTALL=1
+    INST=1
     shift 1
   else
     help
@@ -84,7 +84,7 @@ then
 fi
 
 
-if test -z "$INSTALL" || test "$INSTALL" -eq 0
+if test -z "$INST" || test "$INST" -eq 0
 then
     exit 0
 fi
diff --git a/common-functions.sh b/common-functions.sh
index b57807c..0243f02 100644
--- a/common-functions.sh
+++ b/common-functions.sh
@@ -118,3 +118,4 @@ function start_initscripts() {
         ;;
     esac
 }
+
diff --git a/grub.sh b/grub.sh
index 953c929..0d17673 100644
--- a/grub.sh
+++ b/grub.sh
@@ -11,7 +11,8 @@ function grub_install_dependencies() {
     local DEP_Debian_arm32="$DEP_Debian_common"
     local DEP_Debian_arm64="$DEP_Debian_common"
 
-    local DEP_Fedora_common="make gcc tar automake autoconf sysconftool bison flex"
+    local DEP_Fedora_common="make gcc tar automake autoconf sysconftool bison flex \
+                             glibc-devel"
     local DEP_Fedora_x86_32="$DEP_Fedora_common"
     local DEP_Fedora_x86_64="$DEP_Fedora_common glibc-devel.i686"
 
@@ -32,11 +33,10 @@ function grub_build() {
     tar cf memdisk.tar grub.cfg
     ./git-checkout.sh $GRUB_UPSTREAM_URL $GRUB_UPSTREAM_REVISION grub-dir
     cd grub-dir
-    export CPPFLAGS="-I$INST_DIR/$PREFIX/include"
     ./autogen.sh
     ## GRUB32
     ./configure --target=i386 --with-platform=xen
-    $MAKE
+    $MAKE CPPFLAGS="-I$INST_DIR/$PREFIX/include"
     ./grub-mkimage -d grub-core -O i386-xen -c ../grub-bootstrap.cfg \
       -m ../memdisk.tar -o grub-i386-xen grub-core/*mod
     cp grub-i386-xen "$INST_DIR"/$PREFIX/lib/xen/boot
@@ -45,7 +45,7 @@ function grub_build() {
     then
         $MAKE clean
         ./configure --target=amd64 --with-platform=xen
-        $MAKE
+        $MAKE CPPFLAGS="-I$INST_DIR/$PREFIX/include"
         ./grub-mkimage -d grub-core -O x86_64-xen -c ../grub-bootstrap.cfg \
           -m ../memdisk.tar -o grub-x86_64-xen grub-core/*mod
         cp grub-x86_64-xen "$INST_DIR"/$PREFIX/lib/xen/boot
@@ -59,4 +59,5 @@ function grub_clean() {
 }
 
 function grub_configure() {
+    echo "Nothing to configure for Grub"
 }
diff --git a/libvirt.sh b/libvirt.sh
index c5291d1..83172c9 100644
--- a/libvirt.sh
+++ b/libvirt.sh
@@ -39,10 +39,10 @@ function libvirt_build() {
         --without-parallels --without-test --with-libvirtd --without-sasl \
         --with-yajl --without-macvtap --without-avahi  --prefix=$PREFIX
     $MAKE
-    $MAKE --ignore-errors install DESTDIR=$INST_DIR
+    $MAKE --ignore-errors install DESTDIR="$INST_DIR"
     if test $DISTRO = "Debian"
     then
-        cp libvirt.debian.init "$INST_DIR"/etc/init.d/libvirtd
+        cp ../libvirt.debian.init "$INST_DIR"/etc/init.d/libvirtd
         chmod +x "$INST_DIR"/etc/init.d/libvirtd
     elif test $DISTRO = "Fedora" || test $DISTRO = "CentOS"
     then
diff --git a/xen.sh b/xen.sh
index f30c057..c17e24e 100644
--- a/xen.sh
+++ b/xen.sh
@@ -15,7 +15,7 @@ function xen_install_dependencies() {
 
     local DEP_Fedora_common="make gcc python-devel gettext libuuid-devel   \
              ncurses-devel glib2-devel libaio-devel openssl-devel yajl-devel   \
-             patch pixman-devel"
+             patch pixman-devel glibc-devel"
     local DEP_Fedora_x86_32="$DEP_Fedora_common dev86 iasl texinfo"
     local DEP_Fedora_x86_64="$DEP_Fedora_x86_32 glibc-devel.i686"
 
-- 
2.39.5