diff options
| author |   Ross Burton <ross.burton@intel.com> | 2018-07-10 13:45:05 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-13 16:32:38 +0100 |
| commit | 98e8146553c912e869c174674c53e96d8ff01e57 (patch) | |
| tree | a2ba19187b9e34fbf351017d9651abefa5181edc /meta/recipes-connectivity/nfs-utils/nfs-utils | |
| parent | bed3a67932a85d7528179b0a35c21e1b595b6ce7 (diff) | |
| download | openembedded-core-contrib-98e8146553c912e869c174674c53e96d8ff01e57.tar.gz | |
nfs-utils: remove libnfsidmap
As of nfs-utils 2.2.1 libnfsidmap has been integrated and isn't an external
requirement anymore.
Also consolidate nfs-utils patches into a single directory.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-connectivity/nfs-utils/nfs-utils')
| -rw-r--r-- | meta/recipes-connectivity/nfs-utils/nfs-utils/bugfix-adjust-statd-service-name.patch | 31 | ||||
| -rw-r--r-- | meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-debianize-start-statd.patch | 42 |
2 files changed, 73 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/bugfix-adjust-statd-service-name.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/bugfix-adjust-statd-service-name.patch new file mode 100644 index 0000000000..822939f0d2 --- /dev/null +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/bugfix-adjust-statd-service-name.patch @@ -0,0 +1,31 @@ +From 398fed3bb0350cb1229e54e7020ae0e044c206d1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ulrich=20=C3=96lmann?= <u.oelmann@pengutronix.de> +Date: Wed, 17 Feb 2016 08:33:45 +0100 +Subject: bugfix: adjust statd service name +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream uses 'rpc-statd.service' and Yocto introduced 'nfs-statd.service' +instead but forgot to update the mount.nfs helper 'start-statd' accordingly. + +Upstream-Status: Inappropriate [other] + +Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de> +--- + utils/statd/start-statd | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: nfs-utils-2.1.1/utils/statd/start-statd +=================================================================== +--- nfs-utils-2.1.1.orig/utils/statd/start-statd ++++ nfs-utils-2.1.1/utils/statd/start-statd +@@ -28,7 +28,7 @@ fi + # First try systemd if it's installed. + if [ -d /run/systemd/system ]; then + # Quit only if the call worked. +- systemctl start rpc-statd.service && exit ++ systemctl start nfs-statd.service && exit + fi + + cd / diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-debianize-start-statd.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-debianize-start-statd.patch new file mode 100644 index 0000000000..ede0dcefc4 --- /dev/null +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-debianize-start-statd.patch @@ -0,0 +1,42 @@ +[PATCH] nfs-utils: debianize start-statd + +Upstream-Status: Pending + +make start-statd command to use nfscommon configure, too. + +Signed-off-by: Henrik Riomar <henrik.riomar@ericsson.com> +Signed-off-by: Li Wang <li.wang@windriver.com> +Signed-off-by: Roy Li <rongqing.li@windriver.com> +Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> +--- + utils/statd/start-statd | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/utils/statd/start-statd b/utils/statd/start-statd +index 2fd6039..f591b34 100755 +--- a/utils/statd/start-statd ++++ b/utils/statd/start-statd +@@ -17,6 +17,14 @@ then + # statd already running - must have been slow to respond. + exit 0 + fi ++ ++# Read config ++DEFAULTFILE=/etc/default/nfs-common ++NEED_IDMAPD= ++if [ -f $DEFAULTFILE ]; then ++ . $DEFAULTFILE ++fi ++ + # First try systemd if it's installed. + if [ -d /run/systemd/system ]; then + # Quit only if the call worked. +@@ -25,4 +33,4 @@ fi + + cd / + # Fall back to launching it ourselves. +-exec rpc.statd --no-notify ++exec rpc.statd --no-notify $STATDOPTS +-- +2.6.6 + |