[ewg] Re: [PATCH install.pl] Disable 'tgt-generic' on ppc64 and ia64 platforms.

2008-08-26 Thread Doron Shoham
> Ok,
> So, here is the patch:
> Do you want me to apply this patch?

Yes,
Thanks!

Doron

___
ewg mailing list
ewg@lists.openfabrics.org
http://lists.openfabrics.org/cgi-bin/mailman/listinfo/ewg


[ewg] Re: [PATCH install.pl] Disable 'tgt-generic' on ppc64 and ia64 platforms.

2008-08-26 Thread Vladimir Sokolovsky

Doron Shoham wrote:

 > Probably I missed something.

Please correct me if I am wrong:

1. There is one 'tgt-generic' source RPM.
2. After 'rpmbuild --rebuild ... tgt-generic.src.rpm' two binary RPMs
being created: 'tgt' and 'scsi-target-utils' on both SuSE and RedHat.
3. On SuSE you want to install the 'tgt' RPM.
   On RedHat - 'scsi-target-utils' RPM.

So, where stgt comes from?

Now, if tgt-generic=y in conf file then 'tgt' RPM will be installed on
SuSE and 'scsi-target-utils' will be installed on RedHat.

- Vladimir



You are correct.
I was confused by something else.

Thanks,
Doron



Ok,
So, here is the patch:
Do you want me to apply this patch?

- Vladimir

Disable 'tgt-generic' on ppc64 and ia64 platforms.
Remove unused 'stgt' package.

Signed-off-by: Vladimir Sokolovsky <[EMAIL PROTECTED]>
---
 install.pl |   30 +++---
 1 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/install.pl b/install.pl
index b31f30b..845eb64 100755
--- a/install.pl
+++ b/install.pl
@@ -1240,28 +1240,21 @@ my %packages_info = (
 'tgt-generic' =>
 { name => ($distro eq 'SuSE') ? 'tgt': 'scsi-target-utils', parent => 
"tgt-generic",
 selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
-available => 1, mode => "user", dist_req_build => 
["openssl-devel"],
+available => 0, mode => "user", dist_req_build => 
["openssl-devel"],
 dist_req_inst => [], ofa_req_build => ["libibverbs-devel", 
"librdmacm-devel"],
 ofa_req_inst => ["librdmacm", "libibverbs-devel"],
 install32 => 0, exception => 1, configure_options => '' },
-'stgt' =>
-{ name => "stgt", parent => "tgt-generic",
-selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
-available => 1, mode => "user", dist_req_build => 
["openssl-devel"],
-dist_req_inst => [], ofa_req_build => ["libibverbs-devel", 
"librdmacm-devel"],
-ofa_req_inst => ["librdmacm", "libibverbs-devel"],
-install32 => 0, exception => 1 },
 'tgt' =>
 { name => "tgt", parent => "tgt-generic",
 selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
-available => 1, mode => "user", dist_req_build => 
["openssl-devel"],
+available => 0, mode => "user", dist_req_build => 
["openssl-devel"],
 dist_req_inst => [], ofa_req_build => ["libibverbs-devel", 
"librdmacm-devel"],
 ofa_req_inst => ["librdmacm", "libibverbs-devel"],
 install32 => 0, exception => 1 },
 'scsi-target-utils' =>
 { name => "scsi-target-utils", parent => "tgt-generic",
 selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
-available => 1, mode => "user", dist_req_build => 
["openssl-devel"],
+available => 0, mode => "user", dist_req_build => 
["openssl-devel"],
 dist_req_inst => [], ofa_req_build => ["libibverbs-devel", 
"librdmacm-devel"],
 ofa_req_inst => ["librdmacm", "libibverbs-devel"],
 install32 => 0, exception => 1 },
@@ -1625,8 +1618,11 @@ sub set_availability
 }

 # tgt
-if ($kernel =~ m/2.6.16.[0-9.]*-[0-9.]*-[A-Za-z0-9.]*|el5/) {
+if ($arch !~ m/ppc64|powerpc|ia64/ and
+$kernel =~ m/2.6.16.[0-9.]*-[0-9.]*-[A-Za-z0-9.]*|el5/) {
 $packages_info{'tgt-generic'}{'available'} = 1;
+$packages_info{'tgt'}{'available'} = 1;
+$packages_info{'scsi-target-utils'}{'available'} = 1;
 }

 # QLogic vnic
@@ -2111,15 +2107,6 @@ sub select_packages
 next;
 }

-if ($package eq "stgt") {
-if ( $selected eq 'y' ) {
-   push (@selected_by_user, "tgt-generic");
-   print "select_package: selected tgt-generic\n" if 
($verbose2);
-   $cnt ++;
-   next;
-}
-}
-
if (substr($package,0,length("vendor_config")) eq 
"vendor_config") {
   next;
}
@@ -2311,9 +2298,6 @@ sub select_packages
 check_open_iscsi();
 push (@selected_by_user, "open-iscsi-generic");
 }
-if ("stgt" =~ m/$tmp/) {
-push (@selected_by_user, "tgt-generic");
-}
 flock CONFIG, $UNLOCK;
 }
 close(CONFIG);
--
1.5.4.3


___
ewg mailing list
ewg@lists.openfabrics.org
http://lists.openfabrics.org/cgi-bin/mailman/listinfo/ewg