diff options
Diffstat (limited to 'meta/recipes-connectivity/nfs-utils')
-rw-r--r-- | meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch | 2 | ||||
-rw-r--r-- | meta/recipes-connectivity/nfs-utils/nfs-utils/0001-locktest-Makefile.am-Do-not-use-build-flags.patch | 36 | ||||
-rw-r--r-- | meta/recipes-connectivity/nfs-utils/nfs-utils/0001-reexport.h-Include-unistd.h-to-compile-with-musl.patch | 34 | ||||
-rw-r--r-- | meta/recipes-connectivity/nfs-utils/nfs-utils/0001-tools-locktest-Use-intmax_t-to-print-off_t.patch | 53 | ||||
-rw-r--r-- | meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service | 1 | ||||
-rw-r--r-- | meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service | 1 | ||||
-rw-r--r-- | meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service | 2 | ||||
-rw-r--r-- | meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb (renamed from meta/recipes-connectivity/nfs-utils/nfs-utils_2.5.2.bb) | 77 |
8 files changed, 171 insertions, 35 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 |
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.5.2.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb index c7ac67cf31..af7a74a5fb 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.5.2.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb | |||
@@ -4,18 +4,18 @@ NFS server and related tools." | |||
4 | HOMEPAGE = "http://nfs.sourceforge.net/" | 4 | HOMEPAGE = "http://nfs.sourceforge.net/" |
5 | SECTION = "console/network" | 5 | SECTION = "console/network" |
6 | 6 | ||
7 | LICENSE = "MIT & GPLv2+ & BSD" | 7 | LICENSE = "MIT & GPL-2.0-or-later & BSD-3-Clause" |
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=95f3a93a5c3c7888de623b46ea085a84" | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=95f3a93a5c3c7888de623b46ea085a84" |
9 | 9 | ||
10 | # util-linux for libblkid | 10 | # util-linux for libblkid |
11 | DEPENDS = "libcap libevent util-linux sqlite3 libtirpc" | 11 | DEPENDS = "libcap libevent util-linux sqlite3 libtirpc" |
12 | RDEPENDS_${PN} = "${PN}-client" | 12 | RDEPENDS:${PN} = "${PN}-client" |
13 | RRECOMMENDS_${PN} = "kernel-module-nfsd" | 13 | RRECOMMENDS:${PN} = "kernel-module-nfsd" |
14 | 14 | ||
15 | inherit useradd | 15 | inherit useradd |
16 | 16 | ||
17 | USERADD_PACKAGES = "${PN}-client" | 17 | USERADD_PACKAGES = "${PN}-client" |
18 | USERADD_PARAM_${PN}-client = "--system --home-dir /var/lib/nfs \ | 18 | USERADD_PARAM:${PN}-client = "--system --home-dir /var/lib/nfs \ |
19 | --shell /bin/false --user-group rpcuser" | 19 | --shell /bin/false --user-group rpcuser" |
20 | 20 | ||
21 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.xz \ | 21 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.xz \ |
@@ -30,8 +30,11 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x | |||
30 | file://bugfix-adjust-statd-service-name.patch \ | 30 | file://bugfix-adjust-statd-service-name.patch \ |
31 | file://0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch \ | 31 | file://0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch \ |
32 | file://clang-warnings.patch \ | 32 | file://clang-warnings.patch \ |
33 | file://0001-locktest-Makefile.am-Do-not-use-build-flags.patch \ | ||
34 | file://0001-tools-locktest-Use-intmax_t-to-print-off_t.patch \ | ||
35 | file://0001-reexport.h-Include-unistd.h-to-compile-with-musl.patch \ | ||
33 | " | 36 | " |
34 | SRC_URI[sha256sum] = "d493b81c9d3ffce5d10af701a63ed2b8a21768c23da4a2eceb4d708aea65d9de" | 37 | SRC_URI[sha256sum] = "01b3b0fb9c7d0bbabf5114c736542030748c788ec2fd9734744201e9b0a1119d" |
35 | 38 | ||
36 | # Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will | 39 | # Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will |
37 | # pull in the remainder of the dependencies. | 40 | # pull in the remainder of the dependencies. |
@@ -39,14 +42,14 @@ SRC_URI[sha256sum] = "d493b81c9d3ffce5d10af701a63ed2b8a21768c23da4a2eceb4d708aea | |||
39 | INITSCRIPT_PACKAGES = "${PN} ${PN}-client" | 42 | INITSCRIPT_PACKAGES = "${PN} ${PN}-client" |
40 | INITSCRIPT_NAME = "nfsserver" | 43 | INITSCRIPT_NAME = "nfsserver" |
41 | INITSCRIPT_PARAMS = "defaults" | 44 | INITSCRIPT_PARAMS = "defaults" |
42 | INITSCRIPT_NAME_${PN}-client = "nfscommon" | 45 | INITSCRIPT_NAME:${PN}-client = "nfscommon" |
43 | INITSCRIPT_PARAMS_${PN}-client = "defaults 19 21" | 46 | INITSCRIPT_PARAMS:${PN}-client = "defaults 19 21" |
44 | 47 | ||
45 | inherit autotools-brokensep update-rc.d systemd pkgconfig | 48 | inherit autotools-brokensep update-rc.d systemd pkgconfig |
46 | 49 | ||
47 | SYSTEMD_PACKAGES = "${PN} ${PN}-client" | 50 | SYSTEMD_PACKAGES = "${PN} ${PN}-client" |
48 | SYSTEMD_SERVICE_${PN} = "nfs-server.service nfs-mountd.service" | 51 | SYSTEMD_SERVICE:${PN} = "nfs-server.service nfs-mountd.service" |
49 | SYSTEMD_SERVICE_${PN}-client = "nfs-statd.service" | 52 | SYSTEMD_SERVICE:${PN}-client = "nfs-statd.service" |
50 | 53 | ||
51 | # --enable-uuid is need for cross-compiling | 54 | # --enable-uuid is need for cross-compiling |
52 | EXTRA_OECONF = "--with-statduser=rpcuser \ | 55 | EXTRA_OECONF = "--with-statduser=rpcuser \ |
@@ -59,10 +62,12 @@ EXTRA_OECONF = "--with-statduser=rpcuser \ | |||
59 | --with-rpcgen=${HOSTTOOLS_DIR}/rpcgen \ | 62 | --with-rpcgen=${HOSTTOOLS_DIR}/rpcgen \ |
60 | " | 63 | " |
61 | 64 | ||
65 | LDFLAGS:append = " -lsqlite3 -levent" | ||
66 | |||
62 | PACKAGECONFIG ??= "tcp-wrappers \ | 67 | PACKAGECONFIG ??= "tcp-wrappers \ |
63 | ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ | 68 | ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ |
64 | " | 69 | " |
65 | PACKAGECONFIG_remove_libc-musl = "tcp-wrappers" | 70 | PACKAGECONFIG:remove:libc-musl = "tcp-wrappers" |
66 | PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,--without-tcp-wrappers,tcp-wrappers" | 71 | PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,--without-tcp-wrappers,tcp-wrappers" |
67 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," | 72 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," |
68 | # libdevmapper is available in meta-oe | 73 | # libdevmapper is available in meta-oe |
@@ -70,67 +75,71 @@ PACKAGECONFIG[nfsv41] = "--enable-nfsv41,--disable-nfsv41,libdevmapper,libdevmap | |||
70 | # keyutils is available in meta-oe | 75 | # keyutils is available in meta-oe |
71 | PACKAGECONFIG[nfsv4] = "--enable-nfsv4,--disable-nfsv4,keyutils,python3-core" | 76 | PACKAGECONFIG[nfsv4] = "--enable-nfsv4,--disable-nfsv4,keyutils,python3-core" |
72 | 77 | ||
73 | PACKAGES =+ "${PN}-client ${PN}-mount ${PN}-stats" | 78 | PACKAGES =+ "${PN}-client ${PN}-mount ${PN}-stats ${PN}-rpcctl" |
74 | 79 | ||
75 | CONFFILES_${PN}-client += "${localstatedir}/lib/nfs/etab \ | 80 | CONFFILES:${PN}-client += "${localstatedir}/lib/nfs/etab \ |
76 | ${localstatedir}/lib/nfs/rmtab \ | 81 | ${localstatedir}/lib/nfs/rmtab \ |
77 | ${localstatedir}/lib/nfs/xtab \ | 82 | ${localstatedir}/lib/nfs/xtab \ |
78 | ${localstatedir}/lib/nfs/statd/state \ | 83 | ${localstatedir}/lib/nfs/statd/state \ |
79 | ${sysconfdir}/nfsmount.conf" | 84 | ${sysconfdir}/nfsmount.conf" |
80 | 85 | ||
81 | FILES_${PN}-client = "${sbindir}/*statd \ | 86 | FILES:${PN}-client = "${sbindir}/*statd \ |
87 | ${libdir}/libnfsidmap.so.* \ | ||
82 | ${sbindir}/rpc.idmapd ${sbindir}/sm-notify \ | 88 | ${sbindir}/rpc.idmapd ${sbindir}/sm-notify \ |
83 | ${sbindir}/showmount ${sbindir}/nfsstat \ | 89 | ${sbindir}/showmount ${sbindir}/nfsstat \ |
84 | ${localstatedir}/lib/nfs \ | 90 | ${localstatedir}/lib/nfs \ |
85 | ${sysconfdir}/nfs-utils.conf \ | 91 | ${sysconfdir}/nfs-utils.conf \ |
86 | ${sysconfdir}/nfsmount.conf \ | 92 | ${sysconfdir}/nfsmount.conf \ |
87 | ${sysconfdir}/init.d/nfscommon \ | 93 | ${sysconfdir}/init.d/nfscommon \ |
88 | ${systemd_unitdir}/system/nfs-statd.service" | 94 | ${systemd_system_unitdir}/nfs-statd.service" |
89 | RDEPENDS_${PN}-client = "${PN}-mount rpcbind" | 95 | RDEPENDS:${PN}-client = "${PN}-mount rpcbind" |
96 | |||
97 | FILES:${PN}-mount = "${base_sbindir}/*mount.nfs*" | ||
90 | 98 | ||
91 | FILES_${PN}-mount = "${base_sbindir}/*mount.nfs*" | 99 | FILES:${PN}-stats = "${sbindir}/mountstats ${sbindir}/nfsiostat ${sbindir}/nfsdclnts" |
100 | RDEPENDS:${PN}-stats = "python3-core" | ||
92 | 101 | ||
93 | FILES_${PN}-stats = "${sbindir}/mountstats ${sbindir}/nfsiostat ${sbindir}/nfsdclnts" | 102 | FILES:${PN}-rpcctl = "${sbindir}/rpcctl" |
94 | RDEPENDS_${PN}-stats = "python3-core" | 103 | RDEPENDS:${PN}-rpcctl = "python3-core" |
95 | 104 | ||
96 | FILES_${PN}-staticdev += "${libdir}/libnfsidmap/*.a" | 105 | FILES:${PN}-staticdev += "${libdir}/libnfsidmap/*.a" |
97 | 106 | ||
98 | FILES_${PN} += "${systemd_unitdir} ${libdir}/libnfsidmap/" | 107 | FILES:${PN} += "${systemd_unitdir} ${libdir}/libnfsidmap/ ${nonarch_libdir}/modprobe.d" |
99 | 108 | ||
100 | do_configure_prepend() { | 109 | do_configure:prepend() { |
101 | sed -i -e 's,sbindir = /sbin,sbindir = ${base_sbindir},g' \ | 110 | sed -i -e 's,sbindir = /sbin,sbindir = ${base_sbindir},g' \ |
102 | ${S}/utils/mount/Makefile.am | 111 | ${S}/utils/mount/Makefile.am |
103 | } | 112 | } |
104 | 113 | ||
105 | # Make clean needed because the package comes with | 114 | # Make clean needed because the package comes with |
106 | # precompiled 64-bit objects that break the build | 115 | # precompiled 64-bit objects that break the build |
107 | do_compile_prepend() { | 116 | do_compile:prepend() { |
108 | make clean | 117 | make clean |
109 | } | 118 | } |
110 | 119 | ||
111 | # Works on systemd only | 120 | # Works on systemd only |
112 | HIGH_RLIMIT_NOFILE ??= "4096" | 121 | HIGH_RLIMIT_NOFILE ??= "4096" |
113 | 122 | ||
114 | do_install_append () { | 123 | do_install:append () { |
115 | install -d ${D}${sysconfdir}/init.d | 124 | install -d ${D}${sysconfdir}/init.d |
116 | install -m 0755 ${WORKDIR}/nfsserver ${D}${sysconfdir}/init.d/nfsserver | 125 | install -m 0755 ${UNPACKDIR}/nfsserver ${D}${sysconfdir}/init.d/nfsserver |
117 | install -m 0755 ${WORKDIR}/nfscommon ${D}${sysconfdir}/init.d/nfscommon | 126 | install -m 0755 ${UNPACKDIR}/nfscommon ${D}${sysconfdir}/init.d/nfscommon |
118 | 127 | ||
119 | install -m 0755 ${WORKDIR}/nfs-utils.conf ${D}${sysconfdir} | 128 | install -m 0755 ${UNPACKDIR}/nfs-utils.conf ${D}${sysconfdir} |
120 | install -m 0755 ${S}/utils/mount/nfsmount.conf ${D}${sysconfdir} | 129 | install -m 0755 ${S}/utils/mount/nfsmount.conf ${D}${sysconfdir} |
121 | 130 | ||
122 | install -d ${D}${systemd_unitdir}/system | 131 | install -d ${D}${systemd_system_unitdir} |
123 | install -m 0644 ${WORKDIR}/nfs-server.service ${D}${systemd_unitdir}/system/ | 132 | install -m 0644 ${UNPACKDIR}/nfs-server.service ${D}${systemd_system_unitdir}/ |
124 | install -m 0644 ${WORKDIR}/nfs-mountd.service ${D}${systemd_unitdir}/system/ | 133 | install -m 0644 ${UNPACKDIR}/nfs-mountd.service ${D}${systemd_system_unitdir}/ |
125 | install -m 0644 ${WORKDIR}/nfs-statd.service ${D}${systemd_unitdir}/system/ | 134 | install -m 0644 ${UNPACKDIR}/nfs-statd.service ${D}${systemd_system_unitdir}/ |
126 | sed -i -e 's,@SBINDIR@,${sbindir},g' \ | 135 | sed -i -e 's,@SBINDIR@,${sbindir},g' \ |
127 | -e 's,@SYSCONFDIR@,${sysconfdir},g' \ | 136 | -e 's,@SYSCONFDIR@,${sysconfdir},g' \ |
128 | -e 's,@HIGH_RLIMIT_NOFILE@,${HIGH_RLIMIT_NOFILE},g' \ | 137 | -e 's,@HIGH_RLIMIT_NOFILE@,${HIGH_RLIMIT_NOFILE},g' \ |
129 | ${D}${systemd_unitdir}/system/*.service | 138 | ${D}${systemd_system_unitdir}/*.service |
130 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 139 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
131 | install -m 0644 ${WORKDIR}/proc-fs-nfsd.mount ${D}${systemd_unitdir}/system/ | 140 | install -m 0644 ${UNPACKDIR}/proc-fs-nfsd.mount ${D}${systemd_system_unitdir}/ |
132 | install -d ${D}${systemd_unitdir}/system/sysinit.target.wants/ | 141 | install -d ${D}${systemd_system_unitdir}/sysinit.target.wants/ |
133 | ln -sf ../proc-fs-nfsd.mount ${D}${systemd_unitdir}/system/sysinit.target.wants/proc-fs-nfsd.mount | 142 | ln -sf ../proc-fs-nfsd.mount ${D}${systemd_system_unitdir}/sysinit.target.wants/proc-fs-nfsd.mount |
134 | fi | 143 | fi |
135 | 144 | ||
136 | # kernel code as of 3.8 hard-codes this path as a default | 145 | # kernel code as of 3.8 hard-codes this path as a default |