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 <[email protected]> openib.eclass: + Update openib eclass 16 Apr 2014; Alexey Shvetsov <[email protected]> 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 }
