From patchwork Sat Aug 11 17:40:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 176707 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id AC6792C00A8 for ; Sun, 12 Aug 2012 03:43:04 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id BA054A02C2; Sat, 11 Aug 2012 17:43:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ohw1FQGPZdIb; Sat, 11 Aug 2012 17:42:57 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 8D6DAA063A; Sat, 11 Aug 2012 17:41:44 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 6CD238F753 for ; Sat, 11 Aug 2012 17:41:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 62A8C101AAB for ; Sat, 11 Aug 2012 17:41:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id soE4OUC3wlFe for ; Sat, 11 Aug 2012 17:41:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (mail.free-electrons.com [88.190.12.23]) by fraxinus.osuosl.org (Postfix) with ESMTP id F17F91026CF for ; Sat, 11 Aug 2012 17:41:41 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id 74899310; Sat, 11 Aug 2012 19:41:37 +0200 (CEST) Received: from localhost (37-8-187-107.coucou-networks.fr [37.8.187.107]) by mail.free-electrons.com (Postfix) with ESMTPSA id 0F98730A for ; Sat, 11 Aug 2012 19:41:29 +0200 (CEST) From: Thomas Petazzoni To: buildroot@busybox.net Date: Sat, 11 Aug 2012 19:40:44 +0200 Message-Id: <9c350a37f73599a90823de0dd3eb71b177c21717.1344706801.git.thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: In-Reply-To: References: Subject: [Buildroot] [PATCH 12/20] nfs-utils: add support to use RPC support from libtirpc X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Signed-off-by: Thomas Petazzoni --- package/nfs-utils/Config.in | 7 +++---- package/nfs-utils/nfs-utils.mk | 8 +++++++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/package/nfs-utils/Config.in b/package/nfs-utils/Config.in index c87502f..90d98af 100644 --- a/package/nfs-utils/Config.in +++ b/package/nfs-utils/Config.in @@ -1,8 +1,7 @@ config BR2_PACKAGE_NFS_UTILS bool "nfs-utils" - depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC + depends on BR2_RPC_SUPPORT_AVAILABLE depends on BR2_LARGEFILE - select BR2_PACKAGE_PORTMAP help The NFS Linux kernel server. Warning: We do not force largefile support on here on purpose. @@ -10,8 +9,8 @@ config BR2_PACKAGE_NFS_UTILS http://sourceforge.net/projects/nfs -comment "nfs-utils requires a toolchain with RPC and LARGEFILE support" - depends on !BR2_TOOLCHAIN_HAS_NATIVE_RPC || !BR2_LARGEFILE +comment "nfs-utils requires a toolchain with LARGEFILE support, and RPC (toolchain or libtirpc)" + depends on !BR2_RPC_SUPPORT_AVAILABLE || !BR2_LARGEFILE menu "NFS utilities selection" depends on BR2_PACKAGE_NFS_UTILS diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index c8795fb..3b97340 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -16,7 +16,6 @@ NFS_UTILS_CONF_OPT = \ --disable-nfsv4 \ --disable-nfsv41 \ --disable-gss \ - --disable-tirpc \ --disable-uuid \ --disable-ipv6 \ --without-tcp-wrappers \ @@ -26,6 +25,13 @@ NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPCDEBUG) += usr/sbin/rpcdebug NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_LOCKD) += usr/sbin/rpc.lockd NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_RQUOTAD) += usr/sbin/rpc.rquotad +ifeq ($(BR2_PACKAGE_LIBTIRPC),y) +NFS_UTILS_CONF_OPT += --enable-tirpc --with-tirpcinclude=$(STAGING_DIR)/usr/include/tirpc/ +NFS_UTILS_DEPENDENCIES += libtirpc +else +NFS_UTILS_CONF_OPT += --disable-tirpc +endif + define NFS_UTILS_INSTALL_FIXUP $(INSTALL) -m 0755 package/nfs-utils/S60nfs \ $(TARGET_DIR)/etc/init.d/S60nfs