diff options
| author |   Alexey Shvetsov <alexxy@gentoo.org> | 2014-04-16 10:09:29 +0000 |
|---|---|---|
| committer | Alexey Shvetsov <alexxy@gentoo.org> | 2014-04-16 10:09:29 +0000 |
| commit | 82ea8854713db8d69c07c07767e53245ba1364d6 (patch) | |
| tree | 715d351f598302b981ac18b2885f651295c197fb /eclass | |
| parent | version bump, drop old (diff) | |
| download | historical-82ea8854713db8d69c07c07767e53245ba1364d6.tar.gz historical-82ea8854713db8d69c07c07767e53245ba1364d6.tar.bz2 historical-82ea8854713db8d69c07c07767e53245ba1364d6.zip | |
Update openib eclass
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/openib.eclass | 38 |
2 files changed, 37 insertions, 6 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 20fe1ae54d2a..e5f4f57cfc03 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -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 diff --git a/eclass/openib.eclass b/eclass/openib.eclass index 7fe4c8740b11..178db141b39c 100644 --- a/eclass/openib.eclass +++ b/eclass/openib.eclass @@ -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 @@ fi 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 } |