From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id ED9441389E2 for ; Tue, 2 Dec 2014 15:36:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9B09EE09ED; Tue, 2 Dec 2014 15:36:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C8FFDE09EB for ; Tue, 2 Dec 2014 15:36:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 725DB34062A for ; Tue, 2 Dec 2014 15:36:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 20867B5D3 for ; Tue, 2 Dec 2014 15:36:06 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1417533826.a69b95ea4c3dc428909aba151a0db42ac535b7a3.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: eclass/ X-VCS-Repository: proj/sci X-VCS-Files: eclass/intel-sdp.eclass X-VCS-Directories: eclass/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: a69b95ea4c3dc428909aba151a0db42ac535b7a3 X-VCS-Branch: master Date: Tue, 2 Dec 2014 15:36:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f61db223-700c-43b2-87f9-cde9325bbe64 X-Archives-Hash: 8624ed569b25fdabe3ec7bb6bbff1471 commit: a69b95ea4c3dc428909aba151a0db42ac535b7a3 Author: Justin Lecher gentoo org> AuthorDate: Tue Dec 2 15:23:46 2014 +0000 Commit: Justin Lecher gentoo org> CommitDate: Tue Dec 2 15:23:46 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a69b95ea Handle versioning better Signed-off-by: Justin Lecher gentoo.org> --- eclass/intel-sdp.eclass | 59 +++++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 26 deletions(-) diff --git a/eclass/intel-sdp.eclass b/eclass/intel-sdp.eclass index a0d3799..6b2bfc6 100644 --- a/eclass/intel-sdp.eclass +++ b/eclass/intel-sdp.eclass @@ -78,7 +78,6 @@ : ${INTEL_X86:=i486} # @ECLASS-VARIABLE: INTEL_BIN_RPMS -# @DEFAULT_UNSET # @DESCRIPTION: # Functional name of rpm without any version/arch tag # @@ -88,19 +87,19 @@ # specify the full path # # e.g. CLI_install/rpm/intel-vtune-amplifier-xe-cli +: ${INTEL_BIN_RPMS:=""} # @ECLASS-VARIABLE: INTEL_AMD64_RPMS -# @DEFAULT_UNSET # @DESCRIPTION: # AMD64 single arch rpms. Same syntax as INTEL_BIN_RPMS +: ${INTEL_AMD64_RPMS:=""} # @ECLASS-VARIABLE: INTEL_X86_RPMS -# @DEFAULT_UNSET # @DESCRIPTION: # X86 single arch rpms. Same syntax as INTEL_BIN_RPMS +: ${INTEL_X86_RPMS:=""} # @ECLASS-VARIABLE: INTEL_DAT_RPMS -# @DEFAULT_UNSET # @DESCRIPTION: # Functional name of rpm of common data which are arch free # without any version tag @@ -111,6 +110,7 @@ # specify the full path # # e.g. CLI_install/rpm/intel-vtune-amplifier-xe-cli-common +: ${INTEL_DAT_RPMS:=""} # @ECLASS-VARIABLE: INTEL_SINGLE_ARCH # @DESCRIPTION: @@ -128,6 +128,12 @@ _INTEL_PV1=$(get_version_component_range 1) _INTEL_PV2=$(get_version_component_range 2) _INTEL_PV3=$(get_version_component_range 3) _INTEL_PV4=$(get_version_component_range 4) +_INTEL_PV="" +[[ -n ${_INTEL_PV4} ]] && _INTEL_PV+="${_INTEL_PV4}-" +[[ -n ${_INTEL_PV1} ]] && _INTEL_PV+="${_INTEL_PV1}" +[[ -n ${_INTEL_PV2} ]] && _INTEL_PV+=".${_INTEL_PV2}" +[[ -n ${_INTEL_PV3} ]] && _INTEL_PV+="-${_INTEL_PV3}" + _INTEL_URI="http://registrationcenter-download.intel.com/irc_nas/${INTEL_DID}/${INTEL_DPN}" if [ ${INTEL_SINGLE_ARCH} == true ]; then @@ -150,14 +156,16 @@ RESTRICT="mirror" RDEPEND="" DEPEND="app-arch/rpm2targz" -_INTEL_SDP_YEAR=${INTEL_DPV%_update*} -_INTEL_SDP_YEAR=${INTEL_DPV%_sp*} +_INTEL_SDP_YEAR=${INTEL_DPV} +_INTEL_SDP_YEAR=${_INTEL_SDP_YEAR%_sp*} +_INTEL_SDP_YEAR=${_INTEL_SDP_YEAR%_update*} # @ECLASS-VARIABLE: INTEL_SDP_DIR -# @DEFAULT_UNSET # @DESCRIPTION: # Full rootless path to installation dir -INTEL_SDP_DIR="opt/intel/${INTEL_SUBDIR}-${_INTEL_SDP_YEAR:-${_INTEL_PV1}}.${_INTEL_PV3}.${_INTEL_PV4}" +INTEL_SDP_DIR="opt/intel/${INTEL_SUBDIR}-${_INTEL_SDP_YEAR:-${_INTEL_PV1}}" +[[ -n ${_INTEL_PV3} ]] && INTEL_SDP_DIR+=".${_INTEL_PV3}" +[[ -n ${_INTEL_PV4} ]] && INTEL_SDP_DIR+=".${_INTEL_PV4}" # @ECLASS-VARIABLE: INTEL_SDP_EDIR # @DEFAULT_UNSET @@ -366,9 +374,9 @@ intel-sdp_pkg_setup() { for p in "${_INTEL_BIN_RPMS[@]}"; do for a in ${arch}; do if [ ${p} == $(basename ${p}) ]; then - INTEL_RPMS+=( intel-${p}-${_INTEL_PV4}-${_INTEL_PV1}.${_INTEL_PV2}-${_INTEL_PV3}.${a}.rpm ) + INTEL_RPMS+=( intel-${p}-${_INTEL_PV}.${a}.rpm ) else - INTEL_RPMS_FULL+=( ${p}-${_INTEL_PV4}-${_INTEL_PV1}.${_INTEL_PV2}-${_INTEL_PV3}.${a}.rpm ) + INTEL_RPMS_FULL+=( ${p}-${_INTEL_PV}.${a}.rpm ) fi done done @@ -380,26 +388,25 @@ intel-sdp_pkg_setup() { fi for p in "${_INTEL_AMD64_RPMS[@]}"; do if [ ${p} == $(basename ${p}) ]; then - INTEL_RPMS+=( intel-${p}-${_INTEL_PV4}-${_INTEL_PV1}.${_INTEL_PV2}-${_INTEL_PV3}.x86_64.rpm ) + INTEL_RPMS+=( intel-${p}-${_INTEL_PV}.x86_64.rpm ) else - INTEL_RPMS_FULL+=( ${p}-${_INTEL_PV4}-${_INTEL_PV1}.${_INTEL_PV2}-${_INTEL_PV3}.x86_64.rpm ) + INTEL_RPMS_FULL+=( ${p}-${_INTEL_PV}.x86_64.rpm ) fi done - elif use x86; then - if [[ $(declare -p INTEL_X86_RPMS) = "declare -a "* ]] ; then - _INTEL_X86_RPMS=( ${INTEL_X86_RPMS[@]} ) + fi + if [[ $(declare -p INTEL_X86_RPMS) = "declare -a "* ]] ; then + _INTEL_X86_RPMS=( ${INTEL_X86_RPMS[@]} ) + else + read -r -d '' -a _INTEL_X86_RPMS <<<"${INTEL_X86_RPMS}" + fi + for p in "${_INTEL_X86_RPMS[@]}"; do + if [ ${p} == $(basename ${p}) ]; then + INTEL_RPMS+=( intel-${p}-${_INTEL_PV}.${INTEL_X86}.rpm ) else - read -r -d '' -a _INTEL_X86_RPMS <<<"${INTEL_X86_RPMS}" + INTEL_RPMS_FULL+=( ${p}-${_INTEL_PV}.${INTEL_X86}.rpm ) fi - for p in "${_INTEL_X86_RPMS[@]}"; do - if [ ${p} == $(basename ${p}) ]; then - INTEL_RPMS+=( intel-${p}-${_INTEL_PV4}-${_INTEL_PV1}.${_INTEL_PV2}-${_INTEL_PV3}.ia32.rpm ) - else - INTEL_RPMS_FULL+=( ${p}-${_INTEL_PV4}-${_INTEL_PV1}.${_INTEL_PV2}-${_INTEL_PV3}.ia32.rpm ) - fi - done - fi + done if [[ $(declare -p INTEL_DAT_RPMS) = "declare -a "* ]] ; then _INTEL_DAT_RPMS=( ${INTEL_DAT_RPMS[@]} ) else @@ -407,9 +414,9 @@ intel-sdp_pkg_setup() { fi for p in "${_INTEL_DAT_RPMS[@]}"; do if [ ${p} == $(basename ${p}) ]; then - INTEL_RPMS+=( intel-${p}-${_INTEL_PV4}-${_INTEL_PV1}.${_INTEL_PV2}-${_INTEL_PV3}.noarch.rpm ) + INTEL_RPMS+=( intel-${p}-${_INTEL_PV}.noarch.rpm ) else - INTEL_RPMS_FULL+=( ${p}-${_INTEL_PV4}-${_INTEL_PV1}.${_INTEL_PV2}-${_INTEL_PV3}.noarch.rpm ) + INTEL_RPMS_FULL+=( ${p}-${_INTEL_PV}.noarch.rpm ) fi done }