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 1QU1Bw-0002Y6-OZ for garchives@archives.gentoo.org; Tue, 07 Jun 2011 18:39:52 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 06F481C12A; Tue, 7 Jun 2011 18:39:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id CE4DE1C08F for ; Tue, 7 Jun 2011 18:39:44 +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 3BAD81B4007 for ; Tue, 7 Jun 2011 18:39:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 984C28003E for ; Tue, 7 Jun 2011 18:39:43 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: Subject: [gentoo-commits] dev/dilfridge:ni-experimental commit in: eclass/ X-VCS-Repository: dev/dilfridge X-VCS-Files: eclass/ni-driver.eclass X-VCS-Directories: eclass/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: ec2c2d4b8d368dae661b6519823b9a689c83cb3a Date: Tue, 7 Jun 2011 18:39:43 +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: d1fdb238c39f244648f53a4544625c42 commit: ec2c2d4b8d368dae661b6519823b9a689c83cb3a Author: Andreas K. Huettel physik uni-r <= DOT> de> AuthorDate: Tue Jun 7 18:30:44 2011 +0000 Commit: Andreas H=C3=BCttel gentoo org> CommitDate: Tue Jun 7 18:30:44 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/dilfridge.git;= a=3Dcommit;h=3Dec2c2d4b [eclass] Fix the rpm selection --- eclass/ni-driver.eclass | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/eclass/ni-driver.eclass b/eclass/ni-driver.eclass index 39a5fd7..186c96b 100644 --- a/eclass/ni-driver.eclass +++ b/eclass/ni-driver.eclass @@ -105,17 +105,26 @@ ni-driver_src_unpack() { =09 # Then, search for the rpm files that were in there... if [ ${#NI_RPMFILES[*]} -eq 0 ]; then=20 + # no list given - use all for a in ${NI_TARDIRS} ; do=20 - NI_RPMFILES=3D$(find "${S}/${a}" -name "*.rpm"|sed -e "s#^${S}/##") + NI_RPMS=3D$(find "${S}/${a}" -name "*.rpm"|sed -e "s#^${S}/##") + done + else + NI_RPMS=3D"" + # find rpms matching the given globs + for g in ${NI_RPMFILES[@]} ; do + for a in ${NI_TARDIRS} ; do=20 + NI_RPMS+=3D"$(find "${S}/${a}" -name "${g}"|sed -e "s#^${S}/##") " + done done fi - einfo rpm file\(s\) for installation found: ${NI_RPMFILES[*]} + einfo rpm file\(s\) for installation found: ${NI_RPMS[*]} =20 # ... and unpack the rpm files, all into the default workdir - for a in ${NI_RPMFILES} ; do - mkdir -p "${S}/unpacked" - cd "${S}/unpacked" - rpm_unpack ./../${a} + mkdir -p "${S}/unpacked" + cd "${S}/unpacked" + for a in ${NI_RPMS} ; do + rpm_unpack "./../${a}" done =09 # reset S to new value