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 74F39138200 for ; Mon, 22 Apr 2013 01:40:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D80AEE0B8D; Mon, 22 Apr 2013 01:40:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3AAE6E0B89 for ; Mon, 22 Apr 2013 01:40:36 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5217033DEE2 for ; Mon, 22 Apr 2013 01:40:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E751EE4405 for ; Mon, 22 Apr 2013 01:40:33 +0000 (UTC) From: "Christoph Junghans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Christoph Junghans" Message-ID: <1366207506.98e36ab78572b7f4ae926cb1f6f5737b5f6a5efe.ottxor@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sys-cluster/lustre/ X-VCS-Repository: proj/sci X-VCS-Files: sys-cluster/lustre/lustre-9999.ebuild X-VCS-Directories: sys-cluster/lustre/ X-VCS-Committer: ottxor X-VCS-Committer-Name: Christoph Junghans X-VCS-Revision: 98e36ab78572b7f4ae926cb1f6f5737b5f6a5efe X-VCS-Branch: master Date: Mon, 22 Apr 2013 01:40:33 +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: 10a37844-015e-4bb4-b1f5-fe8f8a3b0c9b X-Archives-Hash: 31e9ba2b68e5d38f009af96c2f47b408 commit: 98e36ab78572b7f4ae926cb1f6f5737b5f6a5efe Author: Richard Yao gentoo org> AuthorDate: Wed Apr 17 14:05:06 2013 +0000 Commit: Christoph Junghans gentoo org> CommitDate: Wed Apr 17 14:05:06 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=98e36ab7 Pass correct SPL and ZFS kernel header directories This change enables lustre to find the kernel headers installed by >=sys-kernel/spl-0.6.1 and >=sys-fs/zfs-kmod-0.6.1. It also eliminates the need for those ebuilds to install symlinks as a hint to lustre. Signed-off-by: Richard Yao gentoo.org> --- sys-cluster/lustre/lustre-9999.ebuild | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sys-cluster/lustre/lustre-9999.ebuild b/sys-cluster/lustre/lustre-9999.ebuild index a40cd65..6171413 100644 --- a/sys-cluster/lustre/lustre-9999.ebuild +++ b/sys-cluster/lustre/lustre-9999.ebuild @@ -25,8 +25,8 @@ DEPEND=" readline? ( sys-libs/readline ) tcpd? ( sys-apps/tcp-wrappers ) server? ( - sys-kernel/spl - sys-fs/zfs-kmod + >=sys-kernel/spl-0.6.1 + >=sys-fs/zfs-kmod-0.6.1 sys-fs/zfs ) " @@ -100,8 +100,10 @@ src_prepare() { src_configure() { local myconf if use server; then - myconf+="${myconf} --with-zfs=\"${EPREFIX}/usr/src/zfs\"" - myconf+="${myconf} --with-spl=\"${EPREFIX}/usr/src/spl\"" + SPL_PATH=$(basename $(echo "${EROOT}usr/src/spl-"*)) \ + myconf+="${myconf} --with-spl=\"${EROOT}usr/src/${SPL_PATH}\"" + ZFS_PATH=$(basename $(echo "${EROOT}usr/src/zfs-"*)) \ + myconf+="${myconf} --with-zfs=\"${EROOT}usr/src/${ZFS_PATH}\"" fi econf \ ${myconf} \