diff options
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 | 22 |
1 files changed, 11 insertions, 11 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 aa551ebd19..fcb0e99b33 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 | |||
@@ -22,25 +22,28 @@ so rename ../support/misc/file.c to ../support/misc/misc.c. | |||
22 | Upstream-Status: Submitted[https://marc.info/?l=linux-nfs&m=154502780423058&w=2] | 22 | Upstream-Status: Submitted[https://marc.info/?l=linux-nfs&m=154502780423058&w=2] |
23 | 23 | ||
24 | Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> | 24 | Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> |
25 | |||
26 | Rebase it. | ||
27 | |||
28 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
25 | --- | 29 | --- |
26 | support/misc/Makefile.am | 2 +- | 30 | support/misc/Makefile.am | 2 +- |
27 | support/misc/file.c | 111 ----------------------------------------------- | 31 | support/misc/file.c | 111 --------------------------------------------------------------------------------------------------------------- |
28 | support/misc/misc.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++ | 32 | support/misc/misc.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
29 | support/nsm/Makefile.am | 2 +- | 33 | support/nsm/Makefile.am | 2 +- |
30 | 4 files changed, 113 insertions(+), 113 deletions(-) | 34 | 4 files changed, 113 insertions(+), 113 deletions(-) |
31 | delete mode 100644 support/misc/file.c | ||
32 | create mode 100644 support/misc/misc.c | ||
33 | 35 | ||
34 | 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 |
35 | index 8936b0d..d4c1f76 100644 | 37 | index f9993e3..8b0e9db 100644 |
36 | --- a/support/misc/Makefile.am | 38 | --- a/support/misc/Makefile.am |
37 | +++ b/support/misc/Makefile.am | 39 | +++ b/support/misc/Makefile.am |
38 | @@ -1,6 +1,6 @@ | 40 | @@ -1,7 +1,7 @@ |
39 | ## Process this file with automake to produce Makefile.in | 41 | ## Process this file with automake to produce Makefile.in |
40 | 42 | ||
41 | noinst_LIBRARIES = libmisc.a | 43 | noinst_LIBRARIES = libmisc.a |
42 | -libmisc_a_SOURCES = tcpwrapper.c from_local.c mountpoint.c file.c | 44 | -libmisc_a_SOURCES = tcpwrapper.c from_local.c mountpoint.c file.c \ |
43 | +libmisc_a_SOURCES = tcpwrapper.c from_local.c mountpoint.c misc.c | 45 | +libmisc_a_SOURCES = tcpwrapper.c from_local.c mountpoint.c misc.c \ |
46 | nfsd_path.c workqueue.c xstat.c | ||
44 | 47 | ||
45 | MAINTAINERCLEANFILES = Makefile.in | 48 | MAINTAINERCLEANFILES = Makefile.in |
46 | 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 |
@@ -290,6 +293,3 @@ index 8f5874e..68f1a46 100644 | |||
290 | 293 | ||
291 | BUILT_SOURCES = $(GENFILES) | 294 | BUILT_SOURCES = $(GENFILES) |
292 | 295 | ||
293 | -- | ||
294 | 2.7.4 | ||
295 | |||