summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2019-08-28 19:04:57 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-30 17:10:28 +0100
commit19985178e7bd01234d93b6b97071f193ed29b2b3 (patch)
treebdbb5dbaa0b2765fd90aaf07d70a8dca6c949b7d
parentd6094e1e4e49be02932a757373e8b01e97ff3709 (diff)
downloadpoky-19985178e7bd01234d93b6b97071f193ed29b2b3.tar.gz
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 <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Do-not-pass-null-pointer-to-freeaddrinfo.patch32
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch22
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-update-the-path-of-libnfs.a.patch50
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-Do-not-fatalize-Wmissing-prototypes.patch9
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils/bugfix-adjust-statd-service-name.patch30
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-limits.patch133
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch23
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.1.bb (renamed from meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.3.bb)10
8 files changed, 41 insertions, 268 deletions
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Do-not-pass-null-pointer-to-freeaddrinfo.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Do-not-pass-null-pointer-to-freeaddrinfo.patch
deleted file mode 100644
index a44d1bf2fe..0000000000
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Do-not-pass-null-pointer-to-freeaddrinfo.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From 4f115fc314646500f7b4178d7248a02654c7cd10 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 30 Nov 2018 16:47:57 -0800
4Subject: [PATCH] Do not pass null pointer to freeaddrinfo()
5
6Passing null pointer as input parameter to freeaddrinfo() is undefined
7behaviour, some libcs e.g. glibc might just call free() which does
8accept null pointer but other libcs e.g. musl might not and instead
9cause the program to segfault. Therefore do not rely on undefined
10behaviour instead make it deterministic
11
12Upstream-Status: Pending
13
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16 support/export/client.c | 3 ++-
17 1 file changed, 2 insertions(+), 1 deletion(-)
18
19Index: nfs-utils-2.3.2/support/export/client.c
20===================================================================
21--- nfs-utils-2.3.2.orig/support/export/client.c
22+++ nfs-utils-2.3.2/support/export/client.c
23@@ -309,7 +309,8 @@ client_lookup(char *hname, int canonical
24 init_addrlist(clp, ai);
25
26 out:
27- freeaddrinfo(ai);
28+ if (ai)
29+ freeaddrinfo(ai);
30 return clp;
31 }
32
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch
index aa551ebd19..fcb0e99b33 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch
@@ -22,25 +22,28 @@ so rename ../support/misc/file.c to ../support/misc/misc.c.
22Upstream-Status: Submitted[https://marc.info/?l=linux-nfs&m=154502780423058&w=2] 22Upstream-Status: Submitted[https://marc.info/?l=linux-nfs&m=154502780423058&w=2]
23 23
24Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> 24Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
25
26Rebase it.
27
28Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
25--- 29---
26 support/misc/Makefile.am | 2 +- 30 support/misc/Makefile.am | 2 +-
27 support/misc/file.c | 111 ----------------------------------------------- 31 support/misc/file.c | 111 ---------------------------------------------------------------------------------------------------------------
28 support/misc/misc.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++ 32 support/misc/misc.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
29 support/nsm/Makefile.am | 2 +- 33 support/nsm/Makefile.am | 2 +-
30 4 files changed, 113 insertions(+), 113 deletions(-) 34 4 files changed, 113 insertions(+), 113 deletions(-)
31 delete mode 100644 support/misc/file.c
32 create mode 100644 support/misc/misc.c
33 35
34diff --git a/support/misc/Makefile.am b/support/misc/Makefile.am 36diff --git a/support/misc/Makefile.am b/support/misc/Makefile.am
35index 8936b0d..d4c1f76 100644 37index f9993e3..8b0e9db 100644
36--- a/support/misc/Makefile.am 38--- a/support/misc/Makefile.am
37+++ b/support/misc/Makefile.am 39+++ b/support/misc/Makefile.am
38@@ -1,6 +1,6 @@ 40@@ -1,7 +1,7 @@
39 ## Process this file with automake to produce Makefile.in 41 ## Process this file with automake to produce Makefile.in
40 42
41 noinst_LIBRARIES = libmisc.a 43 noinst_LIBRARIES = libmisc.a
42-libmisc_a_SOURCES = tcpwrapper.c from_local.c mountpoint.c file.c 44-libmisc_a_SOURCES = tcpwrapper.c from_local.c mountpoint.c file.c \
43+libmisc_a_SOURCES = tcpwrapper.c from_local.c mountpoint.c misc.c 45+libmisc_a_SOURCES = tcpwrapper.c from_local.c mountpoint.c misc.c \
46 nfsd_path.c workqueue.c xstat.c
44 47
45 MAINTAINERCLEANFILES = Makefile.in 48 MAINTAINERCLEANFILES = Makefile.in
46diff --git a/support/misc/file.c b/support/misc/file.c 49diff --git a/support/misc/file.c b/support/misc/file.c
@@ -290,6 +293,3 @@ index 8f5874e..68f1a46 100644
290 293
291 BUILT_SOURCES = $(GENFILES) 294 BUILT_SOURCES = $(GENFILES)
292 295
293--
2942.7.4
295
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-update-the-path-of-libnfs.a.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-update-the-path-of-libnfs.a.patch
deleted file mode 100644
index 906ac0f905..0000000000
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-update-the-path-of-libnfs.a.patch
+++ /dev/null
@@ -1,50 +0,0 @@
1From fcece65d1b713eaeef41706898440302f8ce92d9 Mon Sep 17 00:00:00 2001
2From: Mingli Yu <Mingli.Yu@windriver.com>
3Date: Thu, 12 Jul 2018 15:19:41 +0800
4Subject: [PATCH] Makefile.am: update the path of libnfs.a
5
6The libnfs.a is under ../support/nfs/.libs/ now,
7update the reference path accordingly to fix below
8build error when run "make -C tests statdb_dump":
9| make: *** No rule to make target '../support/nfs/libnfs.a', needed by 'statdb_dump'. Stop.
10
11And below error when run "make -C tests/nsm_client nsm_client"
12| make: *** No rule to make target '../../support/nfs/libnfs.a', needed by 'nsm_client'. Stop.
13
14Upstream-Status: Submitted[https://marc.info/?l=linux-nfs&m=154502636522745&w=2]
15
16Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
17---
18 tests/Makefile.am | 2 +-
19 tests/nsm_client/Makefile.am | 2 +-
20 2 files changed, 2 insertions(+), 2 deletions(-)
21
22diff --git a/tests/Makefile.am b/tests/Makefile.am
23index 1f96264..74aa629 100644
24--- a/tests/Makefile.am
25+++ b/tests/Makefile.am
26@@ -3,7 +3,7 @@
27 check_PROGRAMS = statdb_dump
28 statdb_dump_SOURCES = statdb_dump.c
29
30-statdb_dump_LDADD = ../support/nfs/libnfs.a \
31+statdb_dump_LDADD = ../support/nfs/.libs/libnfs.a \
32 ../support/nsm/libnsm.a $(LIBCAP)
33
34 SUBDIRS = nsm_client
35diff --git a/tests/nsm_client/Makefile.am b/tests/nsm_client/Makefile.am
36index a8fc131..43db9c2 100644
37--- a/tests/nsm_client/Makefile.am
38+++ b/tests/nsm_client/Makefile.am
39@@ -13,7 +13,7 @@ check_PROGRAMS = nsm_client
40 nsm_client_SOURCES = $(GENFILES) nsm_client.c
41
42 BUILT_SOURCES = $(GENFILES)
43-nsm_client_LDADD = ../../support/nfs/libnfs.a \
44+nsm_client_LDADD = ../../support/nfs/.libs/libnfs.a \
45 ../../support/nsm/libnsm.a $(LIBCAP) $(LIBTIRPC)
46
47 if CONFIG_RPCGEN
48--
492.7.4
50
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-Do-not-fatalize-Wmissing-prototypes.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-Do-not-fatalize-Wmissing-prototypes.patch
index 17aabb9e4d..d14f0789ff 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-Do-not-fatalize-Wmissing-prototypes.patch
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-Do-not-fatalize-Wmissing-prototypes.patch
@@ -26,18 +26,15 @@ Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
26 1 file changed, 1 insertion(+), 1 deletion(-) 26 1 file changed, 1 insertion(+), 1 deletion(-)
27 27
28diff --git a/configure.ac b/configure.ac 28diff --git a/configure.ac b/configure.ac
29index e82ff14..d0cc5d5 100644 29index 50002b4..aebff01 100644
30--- a/configure.ac 30--- a/configure.ac
31+++ b/configure.ac 31+++ b/configure.ac
32@@ -548,7 +548,7 @@ my_am_cflags="\ 32@@ -582,7 +582,7 @@ my_am_cflags="\
33 -Wall \ 33 -Wall \
34 -Wextra \ 34 -Wextra \
35 -Werror=strict-prototypes \ 35 $rpcgen_cflags \
36- -Werror=missing-prototypes \ 36- -Werror=missing-prototypes \
37+ -Wmissing-prototypes \ 37+ -Wmissing-prototypes \
38 -Werror=missing-declarations \ 38 -Werror=missing-declarations \
39 -Werror=format=2 \ 39 -Werror=format=2 \
40 -Werror=undef \ 40 -Werror=undef \
41--
422.7.4
43
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.
12Upstream-Status: Inappropriate [other] 12Upstream-Status: Inappropriate [other]
13 13
14Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de> 14Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
15
16Rebase it.
17
18Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
15--- 19---
16 utils/statd/start-statd | 2 +- 20 utils/statd/start-statd | 4 ++--
17 1 file changed, 1 insertion(+), 1 deletion(-) 21 1 file changed, 2 insertions(+), 2 deletions(-)
18 22
19Index: nfs-utils-2.1.1/utils/statd/start-statd 23diff --git a/utils/statd/start-statd b/utils/statd/start-statd
20=================================================================== 24index af5c950..df9b9be 100755
21--- nfs-utils-2.1.1.orig/utils/statd/start-statd 25--- a/utils/statd/start-statd
22+++ nfs-utils-2.1.1/utils/statd/start-statd 26+++ b/utils/statd/start-statd
23@@ -28,7 +28,7 @@ fi 27@@ -28,10 +28,10 @@ fi
24 # First try systemd if it's installed. 28 # First try systemd if it's installed.
25 if [ -d /run/systemd/system ]; then 29 if [ -d /run/systemd/system ]; then
26 # Quit only if the call worked. 30 # Quit only if the call worked.
27- systemctl start rpc-statd.service && exit 31- if systemctl start rpc-statd.service; then
28+ systemctl start nfs-statd.service && exit 32+ if systemctl start nfs-statd.service; then
33 # Ensure systemd knows not to stop rpc.statd or its dependencies
34 # on 'systemctl isolate ..'
35- systemctl add-wants --runtime remote-fs.target rpc-statd.service
36+ systemctl add-wants --runtime remote-fs.target nfs-statd.service
37 exit 0
38 fi
29 fi 39 fi
30
31 cd /
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-limits.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-limits.patch
deleted file mode 100644
index 25ca415155..0000000000
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-limits.patch
+++ /dev/null
@@ -1,133 +0,0 @@
1Fixed:
2| file.c: In function 'generic_make_pathname':
3| file.c:48:13: error: 'PATH_MAX' undeclared (first use in this function); did you mean 'RAND_MAX'?
4| if (size > PATH_MAX)
5| ^~~~~~~~
6[snip]
7
8Upstream-Status: Pending [https://git.alpinelinux.org/cgit/aports/tree/main/nfs-utils/limits.patch?id=f6734a77d3caee73325f8cc1f77d1b5117a75096]
9
10Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
11---
12 support/export/export.c | 1 +
13 support/export/xtab.c | 1 +
14 support/misc/file.c | 1 +
15 support/nfs/xcommon.c | 1 +
16 support/nsm/file.c | 1 +
17 utils/blkmapd/device-discovery.c | 1 +
18 utils/gssd/krb5_util.c | 1 +
19 utils/mountd/cache.c | 1 +
20 utils/mountd/mountd.c | 1 +
21 utils/mountd/rmtab.c | 1 +
22 10 files changed, 10 insertions(+)
23
24diff --git a/support/export/export.c b/support/export/export.c
25--- a/support/export/export.c
26+++ b/support/export/export.c
27@@ -17,6 +17,7 @@
28 #include <stdlib.h>
29 #include <dirent.h>
30 #include <errno.h>
31+#include <limits.h>
32 #include "xmalloc.h"
33 #include "nfslib.h"
34 #include "exportfs.h"
35diff --git a/support/export/xtab.c b/support/export/xtab.c
36--- a/support/export/xtab.c
37+++ b/support/export/xtab.c
38@@ -18,6 +18,7 @@
39 #include <sys/stat.h>
40 #include <errno.h>
41 #include <libgen.h>
42+#include <limits.h>
43
44 #include "nfslib.h"
45 #include "exportfs.h"
46diff --git a/support/misc/file.c b/support/misc/file.c
47--- a/support/misc/file.c
48+++ b/support/misc/file.c
49@@ -27,6 +27,7 @@
50 #include <dirent.h>
51 #include <stdlib.h>
52 #include <stdbool.h>
53+#include <limits.h>
54
55 #include "xlog.h"
56 #include "misc.h"
57diff --git a/support/nfs/xcommon.c b/support/nfs/xcommon.c
58--- a/support/nfs/xcommon.c
59+++ b/support/nfs/xcommon.c
60@@ -16,6 +16,7 @@
61 #include <stdio.h>
62 #include <stdlib.h>
63 #include <string.h>
64+#include <limits.h>
65
66 #include "xcommon.h"
67 #include "nls.h" /* _() */
68diff --git a/support/nsm/file.c b/support/nsm/file.c
69--- a/support/nsm/file.c
70+++ b/support/nsm/file.c
71@@ -85,6 +85,7 @@
72 #include <fcntl.h>
73 #include <dirent.h>
74 #include <grp.h>
75+#include <limits.h>
76
77 #include "xlog.h"
78 #include "nsm.h"
79diff --git a/utils/blkmapd/device-discovery.c b/utils/blkmapd/device-discovery.c
80--- a/utils/blkmapd/device-discovery.c
81+++ b/utils/blkmapd/device-discovery.c
82@@ -49,6 +49,7 @@
83 #include <unistd.h>
84 #include <libgen.h>
85 #include <errno.h>
86+#include <limits.h>
87 #include <libdevmapper.h>
88
89 #ifdef HAVE_CONFIG_H
90diff --git a/utils/gssd/krb5_util.c b/utils/gssd/krb5_util.c
91--- a/utils/gssd/krb5_util.c
92+++ b/utils/gssd/krb5_util.c
93@@ -120,6 +120,7 @@
94 #endif
95 #include <krb5.h>
96 #include <rpc/auth_gss.h>
97+#include <limits.h>
98
99 #include "gssd.h"
100 #include "err_util.h"
101diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
102--- a/utils/mountd/cache.c
103+++ b/utils/mountd/cache.c
104@@ -26,6 +26,7 @@
105 #include <pwd.h>
106 #include <grp.h>
107 #include <mntent.h>
108+#include <limits.h>
109 #include "misc.h"
110 #include "nfslib.h"
111 #include "exportfs.h"
112diff --git a/utils/mountd/mountd.c b/utils/mountd/mountd.c
113--- a/utils/mountd/mountd.c
114+++ b/utils/mountd/mountd.c
115@@ -22,6 +22,7 @@
116 #include <fcntl.h>
117 #include <sys/resource.h>
118 #include <sys/wait.h>
119+#include <limits.h>
120
121 #include "conffile.h"
122 #include "xmalloc.h"
123diff --git a/utils/mountd/rmtab.c b/utils/mountd/rmtab.c
124--- a/utils/mountd/rmtab.c
125+++ b/utils/mountd/rmtab.c
126@@ -16,6 +16,7 @@
127 #include <netinet/in.h>
128 #include <arpa/inet.h>
129 #include <netdb.h>
130+#include <limits.h>
131
132 #include "misc.h"
133 #include "exportfs.h"
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch
index 22002fadca..921f5edc82 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-res_querydomain.patch
@@ -11,30 +11,19 @@ Upstream-Status: Pending [https://github.com/alpinelinux/aports/blob/master/main
11Signed-off-by: Robert Yang <liezhi.yang@windriver.com> 11Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
12 12
13--- 13---
14 configure.ac | 13 ++++++------- 14 configure.ac | 9 ++++-----
15 1 file changed, 6 insertions(+), 7 deletions(-) 15 1 file changed, 4 insertions(+), 5 deletions(-)
16 16
17diff --git a/configure.ac b/configure.ac 17diff --git a/configure.ac b/configure.ac
18index 276dec3..760238b 100644 18index 50002b4..dcadb23 100644
19--- a/configure.ac 19--- a/configure.ac
20+++ b/configure.ac 20+++ b/configure.ac
21@@ -408,7 +408,7 @@ if test "$enable_gss" = yes; then 21@@ -582,10 +582,10 @@ my_am_cflags="\
22 fi
23
24 dnl libdnsidmap specific checks
25-AC_CHECK_LIB([resolv], [__res_querydomain], , AC_MSG_ERROR(res_querydomain needed))
26+AC_CHECK_LIB([resolv], [res_querydomain], , AC_MSG_ERROR(res_querydomain needed))
27
28 AC_ARG_ENABLE([ldap],
29 [AS_HELP_STRING([--disable-ldap],[Disable support for LDAP @<:default=detect@:>@])])
30@@ -547,11 +547,11 @@ my_am_cflags="\
31 -pipe \
32 -Wall \ 22 -Wall \
33 -Wextra \ 23 -Wextra \
34- -Werror=strict-prototypes \ 24 $rpcgen_cflags \
35- -Werror=missing-prototypes \ 25- -Werror=missing-prototypes \
36- -Werror=missing-declarations \ 26- -Werror=missing-declarations \
37+ -Wstrict-prototypes \
38+ -Wmissing-prototypes \ 27+ -Wmissing-prototypes \
39+ -Wmissing-declarations \ 28+ -Wmissing-declarations \
40 -Werror=format=2 \ 29 -Werror=format=2 \
@@ -43,7 +32,7 @@ index 276dec3..760238b 100644
43 -Werror=missing-include-dirs \ 32 -Werror=missing-include-dirs \
44 -Werror=strict-aliasing=2 \ 33 -Werror=strict-aliasing=2 \
45 -Werror=init-self \ 34 -Werror=init-self \
46@@ -579,10 +579,9 @@ AC_DEFUN([CHECK_CCSUPPORT], [ 35@@ -614,10 +614,9 @@ AC_DEFUN([CHECK_CCSUPPORT], [
47 36
48 CHECK_CCSUPPORT([-Werror=format-overflow=2], [flg1]) 37 CHECK_CCSUPPORT([-Werror=format-overflow=2], [flg1])
49 CHECK_CCSUPPORT([-Werror=int-conversion], [flg2]) 38 CHECK_CCSUPPORT([-Werror=int-conversion], [flg2])
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.3.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.1.bb
index 28f98980d4..8b673c8f5f 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.3.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.1.bb
@@ -28,19 +28,16 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x
28 file://proc-fs-nfsd.mount \ 28 file://proc-fs-nfsd.mount \
29 file://nfs-utils-debianize-start-statd.patch \ 29 file://nfs-utils-debianize-start-statd.patch \
30 file://bugfix-adjust-statd-service-name.patch \ 30 file://bugfix-adjust-statd-service-name.patch \
31 file://nfs-utils-musl-limits.patch \
32 file://0001-cacheio-use-intmax_t-for-formatted-IO.patch \ 31 file://0001-cacheio-use-intmax_t-for-formatted-IO.patch \
33 file://0001-Do-not-pass-null-pointer-to-freeaddrinfo.patch \
34 file://clang-format-string.patch \ 32 file://clang-format-string.patch \
35 file://0001-Makefile.am-update-the-path-of-libnfs.a.patch \
36 file://0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch \ 33 file://0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch \
37 file://0001-Don-t-build-tools-with-CC_FOR_BUILD.patch \ 34 file://0001-Don-t-build-tools-with-CC_FOR_BUILD.patch \
38" 35"
39SRC_URI_append_libc-glibc = " file://0001-configure.ac-Do-not-fatalize-Wmissing-prototypes.patch" 36SRC_URI_append_libc-glibc = " file://0001-configure.ac-Do-not-fatalize-Wmissing-prototypes.patch"
40SRC_URI_append_libc-musl = " file://nfs-utils-musl-res_querydomain.patch" 37SRC_URI_append_libc-musl = " file://nfs-utils-musl-res_querydomain.patch"
41 38
42SRC_URI[md5sum] = "b6c9c032995af1c08fea9fbcc1ce33e9" 39SRC_URI[md5sum] = "161efe469ec1b06f1c750bd87f8ba6dd"
43SRC_URI[sha256sum] = "f68b34793831b05f1fd5760d6bdec92772c7684177586a99a61e7b444f336322" 40SRC_URI[sha256sum] = "85274ada94479b1beba9f8eeffd19f477c53a6710b9998d1192c807854087736"
44 41
45# Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will 42# Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will
46# pull in the remainder of the dependencies. 43# pull in the remainder of the dependencies.
@@ -108,9 +105,6 @@ FILES_${PN} += "${systemd_unitdir}"
108do_configure_prepend() { 105do_configure_prepend() {
109 sed -i -e 's,sbindir = /sbin,sbindir = ${base_sbindir},g' \ 106 sed -i -e 's,sbindir = /sbin,sbindir = ${base_sbindir},g' \
110 ${S}/utils/mount/Makefile.am 107 ${S}/utils/mount/Makefile.am
111
112 sed -i -e 's,sbindir = /sbin,sbindir = ${base_sbindir},g' \
113 ${S}/utils/osd_login/Makefile.am
114} 108}
115 109
116# Make clean needed because the package comes with 110# Make clean needed because the package comes with