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-musl-limits.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-musl-limits.patch')
-rw-r--r-- | meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-limits.patch | 133 |
1 files changed, 133 insertions, 0 deletions
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 new file mode 100644 index 0000000000..25ca415155 --- /dev/null +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-musl-limits.patch | |||
@@ -0,0 +1,133 @@ | |||
1 | Fixed: | ||
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 | |||
8 | Upstream-Status: Pending [https://git.alpinelinux.org/cgit/aports/tree/main/nfs-utils/limits.patch?id=f6734a77d3caee73325f8cc1f77d1b5117a75096] | ||
9 | |||
10 | Signed-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 | |||
24 | diff --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" | ||
35 | diff --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" | ||
46 | diff --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" | ||
57 | diff --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" /* _() */ | ||
68 | diff --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" | ||
79 | diff --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 | ||
90 | diff --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" | ||
101 | diff --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" | ||
112 | diff --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" | ||
123 | diff --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" | ||