public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog openib.eclass
@ 2012-10-12 11:44 Alexey Shvetsov (alexxy)
  0 siblings, 0 replies; 6+ messages in thread
From: Alexey Shvetsov (alexxy) @ 2012-10-12 11:44 UTC (permalink / raw
  To: gentoo-commits

alexxy      12/10/12 11:44:24

  Modified:             ChangeLog openib.eclass
  Log:
  [eclass] Update ofed

Revision  Changes    Path
1.438                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.438&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.438&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.437&r2=1.438

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.437
retrieving revision 1.438
diff -u -r1.437 -r1.438
--- ChangeLog	11 Oct 2012 16:52:05 -0000	1.437
+++ ChangeLog	12 Oct 2012 11:44:23 -0000	1.438
@@ -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.437 2012/10/11 16:52:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.438 2012/10/12 11:44:23 alexxy Exp $
+
+  12 Oct 2012; Alexey Shvetsov <alexxy@gentoo.org> openib.eclass:
+  [openib] Update ofed versions
 
   11 Oct 2012; Michał Górny <mgorny@gentoo.org> eutils.eclass:
   prune_libtool_files(): add --modules option to remove modules (plugins) as



1.6                  eclass/openib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/openib.eclass?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/openib.eclass?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/openib.eclass?r1=1.5&r2=1.6

Index: openib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/openib.eclass,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openib.eclass	18 Apr 2012 18:16:12 -0000	1.5
+++ openib.eclass	12 Oct 2012 11:44:23 -0000	1.6
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.5 2012/04/18 18:16:12 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/openib.eclass,v 1.6 2012/10/12 11:44:23 alexxy Exp $
 
 # @ECLASS: openib.eclass
 # @AUTHOR:
@@ -40,7 +40,7 @@
 	"1.5.3.2"
 	"1.5.4"
 	"1.5.4.1"
-	"3.2"
+	"3.5-rc2"
 	)
 
 # @FUNCTION: block_other_ofed_versions





^ permalink raw reply	[flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog openib.eclass
@ 2012-10-12 13:20 Alexey Shvetsov (alexxy)
  0 siblings, 0 replies; 6+ messages in thread
From: Alexey Shvetsov (alexxy) @ 2012-10-12 13:20 UTC (permalink / raw
  To: gentoo-commits

alexxy      12/10/12 13:20:56

  Modified:             ChangeLog openib.eclass
  Log:
  [eclass] update openib

Revision  Changes    Path
1.439                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.439&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.439&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.438&r2=1.439

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.438
retrieving revision 1.439
diff -u -r1.438 -r1.439
--- ChangeLog	12 Oct 2012 11:44:23 -0000	1.438
+++ ChangeLog	12 Oct 2012 13:20:56 -0000	1.439
@@ -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.438 2012/10/12 11:44:23 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.439 2012/10/12 13:20:56 alexxy Exp $
+
+  12 Oct 2012; Alexey Shvetsov <alexxy@gentoo.org> openib.eclass:
+  [ofed] finalyze 3.5
 
   12 Oct 2012; Alexey Shvetsov <alexxy@gentoo.org> openib.eclass:
   [openib] Update ofed versions



1.7                  eclass/openib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/openib.eclass?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/openib.eclass?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/openib.eclass?r1=1.6&r2=1.7

Index: openib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/openib.eclass,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- openib.eclass	12 Oct 2012 11:44:23 -0000	1.6
+++ openib.eclass	12 Oct 2012 13:20:56 -0000	1.7
@@ -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.6 2012/10/12 11:44:23 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/openib.eclass,v 1.7 2012/10/12 13:20:56 alexxy Exp $
 
 # @ECLASS: openib.eclass
 # @AUTHOR:
@@ -56,13 +56,20 @@
 	done
 }
 
-OFED_BASE_VER=$(get_version_component_range 1-3 ${OFED_VER})
+OFED_BASE_VER=$(get_version_component_range 1 '-' $(get_version_component_range 1-3 ${OFED_VER}))
 
 SRC_URI="http://www.openfabrics.org/downloads/OFED/ofed-${OFED_BASE_VER}/OFED-${OFED_VER}.tgz"
 
 case ${PN} in
 	ofed)
-		MY_PN="ofa_kernel"
+		case ${PV} in
+			1.5.*|1.5.*.*)
+				MY_PN="ofa_kernel"
+				;;
+			*)
+				MY_PN="compat-rdma"
+				;;
+		esac
 		;;
 	*)
 		MY_PN="${PN}"





^ permalink raw reply	[flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog openib.eclass
@ 2012-10-12 16:49 Alexey Shvetsov (alexxy)
  0 siblings, 0 replies; 6+ messages in thread
From: Alexey Shvetsov (alexxy) @ 2012-10-12 16:49 UTC (permalink / raw
  To: gentoo-commits

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





^ permalink raw reply	[flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog openib.eclass
@ 2012-10-14 18:18 Alexey Shvetsov (alexxy)
  0 siblings, 0 replies; 6+ messages in thread
From: Alexey Shvetsov (alexxy) @ 2012-10-14 18:18 UTC (permalink / raw
  To: gentoo-commits

alexxy      12/10/14 18:18:20

  Modified:             ChangeLog openib.eclass
  Log:
  [eclass] Add compat-rdma

Revision  Changes    Path
1.445                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.445&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.445&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.444&r2=1.445

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.444
retrieving revision 1.445
diff -u -r1.444 -r1.445
--- ChangeLog	14 Oct 2012 12:19:32 -0000	1.444
+++ ChangeLog	14 Oct 2012 18:18:20 -0000	1.445
@@ -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.444 2012/10/14 12:19:32 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.445 2012/10/14 18:18:20 alexxy Exp $
+
+  14 Oct 2012; Alexey Shvetsov <alexxy@gentoo.org> openib.eclass:
+  Add compat-rdma
 
   14 Oct 2012; Sergey Popov <pinkbyte@gentoo.org> leechcraft.eclass:
   Add compiler version checking for LeechCraft



1.9                  eclass/openib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/openib.eclass?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/openib.eclass?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/openib.eclass?r1=1.8&r2=1.9

Index: openib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/openib.eclass,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- openib.eclass	12 Oct 2012 16:49:59 -0000	1.8
+++ openib.eclass	14 Oct 2012 18:18:20 -0000	1.9
@@ -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.8 2012/10/12 16:49:59 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/openib.eclass,v 1.9 2012/10/14 18:18:20 alexxy Exp $
 
 # @ECLASS: openib.eclass
 # @AUTHOR:
@@ -99,7 +99,7 @@
 esac
 
 case ${MY_PN} in
-	ofa_kernel)
+	ofa_kernel|compat-rdma)
 		EXT="tgz"
 		;;
 	*)





^ permalink raw reply	[flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog openib.eclass
@ 2014-04-16  7:31 Alexey Shvetsov (alexxy)
  0 siblings, 0 replies; 6+ messages in thread
From: Alexey Shvetsov (alexxy) @ 2014-04-16  7:31 UTC (permalink / raw
  To: gentoo-commits

alexxy      14/04/16 07:31:00

  Modified:             ChangeLog openib.eclass
  Log:
  Update openib eclass

Revision  Changes    Path
1.1208               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1208&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1208&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1207&r2=1.1208

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1207
retrieving revision 1.1208
diff -u -r1.1207 -r1.1208
--- ChangeLog	15 Apr 2014 15:54:12 -0000	1.1207
+++ ChangeLog	16 Apr 2014 07:31:00 -0000	1.1208
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1207 2014/04/15 15:54:12 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1208 2014/04/16 07:31:00 alexxy Exp $
+
+  16 Apr 2014; Alexey Shvetsov <alexxy@gentoo.org> openib.eclass:
+  Update openib eclass
 
   15 Apr 2014; Michał Górny <mgorny@gentoo.org> multibuild.eclass:
   multibuild_merge_root: re-introduce userland_BSD tar fallback, bug #507626.



1.10                 eclass/openib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/openib.eclass?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/openib.eclass?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/openib.eclass?r1=1.9&r2=1.10

Index: openib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/openib.eclass,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- openib.eclass	14 Oct 2012 18:18:20 -0000	1.9
+++ openib.eclass	16 Apr 2014 07:31:00 -0000	1.10
@@ -1,13 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/openib.eclass,v 1.9 2012/10/14 18:18:20 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/openib.eclass,v 1.10 2014/04/16 07:31:00 alexxy Exp $
 
 # @ECLASS: openib.eclass
 # @AUTHOR:
 # Original Author: Alexey Shvetsov <alexxy@gentoo.org>
 # @BLURB: Simplify working with OFED packages
 
-inherit base eutils rpm versionator
+inherit eutils rpm versionator
 
 EXPORT_FUNCTIONS src_unpack
 
@@ -42,14 +42,9 @@
 # Defines array of ofed version supported by eclass
 
 OFED_VERSIONS=(
-	"1.5.1"
-	"1.5.2"
-	"1.5.3"
-	"1.5.3.1"
-	"1.5.3.2"
-	"1.5.4"
 	"1.5.4.1"
 	"3.5"
+	"3.12"
 	)
 
 # @FUNCTION: block_other_ofed_versions
@@ -68,9 +63,9 @@
 OFED_BASE_VER=$(get_version_component_range 1-3 ${OFED_VER})
 
 if [ -z $OFED_RC ] ; then
-	SRC_URI="http://www.openfabrics.org/downloads/OFED/ofed-${OFED_BASE_VER}/OFED-${OFED_VER}.tgz"
+	SRC_URI="https://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"
+	SRC_URI="https://www.openfabrics.org/downloads/OFED/ofed-${OFED_BASE_VER}/OFED-${OFED_VER}-rc${OFED_RC_VER}.tgz"
 fi
 
 case ${PN} in





^ permalink raw reply	[flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog openib.eclass
@ 2014-04-16 10:09 Alexey Shvetsov (alexxy)
  0 siblings, 0 replies; 6+ messages in thread
From: Alexey Shvetsov (alexxy) @ 2014-04-16 10:09 UTC (permalink / raw
  To: gentoo-commits

alexxy      14/04/16 10:09:30

  Modified:             ChangeLog openib.eclass
  Log:
  Update openib eclass

Revision  Changes    Path
1.1209               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1209&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1209&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1208&r2=1.1209

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1208
retrieving revision 1.1209
diff -u -r1.1208 -r1.1209
--- ChangeLog	16 Apr 2014 07:31:00 -0000	1.1208
+++ ChangeLog	16 Apr 2014 10:09:29 -0000	1.1209
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1208 2014/04/16 07:31:00 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1209 2014/04/16 10:09:29 alexxy Exp $
+
+  16 Apr 2014; Alexey Shvetsov <alexxy@gentoo.org> openib.eclass:
+  Update openib eclass
 
   16 Apr 2014; Alexey Shvetsov <alexxy@gentoo.org> openib.eclass:
   Update openib eclass



1.11                 eclass/openib.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/openib.eclass?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/openib.eclass?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/openib.eclass?r1=1.10&r2=1.11

Index: openib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/openib.eclass,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- openib.eclass	16 Apr 2014 07:31:00 -0000	1.10
+++ openib.eclass	16 Apr 2014 10:09:29 -0000	1.11
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/openib.eclass,v 1.10 2014/04/16 07:31:00 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/openib.eclass,v 1.11 2014/04/16 10:09:29 alexxy Exp $
 
 # @ECLASS: openib.eclass
 # @AUTHOR:
@@ -115,13 +115,41 @@
 openib_src_unpack() {
 	unpack ${A}
 	if [ -z ${OFED_RC} ]; then
-		rpm_unpack "./OFED-${OFED_VER}/SRPMS/${MY_PN}-${MY_PV}-${OFED_SUFFIX}.src.rpm"
+		case ${PN} in
+			ofed)
+				rpm_unpack "./OFED-${OFED_VER}/SRPMS/${MY_PN}-${OFED_VER}-${OFED_SUFFIX}.src.rpm"
+				;;
+			*)
+				rpm_unpack "./OFED-${OFED_VER}/SRPMS/${MY_PN}-${MY_PV}-${OFED_SUFFIX}.src.rpm"
+				;;
+		esac
 	else
-		rpm_unpack "./OFED-${OFED_VER}-rc${OFED_RC_VER}/SRPMS/${MY_PN}-${MY_PV}-${OFED_SUFFIX}.src.rpm"
+		case ${PN} in
+			ofed)
+				rpm_unpack "./OFED-${OFED_VER}-rc${OFED_RC_VER}/SRPMS/${MY_PN}-${OFED_VER}-${OFED_SUFFIX}.src.rpm"
+				;;
+			*)
+				rpm_unpack "./OFED-${OFED_VER}-rc${OFED_RC_VER}/SRPMS/${MY_PN}-${MY_PV}-${OFED_SUFFIX}.src.rpm"
+				;;
+		esac
 	fi
 	if [ -z ${OFED_SNAPSHOT} ]; then
-		unpack ./${MY_PN}-${MY_PV}.${EXT}
+		case ${PN} in
+			ofed)
+				unpack ./${MY_PN}-${OFED_VER}.${EXT}
+				;;
+			*)
+				unpack ./${MY_PN}-${MY_PV}.${EXT}
+				;;
+		esac
 	else
-		unpack ./${MY_PN}-${MY_PV}-${OFED_SUFFIX}.${EXT}
+		case ${PN} in
+			ofed)
+				unpack ./${MY_PN}-${OFED_VER}-${OFED_SUFFIX}.${EXT}
+				;;
+			*)
+				unpack ./${MY_PN}-${MY_PV}-${OFED_SUFFIX}.${EXT}
+				;;
+		esac
 	fi
 }





^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2014-04-16 10:09 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-12 11:44 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog openib.eclass Alexey Shvetsov (alexxy)
  -- strict thread matches above, loose matches on Subject: below --
2012-10-12 13:20 Alexey Shvetsov (alexxy)
2012-10-12 16:49 Alexey Shvetsov (alexxy)
2012-10-14 18:18 Alexey Shvetsov (alexxy)
2014-04-16  7:31 Alexey Shvetsov (alexxy)
2014-04-16 10:09 Alexey Shvetsov (alexxy)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox