From: "Alexey Shvetsov (alexxy)" <alexxy@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog openib.eclass
Date: Fri, 12 Oct 2012 16:49:59 +0000 (UTC) [thread overview]
Message-ID: <20121012164959.3C9BA21600@flycatcher.gentoo.org> (raw)
alexxy 12/10/12 16:49:59
Modified: ChangeLog openib.eclass
Log:
[eclass] fix typo
Revision Changes Path
1.440 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.440&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.440&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.439&r2=1.440
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.439
retrieving revision 1.440
diff -u -r1.439 -r1.440
--- ChangeLog 12 Oct 2012 13:20:56 -0000 1.439
+++ ChangeLog 12 Oct 2012 16:49:59 -0000 1.440
@@ -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
1.8 eclass/openib.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/openib.eclass?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/openib.eclass?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/openib.eclass?r1=1.7&r2=1.8
Index: openib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/openib.eclass,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- openib.eclass 12 Oct 2012 13:20:56 -0000 1.7
+++ openib.eclass 12 Oct 2012 16:49:59 -0000 1.8
@@ -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 @@
# @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 @@
"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 @@
# 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 @@
# 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
next reply other threads:[~2012-10-12 16:50 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-12 16:49 Alexey Shvetsov (alexxy) [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-04-16 10:09 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog openib.eclass Alexey Shvetsov (alexxy)
2014-04-16 7:31 Alexey Shvetsov (alexxy)
2012-10-14 18:18 Alexey Shvetsov (alexxy)
2012-10-12 13:20 Alexey Shvetsov (alexxy)
2012-10-12 11:44 Alexey Shvetsov (alexxy)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121012164959.3C9BA21600@flycatcher.gentoo.org \
--to=alexxy@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox