install.pl: Added RHEL8 support

Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>

diff --git a/install.pl b/install.pl
index 536a0c99925033740637768d4f0187848ff54a7a..d33b46e258a2ae3174516686aafcc1ccee31c9b4 100755 (executable)
--- a/install.pl
+++ b/install.pl
@@ -250,6 +250,12 @@ if ($dist_rpm =~ /sles-release-12\.4|SLES.*release-12\.4/) {
 } elsif ($dist_rpm =~ /redhat-release-.*-7.6|sl-release-7.6|centos-release-7.6/) {
     $DISTRO = "RHEL7.6";
     $rpm_distro = "rhel7.6";
+} elsif ($dist_rpm =~ /redhat-release-8\.0-/) {
+    $DISTRO = "RHEL8.0";
+    $rpm_distro = "rhel8u0";
+} elsif ($dist_rpm =~ /redhat-release-8\.1-/) {
+    $DISTRO = "RHEL8.1";
+    $rpm_distro = "rhel8u1";
 } elsif ($dist_rpm =~ /Ubuntu/) {
     $DISTRO = "UBUNTU$dist_rpm_ver";
     $rpm_distro =~ tr/[A-Z]/[a-z]/;
@@ -354,7 +360,7 @@ my $libudev = "libudev";
 my $libudev_devel = "libudev-devel";
 if ($DISTRO =~ m/SLES12|SLES15/) {
     $libudev = "libudev1";
-} elsif ($DISTRO =~ m/RHEL7|OL7|FC|EULEROS|POWERKVM/) {
+} elsif ($DISTRO =~ m/RHEL[78]|OL7|FC|EULEROS|POWERKVM/) {
     $libudev = "systemd-libs";
     $libudev_devel = "systemd-devel";
 }
@@ -409,7 +415,7 @@ if ($DISTRO =~ m/SLES11/) {
     $libgfortran = 'gcc-gfortran';
     if ($DISTRO =~ m/RHEL6|OEL6|FC/) {
         $curl_devel = 'libcurl-devel';
-    } elsif ($DISTRO =~ m/RHEL7/) {
+    } elsif ($DISTRO =~ m/RHEL[78]/) {
         $curl_devel = 'libcurl-devel';
         $libudev_devel = 'systemd-devel';
     }
@@ -436,7 +442,7 @@ my $python = "python";
 if ($DISTRO =~ m/RHEL8/) {
     $python = "python36";
     $python_devel = "python36-devel";
-    $python_cython = "python3-Cython";
+    $python_cython = "python2-Cython";
     $pkgconfig = "pkgconf-pkg-config";
     $libnl_devel = 'libnl3-devel';
     $libnl = 'libnl3';

diff --git a/ofed-scripts.spec b/ofed-scripts.spec
index 6143cecd098868012eb694a69ccd947c14ecb10e..ff1201dea424ce23beaa69512f3e8553dfd3e496 100644 (file)
--- a/ofed-scripts.spec
+++ b/ofed-scripts.spec
@@ -28,9 +28,13 @@
 #  $Id: ofed-scripts.spec 8402 2006-07-06 06:35:57Z vlad $
 #
 
+%global CUSTOM_PREFIX %(if ( echo %{_prefix} | grep -E "^/usr$|^/usr/$" > /dev/null ); then echo -n '0'; else echo -n '1'; fi)
+
+%global debug_package %{nil}
+
 Summary: OFED scripts
 Name: ofed-scripts
-Version: 1.4
+Version: 5.3
 Release: 0
 License: GPL/BSD
 Url: http://www.openfabrics.org
@@ -55,12 +59,11 @@ install -m 0755 ofed_info $RPM_BUILD_ROOT%{_prefix}/bin
 
 perl -ni -e "s@(STACK_PREFIX=).*@\$1%{_prefix}@; print" $RPM_BUILD_ROOT%{_prefix}/sbin/ofed_uninstall.sh
 
+%if "%{CUSTOM_PREFIX}" == "1"
 touch ofed-files
+%endif
 
-case %{_prefix} in
-       /usr | /usr/)
-       ;;
-       *)
+%if "%{CUSTOM_PREFIX}" == "1"
 install -d $RPM_BUILD_ROOT/etc/profile.d
 cat > $RPM_BUILD_ROOT/etc/profile.d/ofed.sh << EOF
 if ! echo \${PATH} | grep -q %{_prefix}/bin ; then
@@ -95,14 +98,14 @@ EOF
 
 install -d $RPM_BUILD_ROOT/etc/ld.so.conf.d
 echo %{_libdir} > $RPM_BUILD_ROOT/etc/ld.so.conf.d/ofed.conf
-    %ifarch x86_64 ppc64
-    echo "%{_prefix}/lib" >> $RPM_BUILD_ROOT/etc/ld.so.conf.d/ofed.conf
-    %endif
-       echo "/etc/profile.d/ofed.sh" >> ofed-files
-       echo "/etc/profile.d/ofed.csh" >> ofed-files
-       echo "/etc/ld.so.conf.d/ofed.conf" >> ofed-files
-       ;;
-esac
+%ifarch x86_64 ppc64
+echo "%{_prefix}/lib" >> $RPM_BUILD_ROOT/etc/ld.so.conf.d/ofed.conf
+%endif
+echo "/etc/profile.d/ofed.sh" >> ofed-files
+echo "/etc/profile.d/ofed.csh" >> ofed-files
+echo "/etc/ld.so.conf.d/ofed.conf" >> ofed-files
+
+%endif
 
 %post
 /sbin/ldconfig
@@ -113,7 +116,11 @@ esac
 %clean
 [ "${RPM_BUILD_ROOT}" != "/" -a -d ${RPM_BUILD_ROOT} ] && rm -rf $RPM_BUILD_ROOT
 
+%if "%{CUSTOM_PREFIX}" == "1"
 %files -f ofed-files
+%else
+%files
+%endif
 %defattr(-,root,root)
 %{_prefix}/bin/ofed_info
 %{_prefix}/sbin/ofed_uninstall.sh
@@ -121,6 +128,8 @@ esac
 %{_prefix}/sbin/vendor_post_uninstall.sh
 
 %changelog
+* Thu Sep  5 2019 Vladimir Sokolovsky <vlad@mellanox.com>
+- Updated to support RHEL8
 * Tue Oct  9 2007 Vladimir Sokolovsky <vlad@mellanox.co.il>
 - Added ofed.[c]sh and ofed.conf if prefix is not /usr
 * Tue Aug 21 2007 Vladimir Sokolovsky <vlad@mellanox.co.il>