[openfabrics-ewg] Merging ib_iser & open-iscsi in the OFED installation UI

[Vladimir Sokolovsky]

On Tue, 2007-02-13 at 15:17 +0200, Erez Zilber wrote:
> Vlad,
> 
> When building/installing OFED 1.2, you can select the components to be
> installed. Among the available options are ib_iser & open-iscsi. I want
> to remove open-iscsi from the list of available options and mention in
> the ib_iser option that it also includes open-iscsi. The reason for that
> is that if you install iSER, open-iscsi must be also installed.
> Therefore, asking if you're interested in open-iscsi after you have
> selected iSER does not make sense.
> 
> Do you agree? If yes,how can we do that in OFED scripts?
> 
> Thanks,

Erez,

Check the following patch:

diff --git a/build_env.sh b/build_env.sh
index 1fe7673..272ead9 100644
--- a/build_env.sh
+++ b/build_env.sh
@@ -177,11 +177,6 @@ if (echo -n ${IB_KERNEL_PACKAGES} | grep -w "ib_ehca" > $NULL); then
     IB_BASIC_PACKAGES="$IB_BASIC_PACKAGES libehca libehca-devel"
 fi

-# Add open-iscsi package only if iSER can be installed
-if (echo -n ${IB_KERNEL_PACKAGES} | grep -w "ib_iser" > $NULL); then
-    IB_BASIC_PACKAGES="${IB_BASIC_PACKAGES} open-iscsi"
-fi
-
 # Add libcxgb3 package only if CXGB3 driver can be installed
 if (echo -n ${IB_KERNEL_PACKAGES} | grep -w "cxgb3" > $NULL); then
     IB_BASIC_PACKAGES="$IB_BASIC_PACKAGES libcxgb3 libcxgb3-devel"
@@ -228,6 +223,9 @@ HPC_PACKAGES="${HPC_PACKAGES} librdmacm librdmacm-devel librdmacm-utils dapl dap
 # The list of ALL_PACKAGES should preserve the order of dependencies
 ALL_PACKAGES="${IB_ALL_PACKAGES} mvapich mvapich2 openmpi mpitests ibutils" # pdsh

+#Packages that are not displayed in custom menu
+HIDDEN_PACKAGES="open-iscsi"
+
 PREV_RELEASE_PACKAGES="opensm-devel opensm-libs ibtsal openib mpi_ncsa mpi_osu thca ib-osm osm ibadm ib-diags"
 PREV_RELEASE_PACKAGES="$PREV_RELEASE_PACKAGES diags ibgdiag ibdiag ib-management"
 PREV_RELEASE_PACKAGES="$PREV_RELEASE_PACKAGES ib-verbs ib-ipoib ib-cm ib-sdp"
@@ -1648,6 +1646,7 @@ set_package_deps()
                         2.6.16.*-*-*|2.6.*.el5)
                             OFA_KERNEL_PACKAGES=$(echo "$OFA_KERNEL_PACKAGES ib_verbs ${ll_driver} ib_iser" | tr -s ' ' '\n' | sort -n | uniq)
                             OFA_PACKAGES=$(echo "$OFA_PACKAGES kernel-ib" | tr -s ' ' '\n' | sort -n | uniq)
+                            EXTRA_PACKAGES=$(echo "$EXTRA_PACKAGES open-iscsi" | tr -s ' ' '\n' | sort -rn | uniq)
                         ;;
                         *)
                             if [ "$prog" == "build.sh" ]; then
@@ -1936,7 +1935,7 @@ set_package_deps()
         # Build the EXTRA_PACKAGES list from scratch following interpackage dependencies
         # in ALL_PACKAGES which has in the right order
         tmp_EXTRA_PACKAGES=""
-        for pack in ${ALL_PACKAGES}
+        for pack in ${ALL_PACKAGES} ${HIDDEN_PACKAGES}
         do
             if ( echo -n ${EXTRA_PACKAGES} | grep -w ${pack} > $NULL 2>&1 ); then
                 tmp_EXTRA_PACKAGES="${tmp_EXTRA_PACKAGES} ${pack}"