summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@cn.fujitsu.com>2020-02-20 01:41:34 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-21 09:39:00 +0000
commit028d5c616dce1bd2839a9d9a7eab9434b487ec2b (patch)
tree40d8fc245800d4e18df60b3803c7d3a131a6780e /meta/recipes-connectivity
parent523b2bbb084bee28d6bde1aac37ef5252d95f918 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Don-t-build-tools-with-CC_FOR_BUILD.patch40
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch12
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.3.bb (renamed from meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.2.bb)5
3 files changed, 10 insertions, 47 deletions
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Don-t-build-tools-with-CC_FOR_BUILD.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Don-t-build-tools-with-CC_FOR_BUILD.patch
deleted file mode 100644
index 23bc3eaf72..0000000000
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Don-t-build-tools-with-CC_FOR_BUILD.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From 79019d976584c598f8d0a9d8de43c989946f974b Mon Sep 17 00:00:00 2001
2From: Pascal Bach <pascal.bach@siemens.com>
3Date: Wed, 13 Feb 2019 09:28:07 +0100
4Subject: [PATCH] Don't build tools with CC_FOR_BUILD
5
6The tools are intended for the target not for the host.
7
8Upstream-Status: Pending
9
10Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
11---
12 tools/locktest/Makefile.am | 1 -
13 tools/rpcgen/Makefile.am | 1 -
14 2 files changed, 2 deletions(-)
15
16diff --git a/tools/locktest/Makefile.am b/tools/locktest/Makefile.am
17index 3156815..87d0bac 100644
18--- a/tools/locktest/Makefile.am
19+++ b/tools/locktest/Makefile.am
20@@ -1,6 +1,5 @@
21 ## Process this file with automake to produce Makefile.in
22
23-CC=$(CC_FOR_BUILD)
24 LIBTOOL = @LIBTOOL@ --tag=CC
25
26 noinst_PROGRAMS = testlk
27diff --git a/tools/rpcgen/Makefile.am b/tools/rpcgen/Makefile.am
28index 8a9ec89..3e092c9 100644
29--- a/tools/rpcgen/Makefile.am
30+++ b/tools/rpcgen/Makefile.am
31@@ -1,6 +1,5 @@
32 ## Process this file with automake to produce Makefile.in
33
34-CC=$(CC_FOR_BUILD)
35 LIBTOOL = @LIBTOOL@ --tag=CC
36
37 noinst_PROGRAMS = rpcgen
38--
392.11.0
40
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.
28Signed-off-by: Robert Yang <liezhi.yang@windriver.com> 28Signed-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
36diff --git a/support/misc/Makefile.am b/support/misc/Makefile.am 36diff --git a/support/misc/Makefile.am b/support/misc/Makefile.am
37index f9993e3..8b0e9db 100644 37index f9993e3..8b0e9db 100644
@@ -48,10 +48,10 @@ index f9993e3..8b0e9db 100644
48 MAINTAINERCLEANFILES = Makefile.in 48 MAINTAINERCLEANFILES = Makefile.in
49diff --git a/support/misc/file.c b/support/misc/file.c 49diff --git a/support/misc/file.c b/support/misc/file.c
50deleted file mode 100644 50deleted file mode 100644
51index e7c3819..0000000 51index 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>
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.2.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.3.bb
index 6647d3428b..42a4ba3dbd 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.2.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.4.3.bb
@@ -30,11 +30,10 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x
30 file://bugfix-adjust-statd-service-name.patch \ 30 file://bugfix-adjust-statd-service-name.patch \
31 file://0001-cacheio-use-intmax_t-for-formatted-IO.patch \ 31 file://0001-cacheio-use-intmax_t-for-formatted-IO.patch \
32 file://0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch \ 32 file://0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch \
33 file://0001-Don-t-build-tools-with-CC_FOR_BUILD.patch \
34 file://clang-warnings.patch \ 33 file://clang-warnings.patch \
35 " 34 "
36SRC_URI[md5sum] = "d427c6b3014e9a04e8498f0598b1c1b9" 35SRC_URI[md5sum] = "06020c76f531ed97f3145514901e0e7c"
37SRC_URI[sha256sum] = "4464737a03d5f73ded2ffefe19d5543ed7b1d6c541985d8acaafdc8025aa1038" 36SRC_URI[sha256sum] = "af65fce5dd8370cff9ead67baac5a6cd69c376dcadfef264dc2c78c904f26599"
38 37
39# Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will 38# Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will
40# pull in the remainder of the dependencies. 39# pull in the remainder of the dependencies.