Signed-off-by: Ross Burton <[email protected]> --- .../files/bugfix-adjust-statd-service-name.patch | 15 ++++++--------- ...nfigure-Allow-to-explicitly-disable-nfsidmap.patch | 19 ++++++++----------- .../nfs-utils-1.2.3-sm-notify-res_init.patch | 11 ++++++----- 3 files changed, 20 insertions(+), 25 deletions(-)
diff --git a/meta/recipes-connectivity/nfs-utils/files/bugfix-adjust-statd-service-name.patch b/meta/recipes-connectivity/nfs-utils/files/bugfix-adjust-statd-service-name.patch index 14bd4036af4..822939f0d24 100644 --- a/meta/recipes-connectivity/nfs-utils/files/bugfix-adjust-statd-service-name.patch +++ b/meta/recipes-connectivity/nfs-utils/files/bugfix-adjust-statd-service-name.patch @@ -16,11 +16,11 @@ Signed-off-by: Ulrich Ölmann <[email protected]> utils/statd/start-statd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/utils/statd/start-statd b/utils/statd/start-statd -index 8211a90..3c2aa6f 100755 ---- a/utils/statd/start-statd -+++ b/utils/statd/start-statd -@@ -16,7 +16,7 @@ fi +Index: nfs-utils-2.1.1/utils/statd/start-statd +=================================================================== +--- nfs-utils-2.1.1.orig/utils/statd/start-statd ++++ nfs-utils-2.1.1/utils/statd/start-statd +@@ -28,7 +28,7 @@ fi # First try systemd if it's installed. if [ -d /run/systemd/system ]; then # Quit only if the call worked. @@ -28,7 +28,4 @@ index 8211a90..3c2aa6f 100755 + systemctl start nfs-statd.service && exit fi - # Fall back to launching it ourselves. --- -2.1.4 - + cd / 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 index 7025fb555cb..26b558c81fe 100644 --- 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 @@ -12,11 +12,11 @@ Signed-off-by: Martin Jansa <[email protected]> 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, +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"]) @@ -27,9 +27,9 @@ index bf433d6..28a8f62 100644 + enable_nfsidmap=yes) + AC_ARG_ENABLE(nfsv41, - [AC_HELP_STRING([--enable-nfsv41], - [enable support for NFSv41 @<:@default=yes@:>@])], -@@ -296,7 +302,7 @@ fi + [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" ]) @@ -38,6 +38,3 @@ index bf433d6..28a8f62 100644 if test "$knfsd_cv_glibc2" = no; then --- -1.8.4.3 - diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch index d8f81816701..89a8a572602 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch @@ -13,9 +13,10 @@ Upstream-Status: Pending Signed-off-by: Khem Raj <[email protected]> -diff -up nfs-utils-1.2.3/utils/statd/sm-notify.c.orig nfs-utils-1.2.3/utils/statd/sm-notify.c ---- nfs-utils-1.2.3/utils/statd/sm-notify.c.orig 2010-09-28 08:24:16.000000000 -0400 -+++ nfs-utils-1.2.3/utils/statd/sm-notify.c 2010-10-15 16:44:43.487119601 -0400 +Index: nfs-utils-2.1.1/utils/statd/sm-notify.c +=================================================================== +--- nfs-utils-2.1.1.orig/utils/statd/sm-notify.c ++++ nfs-utils-2.1.1/utils/statd/sm-notify.c @@ -28,6 +28,9 @@ #include <netdb.h> #include <errno.h> @@ -24,9 +25,9 @@ diff -up nfs-utils-1.2.3/utils/statd/sm-notify.c.orig nfs-utils-1.2.3/utils/stat +#include <arpa/nameser.h> +#include <resolv.h> + #include "conffile.h" #include "sockaddr.h" - #include "xlog.h" -@@ -84,6 +87,7 @@ smn_lookup(const char *name) +@@ -89,6 +92,7 @@ smn_lookup(const char *name) }; int error; -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
