diff options
author | Wang Mingyu <wangmy@cn.fujitsu.com> | 2020-02-20 01:41:34 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-21 09:39:00 +0000 |
commit | 028d5c616dce1bd2839a9d9a7eab9434b487ec2b (patch) | |
tree | 40d8fc245800d4e18df60b3803c7d3a131a6780e /meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch | |
parent | 523b2bbb084bee28d6bde1aac37ef5252d95f918 (diff) | |
download | poky-028d5c616dce1bd2839a9d9a7eab9434b487ec2b.tar.gz |
nfs-utils: upgrade 2.4.2 -> 2.4.3
0001-Don-t-build-tools-with-CC_FOR_BUILD.patch
Removed since it is included in 2.4.3.
refresh the following patch:
0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch
(From OE-Core rev: fcaca33d458449379eeb2f99b613f8be1e6a44ce)
Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch')
-rw-r--r-- | meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch | 12 |
1 files changed, 8 insertions, 4 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 fcb0e99b33..bd350144e3 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 | |||
@@ -28,10 +28,10 @@ Rebase it. | |||
28 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | 28 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
29 | --- | 29 | --- |
30 | support/misc/Makefile.am | 2 +- | 30 | support/misc/Makefile.am | 2 +- |
31 | support/misc/file.c | 111 --------------------------------------------------------------------------------------------------------------- | 31 | support/misc/file.c | 115 --------------------------------------------------------------------------------------------------------------- |
32 | support/misc/misc.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ | 32 | support/misc/misc.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
33 | support/nsm/Makefile.am | 2 +- | 33 | support/nsm/Makefile.am | 2 +- |
34 | 4 files changed, 113 insertions(+), 113 deletions(-) | 34 | 4 files changed, 113 insertions(+), 117 deletions(-) |
35 | 35 | ||
36 | diff --git a/support/misc/Makefile.am b/support/misc/Makefile.am | 36 | diff --git a/support/misc/Makefile.am b/support/misc/Makefile.am |
37 | index f9993e3..8b0e9db 100644 | 37 | index f9993e3..8b0e9db 100644 |
@@ -48,10 +48,10 @@ index f9993e3..8b0e9db 100644 | |||
48 | MAINTAINERCLEANFILES = Makefile.in | 48 | MAINTAINERCLEANFILES = Makefile.in |
49 | diff --git a/support/misc/file.c b/support/misc/file.c | 49 | diff --git a/support/misc/file.c b/support/misc/file.c |
50 | deleted file mode 100644 | 50 | deleted file mode 100644 |
51 | index e7c3819..0000000 | 51 | index 06f6bb2..0000000 |
52 | --- a/support/misc/file.c | 52 | --- a/support/misc/file.c |
53 | +++ /dev/null | 53 | +++ /dev/null |
54 | @@ -1,111 +0,0 @@ | 54 | @@ -1,115 +0,0 @@ |
55 | -/* | 55 | -/* |
56 | - * Copyright 2009 Oracle. All rights reserved. | 56 | - * Copyright 2009 Oracle. All rights reserved. |
57 | - * Copyright 2017 Red Hat, Inc. All rights reserved. | 57 | - * Copyright 2017 Red Hat, Inc. All rights reserved. |
@@ -72,6 +72,10 @@ index e7c3819..0000000 | |||
72 | - * along with nfs-utils. If not, see <http://www.gnu.org/licenses/>. | 72 | - * along with nfs-utils. If not, see <http://www.gnu.org/licenses/>. |
73 | - */ | 73 | - */ |
74 | - | 74 | - |
75 | -#ifdef HAVE_CONFIG_H | ||
76 | -#include <config.h> | ||
77 | -#endif | ||
78 | - | ||
75 | -#include <sys/stat.h> | 79 | -#include <sys/stat.h> |
76 | - | 80 | - |
77 | -#include <string.h> | 81 | -#include <string.h> |