From 6a51dbf9bbb9a8f78b7afa62da4db36e970ded55 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Tue, 26 Jun 2018 15:59:00 +0800 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- ...gure-Allow-to-explicitly-disable-nfsidmap.patch | 40 ---------------------- 1 file changed, 40 deletions(-) delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch (limited to 'meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch') 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 @@ -From 9b84cff305866abd150cf1a4c6e7e5ebf8a7eb3a Mon Sep 17 00:00:00 2001 -From: Martin Jansa -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 ---- - configure.ac | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -Index: nfs-utils-2.1.1/configure.ac -=================================================================== ---- nfs-utils-2.1.1.orig/configure.ac -+++ nfs-utils-2.1.1/configure.ac -@@ -92,6 +92,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([--disable-nfsv41], - [disable support for NFSv41 @<:@default=no@:>@])], -@@ -339,7 +345,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 -- cgit v1.2.3-54-g00ecf