sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

nfs-utils: Add new option to disable nfsidmap and PACKAGECONFIG for that 

* it's autodetecting keyutils from meta-ivi

(From OE-Core rev: 64d04c7449f47cc49468b54cd6529700e0c7a608)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Martin Jansa 2013-11-16 02:22:39 +01:00 committed by Richard Purdie
parent 9a9a597193
commit 51feb29411
2 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch Normal file
View File

@ -0,0 +1,43 @@
From 9b84cff305866abd150cf1a4c6e7e5ebf8a7eb3a Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Fri, 15 Nov 2013 23:21:35 +0100
Subject: [PATCH] configure: Allow to explicitly disable nfsidmap
* keyutils availability is autodetected and builds aren't reproducible
Upstream-Status: Pending
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
configure.ac | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index bf433d6..28a8f62 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,6 +69,12 @@ AC_ARG_ENABLE(nfsv4,
AC_SUBST(enable_nfsv4)
AM_CONDITIONAL(CONFIG_NFSV4, [test "$enable_nfsv4" = "yes"])
+AC_ARG_ENABLE(nfsidmap,
+ [AC_HELP_STRING([--enable-nfsidmap],
+ [enable support for NFSv4 idmapper @<:@default=yes@:>@])],
+ enable_nfsidmap=$enableval,
+ enable_nfsidmap=yes)
+
AC_ARG_ENABLE(nfsv41,
[AC_HELP_STRING([--enable-nfsv41],
[enable support for NFSv41 @<:@default=yes@:>@])],
@@ -296,7 +302,7 @@ fi
dnl enable nfsidmap when its support by libnfsidmap
AM_CONDITIONAL(CONFIG_NFSDCLTRACK, [test "$enable_nfsdcltrack" = "yes" ])
-AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyes"])
+AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$enable_nfsidmap$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyesyes"])
if test "$knfsd_cv_glibc2" = no; then
--
1.8.4.3

2
meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.9.bb
View File

@ -13,6 +13,7 @@ RDEPENDS_${PN} = "rpcbind"
RRECOMMENDS_${PN} = "kernel-module-nfsd"
SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.bz2 \
file://0001-configure-Allow-to-explicitly-disable-nfsidmap.patch \
file://nfs-utils-1.0.6-uclibc.patch \
file://nfs-utils-1.2.3-sm-notify-res_init.patch \
file://nfsserver \
@ -54,6 +55,7 @@ EXTRA_OECONF = "--with-statduser=nobody \
PACKAGECONFIG ??= "tcp-wrappers"
PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,--without-tcp-wrappers,tcp-wrappers"
PACKAGECONFIG[nfsidmap] = "--enable-nfsidmap,--disable-nfsidmap,keyutils"
INHIBIT_AUTO_STAGE = "1"