diff options
author | Alejandro Hernandez <alejandro.hernandez@linux.intel.com> | 2014-11-12 12:42:35 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-11-25 13:03:26 +0000 |
commit | 1379659da5658c01ce2aa040ae924c7b0f5c6fd1 (patch) | |
tree | 5566d312e6ddf92a44e73d5a94af3bbf9b2021fa /meta/recipes-connectivity/nfs-utils/nfs-utils | |
parent | 16edf5c21289dd2fb9f1adde813f0634dff0ea1a (diff) | |
download | poky-1379659da5658c01ce2aa040ae924c7b0f5c6fd1.tar.gz |
nfs-utils: Upgrade to 1.3.1
Removed: fix-a-Gcc-undefined-behavior.patch - Upstream
Removed: 0001-statd-fixed-the-with-statdpath-flag.patch - Upstream
Removed: fix-the-start-statd.patch - Different solution on upstream
Removed: nfs-utils-1.0.6-uclibc.patch - Different solution on upstream
(From OE-Core rev: 7cd8b38f4f53d25a6dec8ec3b130a345480ff6b7)
Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/nfs-utils/nfs-utils')
3 files changed, 0 insertions, 98 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 deleted file mode 100644 index 2ce824cf9e..0000000000 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-statd-fixed-the-with-statdpath-flag.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | From 3b1457d219ceb1058d44bacc657581f13437ae40 Mon Sep 17 00:00:00 2001 | ||
2 | From: Steve Dickson <steved@redhat.com> | ||
3 | Date: Tue, 17 Jun 2014 13:28:53 -0400 | ||
4 | Subject: [PATCH] statd: fixed the --with-statdpath= flag | ||
5 | |||
6 | Create the given path set with --with-statdpath | ||
7 | |||
8 | Signed-off-by: chendt.fnst@cn.fujitsu.com | ||
9 | Reported-by: yaoxp@cn.fujitsu.com | ||
10 | Signed-off-by: Steve Dickson <steved@redhat.com> | ||
11 | Upstream-Status: Backport | ||
12 | --- | ||
13 | Makefile.am | 10 +++++----- | ||
14 | 1 file changed, 5 insertions(+), 5 deletions(-) | ||
15 | |||
16 | diff --git a/Makefile.am b/Makefile.am | ||
17 | index ae7cd16..5824adc 100644 | ||
18 | --- a/Makefile.am | ||
19 | +++ b/Makefile.am | ||
20 | @@ -54,13 +54,13 @@ install-data-hook: | ||
21 | touch $(DESTDIR)$(statedir)/xtab; chmod 644 $(DESTDIR)$(statedir)/xtab | ||
22 | touch $(DESTDIR)$(statedir)/etab; chmod 644 $(DESTDIR)$(statedir)/etab | ||
23 | touch $(DESTDIR)$(statedir)/rmtab; chmod 644 $(DESTDIR)$(statedir)/rmtab | ||
24 | - mkdir -p $(DESTDIR)$(statedir)/sm $(DESTDIR)$(statedir)/sm.bak | ||
25 | - touch $(DESTDIR)$(statedir)/state | ||
26 | - chmod go-rwx $(DESTDIR)$(statedir)/sm $(DESTDIR)$(statedir)/sm.bak $(DESTDIR)$(statedir)/state | ||
27 | - -chown $(statduser) $(DESTDIR)$(statedir)/sm $(DESTDIR)$(statedir)/sm.bak $(DESTDIR)$(statedir)/state | ||
28 | + mkdir -p $(DESTDIR)$(statdpath)/sm $(DESTDIR)$(statdpath)/sm.bak | ||
29 | + touch $(DESTDIR)$(statdpath)/state | ||
30 | + chmod go-rwx $(DESTDIR)$(statdpath)/sm $(DESTDIR)$(statdpath)/sm.bak $(DESTDIR)$(statdpath)/state | ||
31 | + -chown $(statduser) $(DESTDIR)$(statdpath)/sm $(DESTDIR)$(statdpath)/sm.bak $(DESTDIR)$(statdpath)/state | ||
32 | |||
33 | uninstall-hook: | ||
34 | rm $(DESTDIR)$(statedir)/xtab | ||
35 | rm $(DESTDIR)$(statedir)/etab | ||
36 | rm $(DESTDIR)$(statedir)/rmtab | ||
37 | - rm $(DESTDIR)$(statedir)/state | ||
38 | + rm $(DESTDIR)$(statdpath)/state | ||
39 | -- | ||
40 | 1.8.4.2 | ||
41 | |||
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/fix-the-start-statd.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/fix-the-start-statd.patch deleted file mode 100644 index b7e835ed35..0000000000 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/fix-the-start-statd.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | [PATCH] fix the start-statd | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | 1. add /bin/ to PATH, since systemctl is installed under /bin/ | ||
6 | 2. redirect error to /dev/null | ||
7 | |||
8 | Signed-off-by: Roy Li <rongqing.li@windriver.com> | ||
9 | --- | ||
10 | utils/statd/start-statd | 4 ++-- | ||
11 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
12 | |||
13 | diff --git a/utils/statd/start-statd b/utils/statd/start-statd | ||
14 | index cde3583..098ce70 100644 | ||
15 | --- a/utils/statd/start-statd | ||
16 | +++ b/utils/statd/start-statd | ||
17 | @@ -4,8 +4,8 @@ | ||
18 | # /var/run/rpc.statd.pid). | ||
19 | # It should run statd with whatever flags are apropriate for this | ||
20 | # site. | ||
21 | -PATH=/sbin:/usr/sbin | ||
22 | -if systemctl start statd.service | ||
23 | +PATH=/sbin:/usr/sbin:/bin | ||
24 | +if systemctl start statd.service 2>/dev/null | ||
25 | then : | ||
26 | else | ||
27 | exec rpc.statd --no-notify | ||
28 | -- | ||
29 | 1.7.10.4 | ||
30 | |||
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.0.6-uclibc.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.0.6-uclibc.patch deleted file mode 100644 index c3442380e1..0000000000 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.0.6-uclibc.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
2 | |||
3 | Upstream-Status: Inappropriate [embedded specific] | ||
4 | |||
5 | Index: nfs-utils-1.2.6/support/nfs/svc_socket.c | ||
6 | =================================================================== | ||
7 | --- nfs-utils-1.2.6.orig/support/nfs/svc_socket.c 2012-05-14 07:40:52.000000000 -0700 | ||
8 | +++ nfs-utils-1.2.6/support/nfs/svc_socket.c 2012-10-28 02:42:50.179222457 -0700 | ||
9 | @@ -40,8 +40,9 @@ | ||
10 | char rpcdata[1024], servdata[1024]; | ||
11 | struct rpcent rpcbuf, *rpcp; | ||
12 | struct servent servbuf, *servp = NULL; | ||
13 | - int ret; | ||
14 | + int ret = 0; | ||
15 | |||
16 | +#ifndef __UCLIBC__ /* neither getrpcbynumber() nor getrpcbynumber_r() is SuSv3 */ | ||
17 | ret = getrpcbynumber_r(number, &rpcbuf, rpcdata, sizeof rpcdata, | ||
18 | &rpcp); | ||
19 | if (ret == 0 && rpcp != NULL) { | ||
20 | @@ -60,6 +61,7 @@ | ||
21 | } | ||
22 | } | ||
23 | } | ||
24 | +#endif /* __UCLIBC__ */ | ||
25 | |||
26 | if (ret == 0 && servp != NULL) | ||
27 | return ntohs(servp->s_port); | ||