From fef159af455186185de71a60b776589693a98d0d Mon Sep 17 00:00:00 2001 From: Vladimir Sokolovsky Date: Wed, 10 Feb 2010 14:16:22 +0200 Subject: [PATCH] Remove tvflash support Signed-off-by: Vladimir Sokolovsky --- install.pl | 41 +---------------------------------------- uninstall.sh | 2 +- 2 files changed, 2 insertions(+), 41 deletions(-) diff --git a/install.pl b/install.pl index e078925..450c54b 100755 --- a/install.pl +++ b/install.pl @@ -372,7 +372,7 @@ my @user_packages = ("libibverbs", "libibverbs-devel", "libibverbs-devel-static" "opensm", "opensm-libs", "opensm-devel", "opensm-debuginfo", "opensm-static", "compat-dapl", "compat-dapl-devel", "dapl", "dapl-devel", "dapl-devel-static", "dapl-utils", "dapl-debuginfo", - "perftest", "mstflint", "tvflash", + "perftest", "mstflint", "qlvnictools", "sdpnetstat", "srptools", "rds-tools", "rnfs-utils", "ibutils", "infiniband-diags", "qperf", "qperf-debuginfo", "ofed-docs", "ofed-scripts", "tgt-generic", @mpi_packages @@ -858,21 +858,6 @@ my %packages_info = ( ofa_req_inst => [], install32 => 0, exception => 0 }, - 'tvflash' => - { name => "tvflash", parent => "tvflash", - selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0, - available => 1, mode => "user", dist_req_build => ["pciutils-devel"], - dist_req_inst => [], ofa_req_build => [], - ofa_req_inst => [], - install32 => 0, exception => 0, configure_options => '' }, - 'tvflash-debuginfo' => - { name => "tvflash-debuginfo", parent => "tvflash", - selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0, - available => 1, mode => "user", dist_req_build => [], - dist_req_inst => [], ofa_req_build => [], - ofa_req_inst => [], - install32 => 0, exception => 0 }, - 'ibvexdmtools' => { name => "ibvexdmtools", parent => "qlvnictools", selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0, @@ -1781,10 +1766,6 @@ sub set_availability $packages_info{'mpitests_openmpi_intel'}{'available'} = 1; } - if (is_installed('openSUSE-release')) { - $packages_info{'tvflash'}{'available'} = 0; - } - # debuginfo RPM currently are not supported on SuSE if ($distro eq 'SuSE' or $distro eq 'debian') { for my $package (@all_packages) { @@ -3014,14 +2995,6 @@ sub build_rpm $fflags = " -g -O2"; $ldlibs = " -g -O2"; } - # SLES 10 SP3 - if ($dist_rpm_rel ge 15.45.8) { - if ($parent eq "tvflash") { - build_rpm_32($name); - $packages_info{$name}{'rpm_exist'} = 1; - return; - } - } } else { if ($parent eq "sdpnetstat" or $parent eq "rds-tools" or $parent eq "rnfs-utils") { @@ -3033,11 +3006,6 @@ sub build_rpm $fflags = " -g -O2"; $ldlibs = " -g -O2"; } - elsif ($distro eq "redhat" and $parent eq "tvflash") { - build_rpm_32($name); - $packages_info{$name}{'rpm_exist'} = 1; - return; - } else { $ldflags .= " $optflags -m64 -g -O2 -L/usr/lib64"; $cflags .= " $optflags -m64 -g -O2"; @@ -3509,13 +3477,6 @@ sub install_rpm } } - if ($arch eq "ppc64" and $name =~ m/tvflash/) { - if ($distro eq "redhat" or ($distro eq "SuSE" and $dist_rpm_rel ge 15.45.8)) { - install_rpm_32($name); - return; - } - } - my $version = $main_packages{$packages_info{$name}{'parent'}}{'version'}; my $release = $main_packages{$packages_info{$name}{'parent'}}{'release'}; diff --git a/uninstall.sh b/uninstall.sh index a8dda29..7205dd3 100755 --- a/uninstall.sh +++ b/uninstall.sh @@ -82,7 +82,7 @@ IB_ALL_PACKAGES="$IB_ALL_PACKAGES libibmad libibmad-devel libibmad-static libibm IB_ALL_PACKAGES="$IB_ALL_PACKAGES librdmacm librdmacm-utils librdmacm-devel librdmacm-debuginfo librdmacm-static" IB_ALL_PACKAGES="$IB_ALL_PACKAGES libsdp libsdp-devel libsdp-debuginfo" IB_ALL_PACKAGES="$IB_ALL_PACKAGES opensm opensm-libs opensm-devel opensm-debuginfo opensm-static" -IB_ALL_PACKAGES="$IB_ALL_PACKAGES perftest perftest-debuginfo mstflint mstflint-debuginfo tvflash tvflash-debuginfo" +IB_ALL_PACKAGES="$IB_ALL_PACKAGES perftest perftest-debuginfo mstflint mstflint-debuginfo" IB_ALL_PACKAGES="$IB_ALL_PACKAGES compat-dapl compat-dapl-devel compat-dapl-devel-static compat-dapl-utils compat-dapl-debuginfo compat-dapl-static" IB_ALL_PACKAGES="$IB_ALL_PACKAGES compat-dapl-1.2.5 compat-dapl-devel-1.2.5 compat-dapl-devel-static-1.2.5 compat-dapl-utils-1.2.5 compat-dapl-debuginfo-1.2.5 compat-dapl-static-1.2.5" IB_ALL_PACKAGES="$IB_ALL_PACKAGES dapl dapl-devel dapl-devel-static dapl-utils dapl-debuginfo dapl-static" -- 2.46.0