mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 17:19:20 +00:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
523b2bbb08
commit
028d5c616d
-40
@@ -1,40 +0,0 @@
|
||||
From 79019d976584c598f8d0a9d8de43c989946f974b Mon Sep 17 00:00:00 2001
|
||||
From: Pascal Bach <pascal.bach@siemens.com>
|
||||
Date: Wed, 13 Feb 2019 09:28:07 +0100
|
||||
Subject: [PATCH] Don't build tools with CC_FOR_BUILD
|
||||
|
||||
The tools are intended for the target not for the host.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
|
||||
---
|
||||
tools/locktest/Makefile.am | 1 -
|
||||
tools/rpcgen/Makefile.am | 1 -
|
||||
2 files changed, 2 deletions(-)
|
||||
|
||||
diff --git a/tools/locktest/Makefile.am b/tools/locktest/Makefile.am
|
||||
index 3156815..87d0bac 100644
|
||||
--- a/tools/locktest/Makefile.am
|
||||
+++ b/tools/locktest/Makefile.am
|
||||
@@ -1,6 +1,5 @@
|
||||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
-CC=$(CC_FOR_BUILD)
|
||||
LIBTOOL = @LIBTOOL@ --tag=CC
|
||||
|
||||
noinst_PROGRAMS = testlk
|
||||
diff --git a/tools/rpcgen/Makefile.am b/tools/rpcgen/Makefile.am
|
||||
index 8a9ec89..3e092c9 100644
|
||||
--- a/tools/rpcgen/Makefile.am
|
||||
+++ b/tools/rpcgen/Makefile.am
|
||||
@@ -1,6 +1,5 @@
|
||||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
-CC=$(CC_FOR_BUILD)
|
||||
LIBTOOL = @LIBTOOL@ --tag=CC
|
||||
|
||||
noinst_PROGRAMS = rpcgen
|
||||
--
|
||||
2.11.0
|
||||
|
||||
+8
-4
@@ -28,10 +28,10 @@ Rebase it.
|
||||
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
|
||||
---
|
||||
support/misc/Makefile.am | 2 +-
|
||||
support/misc/file.c | 111 ---------------------------------------------------------------------------------------------------------------
|
||||
support/misc/file.c | 115 ---------------------------------------------------------------------------------------------------------------
|
||||
support/misc/misc.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
support/nsm/Makefile.am | 2 +-
|
||||
4 files changed, 113 insertions(+), 113 deletions(-)
|
||||
4 files changed, 113 insertions(+), 117 deletions(-)
|
||||
|
||||
diff --git a/support/misc/Makefile.am b/support/misc/Makefile.am
|
||||
index f9993e3..8b0e9db 100644
|
||||
@@ -48,10 +48,10 @@ index f9993e3..8b0e9db 100644
|
||||
MAINTAINERCLEANFILES = Makefile.in
|
||||
diff --git a/support/misc/file.c b/support/misc/file.c
|
||||
deleted file mode 100644
|
||||
index e7c3819..0000000
|
||||
index 06f6bb2..0000000
|
||||
--- a/support/misc/file.c
|
||||
+++ /dev/null
|
||||
@@ -1,111 +0,0 @@
|
||||
@@ -1,115 +0,0 @@
|
||||
-/*
|
||||
- * Copyright 2009 Oracle. All rights reserved.
|
||||
- * Copyright 2017 Red Hat, Inc. All rights reserved.
|
||||
@@ -72,6 +72,10 @@ index e7c3819..0000000
|
||||
- * along with nfs-utils. If not, see <http://www.gnu.org/licenses/>.
|
||||
- */
|
||||
-
|
||||
-#ifdef HAVE_CONFIG_H
|
||||
-#include <config.h>
|
||||
-#endif
|
||||
-
|
||||
-#include <sys/stat.h>
|
||||
-
|
||||
-#include <string.h>
|
||||
|
||||
+2
-3
@@ -30,11 +30,10 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x
|
||||
file://bugfix-adjust-statd-service-name.patch \
|
||||
file://0001-cacheio-use-intmax_t-for-formatted-IO.patch \
|
||||
file://0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch \
|
||||
file://0001-Don-t-build-tools-with-CC_FOR_BUILD.patch \
|
||||
file://clang-warnings.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "d427c6b3014e9a04e8498f0598b1c1b9"
|
||||
SRC_URI[sha256sum] = "4464737a03d5f73ded2ffefe19d5543ed7b1d6c541985d8acaafdc8025aa1038"
|
||||
SRC_URI[md5sum] = "06020c76f531ed97f3145514901e0e7c"
|
||||
SRC_URI[sha256sum] = "af65fce5dd8370cff9ead67baac5a6cd69c376dcadfef264dc2c78c904f26599"
|
||||
|
||||
# Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will
|
||||
# pull in the remainder of the dependencies.
|
||||
Reference in New Issue
Block a user