From 19985178e7bd01234d93b6b97071f193ed29b2b3 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Wed, 28 Aug 2019 19:04:57 +0800 Subject: nfs-utils: 2.3.3 -> 2.4.1 - Remove 0001-Do-not-pass-null-pointer-to-freeaddrinfo.patch, the new api can check the pointer before free it. - Rmove 0001-makefile.am-update-the-path-of-libnfs.a.patch, it is already in the source. - Rmove nfs-utils-musl-limits.patch, it is already fixed. - Rebased the following patches: 0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch 0001-configure.ac-Do-not-fatalize-Wmissing-prototypes.patch bugfix-adjust-statd-service-name.patch nfs-utils-musl-res_querydomain.patch (From OE-Core rev: 5601523e16ebd35d7de8d22ec5590618ea9f7ffb) Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- .../bugfix-adjust-statd-service-name.patch | 30 ++++++++++++++-------- 1 file changed, 19 insertions(+), 11 deletions(-) (limited to 'meta/recipes-connectivity/nfs-utils/nfs-utils/bugfix-adjust-statd-service-name.patch') diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/bugfix-adjust-statd-service-name.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/bugfix-adjust-statd-service-name.patch index 822939f0d2..f13d7b380c 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/bugfix-adjust-statd-service-name.patch +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/bugfix-adjust-statd-service-name.patch @@ -12,20 +12,28 @@ instead but forgot to update the mount.nfs helper 'start-statd' accordingly. Upstream-Status: Inappropriate [other] Signed-off-by: Ulrich Ölmann + +Rebase it. + +Signed-off-by: Robert Yang --- - utils/statd/start-statd | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + utils/statd/start-statd | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) -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 +diff --git a/utils/statd/start-statd b/utils/statd/start-statd +index af5c950..df9b9be 100755 +--- a/utils/statd/start-statd ++++ b/utils/statd/start-statd +@@ -28,10 +28,10 @@ fi # First try systemd if it's installed. if [ -d /run/systemd/system ]; then # Quit only if the call worked. -- systemctl start rpc-statd.service && exit -+ systemctl start nfs-statd.service && exit +- if systemctl start rpc-statd.service; then ++ if systemctl start nfs-statd.service; then + # Ensure systemd knows not to stop rpc.statd or its dependencies + # on 'systemctl isolate ..' +- systemctl add-wants --runtime remote-fs.target rpc-statd.service ++ systemctl add-wants --runtime remote-fs.target nfs-statd.service + exit 0 + fi fi - - cd / -- cgit v1.2.3-54-g00ecf