raisin: Fix CentOS build

From: George Dunlap <george.dunlap@eu.citrix.com>

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@eu.citrix.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

diff --git a/components/grub b/components/grub
index 2058c70ea8345b534e8cd193c426e8f304675cda..7c14a626bf6e15ed2e303e2cfd818f76c144e329 100644 (file)
--- a/components/grub
+++ b/components/grub
@@ -12,6 +12,10 @@ 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="$DEP_Fedora_common"
+    local DEP_CentOS_x86_32="$DEP_Fedora_x86_32"
+    local DEP_CentOS_x86_64="$DEP_Fedora_x86_64"
+
 
     if [[ $ARCH != "x86_64" && $ARCH != "x86_32" ]]
     then

diff --git a/components/libvirt b/components/libvirt
index 58539506bef1cdad70149f8babee9f9200c31f5a..5fb1a416ee92a623ff9f08ad2ca29baf189ecb15 100644 (file)
--- a/components/libvirt
+++ b/components/libvirt
@@ -18,6 +18,10 @@ function libvirt_check_package() {
     local DEP_Fedora_x86_32="$DEP_Fedora_common"
     local DEP_Fedora_x86_64="$DEP_Fedora_common"
 
+    local DEP_CentOS_common="$DEP_Fedora_common"
+    local DEP_CentOS_x86_32="$DEP_Fedora_x86_32"
+    local DEP_CentOS_x86_64="$DEP_Fedora_x86_64"
+
     echo Checking Libvirt dependencies
     eval check-package \$DEP_"$DISTRO"_"$ARCH"
 }

diff --git a/components/xen b/components/xen
index f8959bed36762456f6c8cecd8818026e522de911..1721ebc50ce13061ce112f69f3d17076857e5e2b 100644 (file)
--- a/components/xen
+++ b/components/xen
@@ -11,10 +11,14 @@ 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"
+             patch pixman-devel glibc-devel bridge-utils grub2 wget tar bzip2"
     local DEP_Fedora_x86_32="$DEP_Fedora_common dev86 acpica-tools texinfo"
     local DEP_Fedora_x86_64="$DEP_Fedora_x86_32 glibc-devel.i686"
 
+    local DEP_CentOS_common="$DEP_Fedora_common"
+    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 bf580e54064dc74499226488bfffc851a7cea8ff..801341bff42f6193b90aaa37d0ab70c179c87f30 100755 (executable)
--- a/lib/commands.sh
+++ b/lib/commands.sh
@@ -5,10 +5,10 @@ function check-builddep() {
 
     check-package git
 
-    if [[ $DISTRO = "Fedora" ]]
+    if [[ $PKGTYPE = "rpm" ]]
     then
         check-package rpm-build
-    elif [[ $DISTRO = "Debian" ]]
+    elif [[ $PKGTYPE = "deb" ]]
     then
         check-package fakeroot
     fi