Gentoo Archives: gentoo-commits

From: Alexey Shvetsov <alexxy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: eclass/
Date: Thu, 30 Jun 2011 16:57:38
Message-Id: 2c228853efbd3134cdd7b1536c28163a31dda984.alexxy@gentoo
1 commit: 2c228853efbd3134cdd7b1536c28163a31dda984
2 Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 30 16:53:04 2011 +0000
4 Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 30 16:53:04 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=2c228853
7
8 [eclass] Fix unpack logic
9
10 ---
11 eclass/openib.eclass | 17 +++++++++--------
12 1 files changed, 9 insertions(+), 8 deletions(-)
13
14 diff --git a/eclass/openib.eclass b/eclass/openib.eclass
15 index 0530f96..3705957 100644
16 --- a/eclass/openib.eclass
17 +++ b/eclass/openib.eclass
18 @@ -23,6 +23,10 @@ SLOT="0"
19 # @DESCRIPTION:
20 # Defines OFED package suffix eg -1.ofed1.4
21
22 +# @ECLASS-VARIABLE: OFED_SNAPSHOT
23 +# @DESCRIPTION:
24 +# Defines if src tarball is git snapshot
25 +
26 OFED_BASE_VER=$(get_version_component_range 1-3 ${OFED_VER})
27
28 SRC_URI="http://www.openfabrics.org/downloads/OFED/ofed-${OFED_BASE_VER}/OFED-${OFED_VER}.tgz"
29 @@ -62,12 +66,9 @@ S="${WORKDIR}/${MY_PN}-${MY_PV}"
30 openib_src_unpack() {
31 unpack ${A}
32 rpm_unpack "./OFED-${OFED_VER}/SRPMS/${MY_PN}-${MY_PV}-${OFED_SUFFIX}.src.rpm"
33 - case ${MY_PN} in
34 - rds-tools)
35 - MY_PV="${PV}-${OFED_SUFFIX}"
36 - ;;
37 - *)
38 - ;;
39 - esac
40 - unpack ./${MY_PN}-${MY_PV}.${EXT}
41 + if [ -z ${OFED_SNAPSHOT} ]; then
42 + unpack ./${MY_PN}-${MY_PV}.${EXT}
43 + else
44 + unpack ./${MY_PN}-${MY_PV}-${OFED_SUFFIX}.${EXT}
45 + fi
46 }