diff options
Diffstat (limited to 'meta/recipes-connectivity/nfs-utils/nfs-utils')
7 files changed, 128 insertions, 1 deletions
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 bd350144e3..7603eb680d 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 | |||
@@ -19,7 +19,7 @@ As there is already one source file named file.c | |||
19 | as support/nsm/file.c in support/nsm/Makefile.am, | 19 | as support/nsm/file.c in support/nsm/Makefile.am, |
20 | so rename ../support/misc/file.c to ../support/misc/misc.c. | 20 | so rename ../support/misc/file.c to ../support/misc/misc.c. |
21 | 21 | ||
22 | Upstream-Status: Submitted[https://marc.info/?l=linux-nfs&m=154502780423058&w=2] | 22 | Upstream-Status: Submitted [https://marc.info/?l=linux-nfs&m=154502780423058&w=2] |
23 | 23 | ||
24 | Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> | 24 | Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> |
25 | 25 | ||
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-locktest-Makefile.am-Do-not-use-build-flags.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-locktest-Makefile.am-Do-not-use-build-flags.patch new file mode 100644 index 0000000000..351407ddcd --- /dev/null +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-locktest-Makefile.am-Do-not-use-build-flags.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From 9efa7a0d37665d9bb0f46d2407883a5ab42c2b84 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 24 Jul 2023 20:39:16 -0700 | ||
4 | Subject: [PATCH] locktest: Makefile.am: Do not use build flags | ||
5 | |||
6 | Using CFLAGS_FOR_BUILD etc. here means it is using wrong flags | ||
7 | when thse flags are speficied different than target flags which | ||
8 | is common when cross-building. It can pass wrong paths to linker | ||
9 | and it would find incompatible libraries during link since they | ||
10 | are from host system and target maybe not same as build host. | ||
11 | |||
12 | Fixes subtle errors like | ||
13 | | aarch64-yoe-linux-ld.lld: error: /mnt/b/yoe/master/build/tmp/work/cortexa72-cortexa53-crypto-yoe-linux/nfs-utils/2.6.3-r0/recipe-sysroot-native/usr/lib/libsqlite3.so is incompatible with elf64-littleaarch64 | ||
14 | |||
15 | Upstream-Status: Submitted [https://marc.info/?l=linux-nfs&m=169025681008001&w=2] | ||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
17 | --- | ||
18 | tools/locktest/Makefile.am | 3 --- | ||
19 | 1 file changed, 3 deletions(-) | ||
20 | |||
21 | diff --git a/tools/locktest/Makefile.am b/tools/locktest/Makefile.am | ||
22 | index e8914655..2fd36971 100644 | ||
23 | --- a/tools/locktest/Makefile.am | ||
24 | +++ b/tools/locktest/Makefile.am | ||
25 | @@ -2,8 +2,5 @@ | ||
26 | |||
27 | noinst_PROGRAMS = testlk | ||
28 | testlk_SOURCES = testlk.c | ||
29 | -testlk_CFLAGS=$(CFLAGS_FOR_BUILD) | ||
30 | -testlk_CPPFLAGS=$(CPPFLAGS_FOR_BUILD) | ||
31 | -testlk_LDFLAGS=$(LDFLAGS_FOR_BUILD) | ||
32 | |||
33 | MAINTAINERCLEANFILES = Makefile.in | ||
34 | -- | ||
35 | 2.41.0 | ||
36 | |||
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-reexport.h-Include-unistd.h-to-compile-with-musl.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-reexport.h-Include-unistd.h-to-compile-with-musl.patch new file mode 100644 index 0000000000..57d4660571 --- /dev/null +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-reexport.h-Include-unistd.h-to-compile-with-musl.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From 45597a58e98f351b18db8444292b1cf6dd0cd810 Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Sat, 9 Dec 2023 23:34:08 -0800 | ||
4 | Subject: [PATCH] reexport.h: Include unistd.h to compile with musl | ||
5 | |||
6 | Fixed error when compile with musl | ||
7 | reexport.c: In function 'reexpdb_init': | ||
8 | reexport.c:62:17: error: implicit declaration of function 'sleep' [-Werror=implicit-function-declaration] | ||
9 | 62 | sleep(1); | ||
10 | |||
11 | |||
12 | Upstream-Status: Submitted [https://marc.info/?l=linux-nfs&m=170254661824522&w=2] | ||
13 | |||
14 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
15 | --- | ||
16 | support/reexport/reexport.h | 1 + | ||
17 | 1 files changed, 1 insertions(+) | ||
18 | |||
19 | diff --git a/support/reexport/reexport.h b/support/reexport/reexport.h | ||
20 | index 85fd59c..02f8684 100644 | ||
21 | --- a/support/reexport/reexport.h | ||
22 | +++ b/support/reexport/reexport.h | ||
23 | @@ -1,6 +1,8 @@ | ||
24 | #ifndef REEXPORT_H | ||
25 | #define REEXPORT_H | ||
26 | |||
27 | +#include <unistd.h> | ||
28 | + | ||
29 | #include "nfslib.h" | ||
30 | |||
31 | enum { | ||
32 | -- | ||
33 | 2.42.0 | ||
34 | |||
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-tools-locktest-Use-intmax_t-to-print-off_t.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-tools-locktest-Use-intmax_t-to-print-off_t.patch new file mode 100644 index 0000000000..7d903e04bc --- /dev/null +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-tools-locktest-Use-intmax_t-to-print-off_t.patch | |||
@@ -0,0 +1,53 @@ | |||
1 | From e2e9251dbeb452f5382179023d8ae18b511167a1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 25 Jul 2023 23:47:08 -0700 | ||
4 | Subject: [PATCH] tools/locktest: Use intmax_t to print off_t | ||
5 | |||
6 | off_t could be 64bit on 32bit architectures which means using %z printf | ||
7 | modifier is not enough to print it and compiler will complain about | ||
8 | format mismatch | ||
9 | |||
10 | Fixes | ||
11 | | testlk.c:84:66: error: format '%zd' expects argument of type 'signed size_t', but argument 4 has type '__off64_t' {aka 'long long int'} [-Werror=format=] | ||
12 | | 84 | printf("%s: conflicting lock by %d on (%zd;%zd)\n", | ||
13 | | | ~~^ | ||
14 | | | | | ||
15 | | | int | ||
16 | | | %lld | ||
17 | | 85 | fname, fl.l_pid, fl.l_start, fl.l_len); | ||
18 | | | ~~~~~~~~~~ | ||
19 | | | | | ||
20 | | | __off64_t {aka long long int} | ||
21 | |||
22 | Upstream-Status: Submitted [https://marc.info/?l=linux-nfs&m=169035457128067&w=2] | ||
23 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
24 | --- | ||
25 | tools/locktest/testlk.c | 5 +++-- | ||
26 | 1 file changed, 3 insertions(+), 2 deletions(-) | ||
27 | |||
28 | diff --git a/tools/locktest/testlk.c b/tools/locktest/testlk.c | ||
29 | index ea51f788..9d4c88c4 100644 | ||
30 | --- a/tools/locktest/testlk.c | ||
31 | +++ b/tools/locktest/testlk.c | ||
32 | @@ -2,6 +2,7 @@ | ||
33 | #include <config.h> | ||
34 | #endif | ||
35 | |||
36 | +#include <stdint.h> | ||
37 | #include <stdlib.h> | ||
38 | #include <stdio.h> | ||
39 | #include <unistd.h> | ||
40 | @@ -81,8 +82,8 @@ main(int argc, char **argv) | ||
41 | if (fl.l_type == F_UNLCK) { | ||
42 | printf("%s: no conflicting lock\n", fname); | ||
43 | } else { | ||
44 | - printf("%s: conflicting lock by %d on (%zd;%zd)\n", | ||
45 | - fname, fl.l_pid, fl.l_start, fl.l_len); | ||
46 | + printf("%s: conflicting lock by %d on (%jd;%jd)\n", | ||
47 | + fname, fl.l_pid, (intmax_t)fl.l_start, (intmax_t)fl.l_len); | ||
48 | } | ||
49 | return 0; | ||
50 | } | ||
51 | -- | ||
52 | 2.41.0 | ||
53 | |||
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service index c01415de84..ebfe64b9ce 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service | |||
@@ -12,6 +12,7 @@ ConditionPathExists=@SYSCONFDIR@/exports | |||
12 | EnvironmentFile=-@SYSCONFDIR@/nfs-utils.conf | 12 | EnvironmentFile=-@SYSCONFDIR@/nfs-utils.conf |
13 | ExecStart=@SBINDIR@/rpc.mountd -F $MOUNTD_OPTS | 13 | ExecStart=@SBINDIR@/rpc.mountd -F $MOUNTD_OPTS |
14 | LimitNOFILE=@HIGH_RLIMIT_NOFILE@ | 14 | LimitNOFILE=@HIGH_RLIMIT_NOFILE@ |
15 | StateDirectory=nfs | ||
15 | 16 | ||
16 | [Install] | 17 | [Install] |
17 | WantedBy=multi-user.target | 18 | WantedBy=multi-user.target |
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service index 5c845b7e82..15ceee04d0 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service | |||
@@ -18,6 +18,7 @@ ExecStopPost=@SBINDIR@/exportfs -au | |||
18 | ExecStopPost=@SBINDIR@/exportfs -f | 18 | ExecStopPost=@SBINDIR@/exportfs -f |
19 | ExecReload=@SBINDIR@/exportfs -r | 19 | ExecReload=@SBINDIR@/exportfs -r |
20 | RemainAfterExit=yes | 20 | RemainAfterExit=yes |
21 | StateDirectory=nfs | ||
21 | 22 | ||
22 | [Install] | 23 | [Install] |
23 | WantedBy=multi-user.target | 24 | WantedBy=multi-user.target |
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service index 4fa64e1998..b519194121 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service | |||
@@ -4,11 +4,13 @@ DefaultDependencies=no | |||
4 | Conflicts=umount.target | 4 | Conflicts=umount.target |
5 | Requires=nss-lookup.target rpcbind.service | 5 | Requires=nss-lookup.target rpcbind.service |
6 | After=network.target nss-lookup.target rpcbind.service | 6 | After=network.target nss-lookup.target rpcbind.service |
7 | ConditionPathExists=@SYSCONFDIR@/exports | ||
7 | 8 | ||
8 | [Service] | 9 | [Service] |
9 | EnvironmentFile=-@SYSCONFDIR@/nfs-utils.conf | 10 | EnvironmentFile=-@SYSCONFDIR@/nfs-utils.conf |
10 | ExecStart=@SBINDIR@/rpc.statd -F $STATD_OPTS | 11 | ExecStart=@SBINDIR@/rpc.statd -F $STATD_OPTS |
11 | LimitNOFILE=@HIGH_RLIMIT_NOFILE@ | 12 | LimitNOFILE=@HIGH_RLIMIT_NOFILE@ |
13 | StateDirectory=nfs | ||
12 | 14 | ||
13 | [Install] | 15 | [Install] |
14 | WantedBy=multi-user.target | 16 | WantedBy=multi-user.target |