diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2019-08-28 19:04:57 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-08-30 17:10:28 +0100 |
commit | 19985178e7bd01234d93b6b97071f193ed29b2b3 (patch) | |
tree | bdbb5dbaa0b2765fd90aaf07d70a8dca6c949b7d /meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-update-the-path-of-libnfs.a.patch | |
parent | d6094e1e4e49be02932a757373e8b01e97ff3709 (diff) | |
download | poky-19985178e7bd01234d93b6b97071f193ed29b2b3.tar.gz |
nfs-utils: 2.3.3 -> 2.4.1
- Remove 0001-Do-not-pass-null-pointer-to-freeaddrinfo.patch, the new api
can check the pointer before free it.
- Rmove 0001-makefile.am-update-the-path-of-libnfs.a.patch, it is already in
the source.
- Rmove nfs-utils-musl-limits.patch, it is already fixed.
- Rebased the following patches:
0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch
0001-configure.ac-Do-not-fatalize-Wmissing-prototypes.patch
bugfix-adjust-statd-service-name.patch
nfs-utils-musl-res_querydomain.patch
(From OE-Core rev: 5601523e16ebd35d7de8d22ec5590618ea9f7ffb)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-update-the-path-of-libnfs.a.patch')
-rw-r--r-- | meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-update-the-path-of-libnfs.a.patch | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-update-the-path-of-libnfs.a.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-update-the-path-of-libnfs.a.patch deleted file mode 100644 index 906ac0f905..0000000000 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-update-the-path-of-libnfs.a.patch +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | From fcece65d1b713eaeef41706898440302f8ce92d9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mingli Yu <Mingli.Yu@windriver.com> | ||
3 | Date: Thu, 12 Jul 2018 15:19:41 +0800 | ||
4 | Subject: [PATCH] Makefile.am: update the path of libnfs.a | ||
5 | |||
6 | The libnfs.a is under ../support/nfs/.libs/ now, | ||
7 | update the reference path accordingly to fix below | ||
8 | build error when run "make -C tests statdb_dump": | ||
9 | | make: *** No rule to make target '../support/nfs/libnfs.a', needed by 'statdb_dump'. Stop. | ||
10 | |||
11 | And below error when run "make -C tests/nsm_client nsm_client" | ||
12 | | make: *** No rule to make target '../../support/nfs/libnfs.a', needed by 'nsm_client'. Stop. | ||
13 | |||
14 | Upstream-Status: Submitted[https://marc.info/?l=linux-nfs&m=154502636522745&w=2] | ||
15 | |||
16 | Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> | ||
17 | --- | ||
18 | tests/Makefile.am | 2 +- | ||
19 | tests/nsm_client/Makefile.am | 2 +- | ||
20 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
21 | |||
22 | diff --git a/tests/Makefile.am b/tests/Makefile.am | ||
23 | index 1f96264..74aa629 100644 | ||
24 | --- a/tests/Makefile.am | ||
25 | +++ b/tests/Makefile.am | ||
26 | @@ -3,7 +3,7 @@ | ||
27 | check_PROGRAMS = statdb_dump | ||
28 | statdb_dump_SOURCES = statdb_dump.c | ||
29 | |||
30 | -statdb_dump_LDADD = ../support/nfs/libnfs.a \ | ||
31 | +statdb_dump_LDADD = ../support/nfs/.libs/libnfs.a \ | ||
32 | ../support/nsm/libnsm.a $(LIBCAP) | ||
33 | |||
34 | SUBDIRS = nsm_client | ||
35 | diff --git a/tests/nsm_client/Makefile.am b/tests/nsm_client/Makefile.am | ||
36 | index a8fc131..43db9c2 100644 | ||
37 | --- a/tests/nsm_client/Makefile.am | ||
38 | +++ b/tests/nsm_client/Makefile.am | ||
39 | @@ -13,7 +13,7 @@ check_PROGRAMS = nsm_client | ||
40 | nsm_client_SOURCES = $(GENFILES) nsm_client.c | ||
41 | |||
42 | BUILT_SOURCES = $(GENFILES) | ||
43 | -nsm_client_LDADD = ../../support/nfs/libnfs.a \ | ||
44 | +nsm_client_LDADD = ../../support/nfs/.libs/libnfs.a \ | ||
45 | ../../support/nsm/libnsm.a $(LIBCAP) $(LIBTIRPC) | ||
46 | |||
47 | if CONFIG_RPCGEN | ||
48 | -- | ||
49 | 2.7.4 | ||
50 | |||