diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2018-06-26 15:59:00 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-05 11:39:06 +0100 |
commit | 6a51dbf9bbb9a8f78b7afa62da4db36e970ded55 (patch) | |
tree | e67ca205ecc97f838be683961346904e81a720e3 /meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch | |
parent | 0996eecb210c9a6e1ae63cb64f2f0b4fef04469d (diff) | |
download | poky-6a51dbf9bbb9a8f78b7afa62da4db36e970ded55.tar.gz |
nfs-utils: 2.1.1 -> 2.3.1
* Removed 001-configure-Allow-to-explicitly-disable-nfsidmap.patch,
the nfsidmap is enabled when --enable-nfsv4, so I added a
PACKAGECONFIG[nfsv4], and default is no since keyutils is not in oe-core by
default.
* Removed 0001-include-stdint.h-for-UINT16_MAX-definition.patch and
nfs-utils-1.2.3-sm-notify-res_init.patch since they are already in the
source.
* Taken two patches from git://git.alpinelinux.org/aports to fix build
with musl, and the nfs-utils-musl-res_querydomain.patch is for musl only.
(From OE-Core rev: 0b51ed606b2e7543b50dadae7c0822b0f0de77ef)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch')
-rw-r--r-- | meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch deleted file mode 100644 index 26b558c81f..0000000000 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | From 9b84cff305866abd150cf1a4c6e7e5ebf8a7eb3a Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Fri, 15 Nov 2013 23:21:35 +0100 | ||
4 | Subject: [PATCH] configure: Allow to explicitly disable nfsidmap | ||
5 | |||
6 | * keyutils availability is autodetected and builds aren't reproducible | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | |||
10 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
11 | --- | ||
12 | configure.ac | 10 +++++++++- | ||
13 | 1 file changed, 9 insertions(+), 1 deletion(-) | ||
14 | |||
15 | Index: nfs-utils-2.1.1/configure.ac | ||
16 | =================================================================== | ||
17 | --- nfs-utils-2.1.1.orig/configure.ac | ||
18 | +++ nfs-utils-2.1.1/configure.ac | ||
19 | @@ -92,6 +92,12 @@ AC_ARG_ENABLE(nfsv4, | ||
20 | AC_SUBST(enable_nfsv4) | ||
21 | AM_CONDITIONAL(CONFIG_NFSV4, [test "$enable_nfsv4" = "yes"]) | ||
22 | |||
23 | +AC_ARG_ENABLE(nfsidmap, | ||
24 | + [AC_HELP_STRING([--enable-nfsidmap], | ||
25 | + [enable support for NFSv4 idmapper @<:@default=yes@:>@])], | ||
26 | + enable_nfsidmap=$enableval, | ||
27 | + enable_nfsidmap=yes) | ||
28 | + | ||
29 | AC_ARG_ENABLE(nfsv41, | ||
30 | [AC_HELP_STRING([--disable-nfsv41], | ||
31 | [disable support for NFSv41 @<:@default=no@:>@])], | ||
32 | @@ -339,7 +345,7 @@ fi | ||
33 | |||
34 | dnl enable nfsidmap when its support by libnfsidmap | ||
35 | AM_CONDITIONAL(CONFIG_NFSDCLTRACK, [test "$enable_nfsdcltrack" = "yes" ]) | ||
36 | -AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyes"]) | ||
37 | +AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$enable_nfsidmap$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyesyes"]) | ||
38 | |||
39 | |||
40 | if test "$knfsd_cv_glibc2" = no; then | ||