]> git.openfabrics.org - ~vlad/ofed_scripts.git/commitdiff
ofed_1_4_scripts: Fix ppc64 building of rnfs-utils for SLES vofed-1.4.1-rc3
authorJon Mason <jon@opengridcomputing.com>
Wed, 1 Apr 2009 16:07:41 +0000 (11:07 -0500)
committerVladimir Sokolovsky <vlad@mellanox.co.il>
Thu, 2 Apr 2009 15:55:05 +0000 (18:55 +0300)
There are different package names for certain rnfs-utils build
dependencies on RHEL and SuSE.  The rnfs-utils SRPM dependencies has
been removed in favor of having the install.pl detect the dependencies,
thus allowing the SRPM to be more generic and build for all distros.

Signed-Off-By: Jon Mason <jon@opengridcomputing.com>
install.pl

index 99de9d375deb03d78f2c2d669399fb096ae4f55a..c5d08d738f8b366edaf9f960fbbf63c393d73da6 100755 (executable)
@@ -261,12 +261,10 @@ my $e2fsprogs_devel;
 if ($distro eq "SuSE" or $distro eq "redhat" or $distro eq "fedora" or $distro eq "Rocks") {
     $sysfsutils = "sysfsutils";
     $sysfsutils_devel = "sysfsutils-devel";
-    $e2fsprogs_devel = "e2fsprogs-devel";
 }
 else {
     $sysfsutils = "libsysfs";
     $sysfsutils_devel = "libsysfs-devel";
-    $e2fsprogs_devel = "libe2fsprogs-devel";
 }
 
 my $network_dir;
@@ -2638,11 +2636,30 @@ sub check_linux_dependencies
                     }
                 }
             }
-            if ($arch eq "ppc64" and $package eq "rnfs-utils") {
-               if (not -e "/usr/lib/libblkid.so") {
-                    print RED "$e2fsprogs_devel 32bit is required to build rnfs-utils.", RESET "\n";
+            if ($package eq "rnfs-utils") {
+                if ($distro eq "redhat" or $distro eq "fedora" or $distro eq 'redhat5') {
+                    if (not is_installed("krb5-libs")) {
+                        print RED "krb5-libs is required to build rnfs-utils.", RESET "\n";
+                        $err++;
+                    }
+                    if (not is_installed("krb5-devel")) {
+                        print RED "krb5-devel is required to build rnfs-utils.", RESET "\n";
+                        $err++;
+                    }
+                } else {
+                    if (not is_installed("krb5")) {
+                        print RED "krb5 is required to build rnfs-utils.", RESET "\n";
+                        $err++;
+                    }
+                    if ($arch eq "ppc64" and not is_installed("tcp-devel")) {
+                        print RED "tcp-devel is required to build rnfs-utils.", RESET "\n";
+                        $err++;
+                    }
+                }
+                if ($arch eq "ppc64" and not -e "/usr/lib/libblkid.so") {
+                    print RED "e2fsprogs-devel 32bit is required to build rnfs-utils.", RESET "\n";
                     $err++;
-               }
+                }
             }
         }