diff options
| author |   Alexey Shvetsov <alexxy@gentoo.org> | 2012-10-12 16:49:59 +0000 |
|---|---|---|
| committer | Alexey Shvetsov <alexxy@gentoo.org> | 2012-10-12 16:49:59 +0000 |
| commit | f3ac72e3153bf56b98d3b482f0feb0d0ec013778 (patch) | |
| tree | 1c08c584d93069a9e4b5aeb69ac3ddccd4a95ca6 /eclass | |
| parent | Stable for HPPA (bug #340897). (diff) | |
| download | gentoo-2-f3ac72e3153bf56b98d3b482f0feb0d0ec013778.tar.gz gentoo-2-f3ac72e3153bf56b98d3b482f0feb0d0ec013778.tar.bz2 gentoo-2-f3ac72e3153bf56b98d3b482f0feb0d0ec013778.zip | |
[eclass] fix typo
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/openib.eclass | 31 |
2 files changed, 28 insertions, 8 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index da4a424912a8..43a5b8fef656 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.439 2012/10/12 13:20:56 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.440 2012/10/12 16:49:59 alexxy Exp $ + + 12 Oct 2012; Alexey Shvetsov <alexxy@gentoo.org> openib.eclass: + Fix typo 12 Oct 2012; Alexey Shvetsov <alexxy@gentoo.org> openib.eclass: [ofed] finalyze 3.5 diff --git a/eclass/openib.eclass b/eclass/openib.eclass index abb846cce5d7..02079470c427 100644 --- a/eclass/openib.eclass +++ b/eclass/openib.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/openib.eclass,v 1.7 2012/10/12 13:20:56 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/openib.eclass,v 1.8 2012/10/12 16:49:59 alexxy Exp $ # @ECLASS: openib.eclass # @AUTHOR: @@ -18,6 +18,15 @@ LICENSE="|| ( GPL-2 BSD-2 )" # @DESCRIPTION: # Defines OFED version eg 1.4 or 1.4.0.1 +# @ECLASS-VARIABLE: OFED_RC +# @DESCRIPTION: +# Sets if this version is RC + +# @ECLASS-VARIABLE: OFED_RC_VER +# @DESCRIPTION: +# Sets RC version + + # @ECLASS-VARIABLE: OFED_SUFFIX # @DESCRIPTION: # Defines OFED package suffix eg -1.ofed1.4 @@ -40,7 +49,7 @@ OFED_VERSIONS=( "1.5.3.2" "1.5.4" "1.5.4.1" - "3.5-rc2" + "3.5" ) # @FUNCTION: block_other_ofed_versions @@ -48,17 +57,21 @@ OFED_VERSIONS=( # function that creates blockers list for ofed block_other_ofed_versions() { local slot - RDEPEND+=" !sys-infiniband/${PN}:0" + RDEPEND="${RDEPEND} !sys-infiniband/${PN}:0" for slot in ${OFED_VERSIONS[@]}; do if [[ ${slot} != ${SLOT} ]]; then - RDEPEDN+=" !sys-infiniband/${PN}:${slot}" + RDEPEND+=" !sys-infiniband/${PN}:${slot}" fi done } -OFED_BASE_VER=$(get_version_component_range 1 '-' $(get_version_component_range 1-3 ${OFED_VER})) +OFED_BASE_VER=$(get_version_component_range 1-3 ${OFED_VER}) -SRC_URI="http://www.openfabrics.org/downloads/OFED/ofed-${OFED_BASE_VER}/OFED-${OFED_VER}.tgz" +if [ -z $OFED_RC ] ; then + SRC_URI="http://www.openfabrics.org/downloads/OFED/ofed-${OFED_BASE_VER}/OFED-${OFED_VER}.tgz" +else + SRC_URI="http://www.openfabrics.org/downloads/OFED/ofed-${OFED_BASE_VER}/OFED-${OFED_VER}-rc${OFED_RC_VER}.tgz" +fi case ${PN} in ofed) @@ -106,7 +119,11 @@ fi # This function will unpack OFED packages openib_src_unpack() { unpack ${A} - rpm_unpack "./OFED-${OFED_VER}/SRPMS/${MY_PN}-${MY_PV}-${OFED_SUFFIX}.src.rpm" + if [ -z ${OFED_RC} ]; then + rpm_unpack "./OFED-${OFED_VER}/SRPMS/${MY_PN}-${MY_PV}-${OFED_SUFFIX}.src.rpm" + else + rpm_unpack "./OFED-${OFED_VER}-rc${OFED_RC_VER}/SRPMS/${MY_PN}-${MY_PV}-${OFED_SUFFIX}.src.rpm" + fi if [ -z ${OFED_SNAPSHOT} ]; then unpack ./${MY_PN}-${MY_PV}.${EXT} else |