[Xen-devel] [PATCH 5/8] raisin: Fix CentOS build

[George Dunlap <george.dunlap@xxxxxxxxxxxxx>]

Add package dependencies for CentOS.  Also use PKGTYPE rather than
DISTRO to determine if we need rpm-build.

I've tested this for xen but not for libvirt or grub.

Signed-off-by: George Dunlap <george.dunlap@xxxxxxxxxxxxx>
---
CC: Stefano Stabellini <stefano.stabellini@xxxxxxxxxx>
---
 components/grub    |  5 +++++
 components/libvirt |  7 +++++++
 components/xen     | 10 ++++++++--
 lib/commands.sh    |  2 +-
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/components/grub b/components/grub
index 563a28c..af396d9 100644
--- a/components/grub
+++ b/components/grub
@@ -12,6 +12,11 @@ function grub_check_package() {
     local DEP_Fedora_x86_32="$DEP_Fedora_common"
     local DEP_Fedora_x86_64="$DEP_Fedora_common glibc-devel.i686"
 
+    local DEP_CentOS_common="make gcc tar automake autoconf sysconftool bison 
flex \
+                             glibc-devel"
+    local DEP_CentOS_x86_32="$DEP_CentOS_common"
+    local DEP_CentOS_x86_64="$DEP_CentOS_common glibc-devel.i686"
+
 
     if [[ $ARCH != "x86_64" && $ARCH != "x86_32" ]]
     then
diff --git a/components/libvirt b/components/libvirt
index 5853950..aef1bc8 100644
--- a/components/libvirt
+++ b/components/libvirt
@@ -18,6 +18,13 @@ function libvirt_check_package() {
     local DEP_Fedora_x86_32="$DEP_Fedora_common"
     local DEP_Fedora_x86_64="$DEP_Fedora_common"
 
+    local DEP_CentOS_common="patch make gcc libtool autoconf gettext-devel     
\
+                             python-devel libxslt yajl-devel libxml2-devel     
\
+                             device-mapper-devel libpciaccess-devel            
\
+                             libuuid-devel perl-XML-XPath"
+    local DEP_CentOS_x86_32="$DEP_CentOS_common"
+    local DEP_CentOS_x86_64="$DEP_CentOS_common"
+
     echo Checking Libvirt dependencies
     eval check-package \$DEP_"$DISTRO"_"$ARCH"
 }
diff --git a/components/xen b/components/xen
index a0c0034..f2e1254 100644
--- a/components/xen
+++ b/components/xen
@@ -11,10 +11,16 @@ function xen_check_package() {
 
     local DEP_Fedora_common="make gcc python-devel gettext libuuid-devel   \
              ncurses-devel glib2-devel libaio-devel openssl-devel yajl-devel   
\
-             patch pixman-devel glibc-devel bridge-utils grub2 wget"
-    local DEP_Fedora_x86_32="$DEP_Fedora_common dev86 acpica-tools texinfo"
+             patch pixman-devel glibc-devel bridge-utils grub2 wget tar bzip2"
+    local DEP_Fedora_x86_32="$DEP_Fedora_common dev86 texinfo acpica-devel"
     local DEP_Fedora_x86_64="$DEP_Fedora_x86_32 glibc-devel.i686"
 
+    local DEP_CentOS_common="make gcc python-devel gettext libuuid-devel   \
+             ncurses-devel glib2-devel libaio-devel openssl-devel yajl-devel   
\
+             patch pixman-devel glibc-devel bridge-utils wget tar bzip2"
+    local DEP_CentOS_x86_32="$DEP_CentOS_common dev86 texinfo iasl"
+    local DEP_CentOS_x86_64="$DEP_CentOS_x86_32 glibc-devel.i686"
+
     echo Checking Xen dependencies
     eval check-package \$DEP_"$DISTRO"_"$ARCH"
 }
diff --git a/lib/commands.sh b/lib/commands.sh
index c47ba1f..17e2129 100755
--- a/lib/commands.sh
+++ b/lib/commands.sh
@@ -5,7 +5,7 @@ function check-builddep() {
 
     check-package git
 
-    if [[ $DISTRO = "Fedora" ]]
+    if [[ $PKGTYPE = "rpm" ]]
     then
         check-package rpm-build
     fi
-- 
1.9.1


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel