From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QcKYc-0001cl-6x for garchives@archives.gentoo.org; Thu, 30 Jun 2011 16:57:38 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 508C91C00B; Thu, 30 Jun 2011 16:57:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 22FCE1C00B for ; Thu, 30 Jun 2011 16:57:30 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 96C521B404F for ; Thu, 30 Jun 2011 16:57:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id BBCA88003C for ; Thu, 30 Jun 2011 16:57:28 +0000 (UTC) From: "Alexey Shvetsov" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexey Shvetsov" Message-ID: <2c228853efbd3134cdd7b1536c28163a31dda984.alexxy@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: eclass/ X-VCS-Repository: proj/sci X-VCS-Files: eclass/openib.eclass X-VCS-Directories: eclass/ X-VCS-Committer: alexxy X-VCS-Committer-Name: Alexey Shvetsov X-VCS-Revision: 2c228853efbd3134cdd7b1536c28163a31dda984 Date: Thu, 30 Jun 2011 16:57:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 8e4359eb9a49b203720e45d3d55729d1 commit: 2c228853efbd3134cdd7b1536c28163a31dda984 Author: Alexey Shvetsov gentoo org> AuthorDate: Thu Jun 30 16:53:04 2011 +0000 Commit: Alexey Shvetsov gentoo org> CommitDate: Thu Jun 30 16:53:04 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D2c228853 [eclass] Fix unpack logic --- eclass/openib.eclass | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/eclass/openib.eclass b/eclass/openib.eclass index 0530f96..3705957 100644 --- a/eclass/openib.eclass +++ b/eclass/openib.eclass @@ -23,6 +23,10 @@ SLOT=3D"0" # @DESCRIPTION: # Defines OFED package suffix eg -1.ofed1.4 =20 +# @ECLASS-VARIABLE: OFED_SNAPSHOT +# @DESCRIPTION: +# Defines if src tarball is git snapshot + OFED_BASE_VER=3D$(get_version_component_range 1-3 ${OFED_VER}) =20 SRC_URI=3D"http://www.openfabrics.org/downloads/OFED/ofed-${OFED_BASE_VE= R}/OFED-${OFED_VER}.tgz" @@ -62,12 +66,9 @@ S=3D"${WORKDIR}/${MY_PN}-${MY_PV}" openib_src_unpack() { unpack ${A} rpm_unpack "./OFED-${OFED_VER}/SRPMS/${MY_PN}-${MY_PV}-${OFED_SUFFIX}.s= rc.rpm" - case ${MY_PN} in - rds-tools) - MY_PV=3D"${PV}-${OFED_SUFFIX}" - ;; - *) - ;; - esac - unpack ./${MY_PN}-${MY_PV}.${EXT} + if [ -z ${OFED_SNAPSHOT} ]; then + unpack ./${MY_PN}-${MY_PV}.${EXT} + else + unpack ./${MY_PN}-${MY_PV}-${OFED_SUFFIX}.${EXT} + fi }