summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/nfs-utils
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@gmail.com>2020-06-28 15:34:12 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-28 23:37:38 +0100
commitbd3fcb66fab2d2923c8a13735fa77c895fc26ea0 (patch)
treeffd05410eb6fbf9afc41c8c55116d6f5825c4097 /meta/recipes-connectivity/nfs-utils
parent7a6717278e85482418c79170f9ad190ee0d9daca (diff)
downloadpoky-bd3fcb66fab2d2923c8a13735fa77c895fc26ea0.tar.gz
nfs-utils: upgrade 2.4.3 -> 2.5.1
* cacheio was fixed upstream slightly different * nfsdclnts is a python3 script for printing various nfs client information pack it in ${PN}-stats * replace leading spaces by tabs in shell tasks * remove SRC_URI[md5sum] (From OE-Core rev: 489fe278443e7376a5b51789daff2449f19c87ab) Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/nfs-utils')
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils/0001-cacheio-use-intmax_t-for-formatted-IO.patch38
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils_2.5.1.bb (renamed from meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.3.bb)21
2 files changed, 9 insertions, 50 deletions
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-cacheio-use-intmax_t-for-formatted-IO.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-cacheio-use-intmax_t-for-formatted-IO.patch
deleted file mode 100644
index bafff5b9c0..0000000000
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-cacheio-use-intmax_t-for-formatted-IO.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1From ac32b813f5d6f9a2de944015cf9bb98d68e0203a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 1 Dec 2018 10:02:12 -0800
4Subject: [PATCH] cacheio: use intmax_t for formatted IO
5
6time_t is not same size on x32 ABI (ILP32)
7
8Upstream-Status: Pending
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 support/nfs/cacheio.c | 3 ++-
13 1 file changed, 2 insertions(+), 1 deletion(-)
14
15diff --git a/support/nfs/cacheio.c b/support/nfs/cacheio.c
16index 9dc4cf1..2086a95 100644
17--- a/support/nfs/cacheio.c
18+++ b/support/nfs/cacheio.c
19@@ -17,6 +17,7 @@
20
21 #include <nfslib.h>
22 #include <stdio.h>
23+#include <inttypes.h>
24 #include <stdio_ext.h>
25 #include <string.h>
26 #include <ctype.h>
27@@ -234,7 +235,7 @@ cache_flush(int force)
28 stb.st_mtime > now)
29 stb.st_mtime = time(0);
30
31- sprintf(stime, "%ld\n", stb.st_mtime);
32+ sprintf(stime, "%jd\n", (intmax_t)stb.st_mtime);
33 for (c=0; cachelist[c]; c++) {
34 int fd;
35 sprintf(path, "/proc/net/rpc/%s/flush", cachelist[c]);
36--
372.19.2
38
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.3.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.5.1.bb
index 9bdb6f4ae4..188a8893b4 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.3.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.5.1.bb
@@ -28,12 +28,10 @@ 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://0001-cacheio-use-intmax_t-for-formatted-IO.patch \
32 file://0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch \ 31 file://0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch \
33 file://clang-warnings.patch \ 32 file://clang-warnings.patch \
34 " 33 "
35SRC_URI[md5sum] = "06020c76f531ed97f3145514901e0e7c" 34SRC_URI[sha256sum] = "0f1c8170e16a07d9836bbf0836d48d0c842b6f0e0e8b18748f099751851d30c4"
36SRC_URI[sha256sum] = "af65fce5dd8370cff9ead67baac5a6cd69c376dcadfef264dc2c78c904f26599"
37 35
38# Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will 36# Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will
39# pull in the remainder of the dependencies. 37# pull in the remainder of the dependencies.
@@ -91,7 +89,7 @@ RDEPENDS_${PN}-client = "${PN}-mount rpcbind"
91 89
92FILES_${PN}-mount = "${base_sbindir}/*mount.nfs*" 90FILES_${PN}-mount = "${base_sbindir}/*mount.nfs*"
93 91
94FILES_${PN}-stats = "${sbindir}/mountstats ${sbindir}/nfsiostat" 92FILES_${PN}-stats = "${sbindir}/mountstats ${sbindir}/nfsiostat ${sbindir}/nfsdclnts"
95RDEPENDS_${PN}-stats = "python3-core" 93RDEPENDS_${PN}-stats = "python3-core"
96 94
97FILES_${PN}-staticdev += "${libdir}/libnfsidmap/*.a" 95FILES_${PN}-staticdev += "${libdir}/libnfsidmap/*.a"
@@ -99,8 +97,8 @@ FILES_${PN}-staticdev += "${libdir}/libnfsidmap/*.a"
99FILES_${PN} += "${systemd_unitdir} ${libdir}/libnfsidmap/" 97FILES_${PN} += "${systemd_unitdir} ${libdir}/libnfsidmap/"
100 98
101do_configure_prepend() { 99do_configure_prepend() {
102 sed -i -e 's,sbindir = /sbin,sbindir = ${base_sbindir},g' \ 100 sed -i -e 's,sbindir = /sbin,sbindir = ${base_sbindir},g' \
103 ${S}/utils/mount/Makefile.am 101 ${S}/utils/mount/Makefile.am
104} 102}
105 103
106# Make clean needed because the package comes with 104# Make clean needed because the package comes with
@@ -129,9 +127,9 @@ do_install_append () {
129 -e 's,@HIGH_RLIMIT_NOFILE@,${HIGH_RLIMIT_NOFILE},g' \ 127 -e 's,@HIGH_RLIMIT_NOFILE@,${HIGH_RLIMIT_NOFILE},g' \
130 ${D}${systemd_unitdir}/system/*.service 128 ${D}${systemd_unitdir}/system/*.service
131 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then 129 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
132 install -m 0644 ${WORKDIR}/proc-fs-nfsd.mount ${D}${systemd_unitdir}/system/ 130 install -m 0644 ${WORKDIR}/proc-fs-nfsd.mount ${D}${systemd_unitdir}/system/
133 install -d ${D}${systemd_unitdir}/system/sysinit.target.wants/ 131 install -d ${D}${systemd_unitdir}/system/sysinit.target.wants/
134 ln -sf ../proc-fs-nfsd.mount ${D}${systemd_unitdir}/system/sysinit.target.wants/proc-fs-nfsd.mount 132 ln -sf ../proc-fs-nfsd.mount ${D}${systemd_unitdir}/system/sysinit.target.wants/proc-fs-nfsd.mount
135 fi 133 fi
136 134
137 # kernel code as of 3.8 hard-codes this path as a default 135 # kernel code as of 3.8 hard-codes this path as a default
@@ -141,7 +139,6 @@ do_install_append () {
141 chown -R rpcuser:rpcuser ${D}${localstatedir}/lib/nfs/statd 139 chown -R rpcuser:rpcuser ${D}${localstatedir}/lib/nfs/statd
142 chmod 0644 ${D}${localstatedir}/lib/nfs/statd/state 140 chmod 0644 ${D}${localstatedir}/lib/nfs/statd/state
143 141
144 # Make python tools use python 3 142 # Make python tools use python 3
145 sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${sbindir}/mountstats ${D}${sbindir}/nfsiostat 143 sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${sbindir}/mountstats ${D}${sbindir}/nfsiostat
146
147} 144}