Erez Zilber wrote:
> Add support for open-iscsi over iSER in RHAS4 in OFED's scripts.
>
> Signed-off-by: Erez Zilber <[EMAIL PROTECTED]>
> ---
> build.sh | 2 +-
> build_env.sh | 4 ++--
> install.sh | 2 +-
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/build.sh b/build.sh
> index d54c55d..be2d1e6 100755
> --- a/build.sh
> +++ b/build.sh
> @@ -344,7 +344,7 @@ open-iscsi()
> SuSE)
> ex "$MV -f
> ${RPM_DIR}/RPMS/$build_arch/${OPEN_ISCSI_SUSE_NAME}-${OPEN_ISCSI_VERSION}.${build_arch}.rpm
> $RPMS"
> ;;
> - redhat5)
> + redhat|redhat5)
> ex "$MV -f
> ${RPM_DIR}/RPMS/$build_arch/${OPEN_ISCSI_REDHAT_NAME}-${OPEN_ISCSI_VERSION}.${build_arch}.rpm
> $RPMS"
> ;;
> *)
> diff --git a/build_env.sh b/build_env.sh
> index 6e65b21..49821b4 100644
> --- a/build_env.sh
> +++ b/build_env.sh
> @@ -135,7 +135,7 @@ IB_KERNEL_PACKAGES="${IB_KERNEL_PACKAGES
> # Iser
> # Currently iSER is supported only on SLES10 & RHEL5
> case ${K_VER} in
> - 2.6.16.*-*-*|2.6.*.el5)
> + 2.6.16.*-*-*|2.6.*.el5|2.6.9-*.EL*)
> IB_KERNEL_PACKAGES="${IB_KERNEL_PACKAGES} ib_iser"
> ;;
> esac
> @@ -1998,7 +1998,7 @@ set_package_deps()
> ib_iser)
> # Currently iSER is supported only on SLES10 & RHEL5
> case ${K_VER} in
> - 2.6.16.*-*-*|2.6.*.el5)
> + 2.6.16.*-*-*|2.6.*.el5|2.6.9-*.EL*)
> 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)
> diff --git a/install.sh b/install.sh
> index f9ed6da..dadc144 100755
> --- a/install.sh
> +++ b/install.sh
> @@ -990,7 +990,7 @@ # fi
> err_echo
> "${OPEN_ISCSI_SUSE_NAME}-${OPEN_ISCSI_VERSION}.${build_arch}.rpm not found
> under ${RPMS}."
> fi
> ;;
> - redhat5)
> + redhat|redhat5)
> if [ -f
> ${RPMS}/${OPEN_ISCSI_REDHAT_NAME}-${OPEN_ISCSI_VERSION}.${build_arch}.rpm ];
> then
> ex "$RPM -Uhv --oldpackage
> ${RPMS}/${OPEN_ISCSI_REDHAT_NAME}-${OPEN_ISCSI_VERSION}.${build_arch}.rpm"
> else
>
Vlad,
It seems that commit 553e284ffb2f380dc8d1451bfb3ad40165f04112 in
ofed_1_2_scripts.git is different from the patch that I submitted. For
example:
My patch:
@@ -135,7 +135,7 @@ IB_KERNEL_PACKAGES="${IB_KERNEL_PACKAGES
# Iser
# Currently iSER is supported only on SLES10 & RHEL5
case ${K_VER} in
- 2.6.16.*-*-*|2.6.*.el5)
+ 2.6.16.*-*-*|2.6.*.el5|2.6.9-*.EL*)
IB_KERNEL_PACKAGES="${IB_KERNEL_PACKAGES} ib_iser"
;;
esac
patch applied in ofed_1_2_scripts.git:
@@ -135,7 +135,7 @@ IB_KERNEL_PACKAGES="${IB_KERNEL_PACKAGES
# Iser
# Currently iSER is supported only on SLES10 & RHEL5
case ${K_VER} in
- 2.6.16.*-*-*|2.6.*.el5)
+ 2.6.16.*-*-*|2.6.*.el5|2.6.9-[3-5]*.EL*) <-- this line is different
IB_KERNEL_PACKAGES="${IB_KERNEL_PACKAGES} ib_iser"
;;
esac
Why is that?
Erez
_______________________________________________
ewg mailing list
ewg@lists.openfabrics.org
http://lists.openfabrics.org/cgi-bin/mailman/listinfo/ewg
