summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYao Xinpan <yaoxp@cn.fujitsu.com>2014-06-20 14:47:02 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-24 19:53:02 +0100
commit15dbdfc6a7e3f03862d9c670ffd2ae8f4d9d8b69 (patch)
treedbf80ccaf1d5057432cf8c33e5cb4a69fb2ba0fc
parent9ed2b77aafe5bcd57da56377e6e58dae0c1fcfaf (diff)
downloadopenembedded-core-15dbdfc6a7e3f03862d9c670ffd2ae8f4d9d8b69.tar.gz
openembedded-core-15dbdfc6a7e3f03862d9c670ffd2ae8f4d9d8b69.tar.bz2
openembedded-core-15dbdfc6a7e3f03862d9c670ffd2ae8f4d9d8b69.zip
nfs-utils: fix the --with-statdpath= flag
if --with-statdpath= is not the default value, will happen the following questions: 'Failed to open directory sm: No such file or directory'. Submitted to nfs-utils mailing list here: http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commitdiff;h=3b1457d219ceb1058d44bacc657581f13437ae40#patch1 This has been accepted into upstream nfs-utils so it will not be needed for future versions. Signed-off-by: Yao Xinpan <yaoxp@cn.fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils/0001-statd-fixed-the-with-statdpath-flag.patch41
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb1
2 files changed, 42 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-statd-fixed-the-with-statdpath-flag.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-statd-fixed-the-with-statdpath-flag.patch
new file mode 100644
index 0000000000..2ce824cf9e
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-statd-fixed-the-with-statdpath-flag.patch
@@ -0,0 +1,41 @@
+From 3b1457d219ceb1058d44bacc657581f13437ae40 Mon Sep 17 00:00:00 2001
+From: Steve Dickson <steved@redhat.com>
+Date: Tue, 17 Jun 2014 13:28:53 -0400
+Subject: [PATCH] statd: fixed the --with-statdpath= flag
+
+Create the given path set with --with-statdpath
+
+Signed-off-by: chendt.fnst@cn.fujitsu.com
+Reported-by: yaoxp@cn.fujitsu.com
+Signed-off-by: Steve Dickson <steved@redhat.com>
+Upstream-Status: Backport
+---
+ Makefile.am | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index ae7cd16..5824adc 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -54,13 +54,13 @@ install-data-hook:
+ touch $(DESTDIR)$(statedir)/xtab; chmod 644 $(DESTDIR)$(statedir)/xtab
+ touch $(DESTDIR)$(statedir)/etab; chmod 644 $(DESTDIR)$(statedir)/etab
+ touch $(DESTDIR)$(statedir)/rmtab; chmod 644 $(DESTDIR)$(statedir)/rmtab
+- mkdir -p $(DESTDIR)$(statedir)/sm $(DESTDIR)$(statedir)/sm.bak
+- touch $(DESTDIR)$(statedir)/state
+- chmod go-rwx $(DESTDIR)$(statedir)/sm $(DESTDIR)$(statedir)/sm.bak $(DESTDIR)$(statedir)/state
+- -chown $(statduser) $(DESTDIR)$(statedir)/sm $(DESTDIR)$(statedir)/sm.bak $(DESTDIR)$(statedir)/state
++ mkdir -p $(DESTDIR)$(statdpath)/sm $(DESTDIR)$(statdpath)/sm.bak
++ touch $(DESTDIR)$(statdpath)/state
++ chmod go-rwx $(DESTDIR)$(statdpath)/sm $(DESTDIR)$(statdpath)/sm.bak $(DESTDIR)$(statdpath)/state
++ -chown $(statduser) $(DESTDIR)$(statdpath)/sm $(DESTDIR)$(statdpath)/sm.bak $(DESTDIR)$(statdpath)/state
+
+ uninstall-hook:
+ rm $(DESTDIR)$(statedir)/xtab
+ rm $(DESTDIR)$(statedir)/etab
+ rm $(DESTDIR)$(statedir)/rmtab
+- rm $(DESTDIR)$(statedir)/state
++ rm $(DESTDIR)$(statdpath)/state
+--
+1.8.4.2
+
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb
index 8575647473..c813d7f61e 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb
@@ -30,6 +30,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x
file://nfs-mountd.service \
file://nfs-statd.service \
file://nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch \
+ file://0001-statd-fixed-the-with-statdpath-flag.patch \
"
SRC_URI[md5sum] = "6e93a7997ca3a1eac56bf219adab72a8"