diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2014-09-15 17:54:11 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2014-09-15 17:54:11 +0000 |
| commit | a72b12cd1c7be661f9b6713ed0f434c1c5abb5b0 (patch) | |
| tree | a04a36b50fa9b0d2ee852ea7be1f5b33623e23c5 /eclass | |
| parent | Install extra tools, including previous default ones as it becomes long list,... (diff) | |
| download | gentoo-2-a72b12cd1c7be661f9b6713ed0f434c1c5abb5b0.tar.gz gentoo-2-a72b12cd1c7be661f9b6713ed0f434c1c5abb5b0.tar.bz2 gentoo-2-a72b12cd1c7be661f9b6713ed0f434c1c5abb5b0.zip | |
Allow RPMS specified as array
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/intel-sdp.eclass | 20 |
2 files changed, 19 insertions, 6 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 729517123d7a..8d65307249bb 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.1368 2014/09/11 22:10:35 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1369 2014/09/15 17:54:11 jlec Exp $ + + 15 Sep 2014; Justin Lecher <jlec@gentoo.org> intel-sdp.eclass: + Allow RPMS specified as array 11 Sep 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org> +mozconfig-v4.31.eclass, -mozconfig-v4.eclass: diff --git a/eclass/intel-sdp.eclass b/eclass/intel-sdp.eclass index 6019168ef1a8..11400c66e430 100644 --- a/eclass/intel-sdp.eclass +++ b/eclass/intel-sdp.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/intel-sdp.eclass,v 1.17 2014/02/21 16:07:25 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.18 2014/09/15 17:54:11 jlec Exp $ # @ECLASS: intel-sdp.eclass # @MAINTAINER: @@ -348,7 +348,12 @@ intel-sdp_pkg_setup() { fi INTEL_RPMS=() INTEL_RPMS_FULL=() - for p in ${INTEL_BIN_RPMS}; do + if [[ $(declare -p INTEL_BIN_RPMS) = "declare -a "* ]] ; then + _INTEL_BIN_RPMS=( ${INTEL_BIN_RPMS[@]} ) + else + read -r -d '' -a _INTEL_BIN_RPMS <<<"${INTEL_BIN_RPMS}" + fi + 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 ) @@ -357,7 +362,12 @@ intel-sdp_pkg_setup() { fi done done - for p in ${INTEL_DAT_RPMS}; do + if [[ $(declare -p INTEL_DAT_RPMS) = "declare -a "* ]] ; then + _INTEL_DAT_RPMS=( ${INTEL_DAT_RPMS[@]} ) + else + read -r -d '' -a _INTEL_DAT_RPMS <<<"${INTEL_DAT_RPMS}" + 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 ) else @@ -373,12 +383,12 @@ intel-sdp_src_unpack() { local l r subdir rb t list=() debug_list for t in ${A}; do - for r in ${INTEL_RPMS[@]}; do + for r in "${INTEL_RPMS[@]}"; do rpmdir=${t%%.*}/${INTEL_RPMS_DIR} list+=( ${rpmdir}/${r} ) done - for r in ${INTEL_RPMS_FULL[@]}; do + for r in "${INTEL_RPMS_FULL[@]}"; do list+=( ${t%%.*}/${r} ) done |