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/nfs-utils-1.2.3-sm-notify-res_init.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/nfs-utils-1.2.3-sm-notify-res_init.patch')
-rw-r--r-- | meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch | 37 |
1 files changed, 0 insertions, 37 deletions
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 deleted file mode 100644 index 89a8a57260..0000000000 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | Fixes errors like | ||
2 | sm-notify[1070]: DNS resolution of a.b.c.d..com failed; retrying later | ||
3 | This error will occur anytime sm-notify is run before the network if fully up, | ||
4 | which is happening more and more with parallel startup systems. | ||
5 | The res_init() call is simple, safe, quick, and a patch to use it should be | ||
6 | able to go upstream. Presumably the whole reason sm-notify tries several | ||
7 | times is to wait for possible changes to the network configuration, but without | ||
8 | calling res_init() it will never be aware of those changes | ||
9 | |||
10 | Backported drom Fedora | ||
11 | |||
12 | Upstream-Status: Pending | ||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | |||
15 | |||
16 | Index: nfs-utils-2.1.1/utils/statd/sm-notify.c | ||
17 | =================================================================== | ||
18 | --- nfs-utils-2.1.1.orig/utils/statd/sm-notify.c | ||
19 | +++ nfs-utils-2.1.1/utils/statd/sm-notify.c | ||
20 | @@ -28,6 +28,9 @@ | ||
21 | #include <netdb.h> | ||
22 | #include <errno.h> | ||
23 | #include <grp.h> | ||
24 | +#include <netinet/in.h> | ||
25 | +#include <arpa/nameser.h> | ||
26 | +#include <resolv.h> | ||
27 | |||
28 | #include "conffile.h" | ||
29 | #include "sockaddr.h" | ||
30 | @@ -89,6 +92,7 @@ smn_lookup(const char *name) | ||
31 | }; | ||
32 | int error; | ||
33 | |||
34 | + res_init(); | ||
35 | error = getaddrinfo(name, NULL, &hint, &ai); | ||
36 | if (error != 0) { | ||
37 | xlog(D_GENERAL, "getaddrinfo(3): %s", gai_strerror(error)); | ||