MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

nfs-utils: 2.8.2 -> 2.8.3

Browse Source 
* Remove upstream merged patches:
0001-Fix-typecast-warning-with-clang.patch
0003-support-nfs-xcommon.c-fix-a-formatting-error-with-cl.patch

(From OE-Core rev: d3bc8591610733ba9145bb7f97b9490aeddad9c2)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Robert Yang 2025-06-04 08:00:57 -07:00 committed by Richard Purdie
parent 6489e5cb80
commit 65a681e192
3 changed files with 1 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
meta/recipes-connectivity/nfs-utils/nfs-utils/0001-Fix-typecast-warning-with-clang.patch
View File

@ -1,32 +0,0 @@
From 0a64c5ad17786796d84390e480a38b4f762229ae Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 18 Dec 2024 19:20:39 -0800
Subject: [PATCH v2] Fix typecast warning with clang
Fixes
file.c:200:8: error: assigning to 'char *' from 'const char *' discards qualifiers [-Werror,-Wincompatible-pointer-types-discards-qualifiers]
Upstream-Status: Submitted [https://marc.info/?l=linux-nfs&m=173463533411103&w=2]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Benjamin Coddington <bcodding@redhat.com>
Cc: Steve Dickson <steved@redhat.com>
---
v2: Make base as const char pointer insread of trying type punning
support/nsm/file.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/support/nsm/file.c b/support/nsm/file.c
index de122b0f..68f99bf0 100644
--- a/support/nsm/file.c
+++ b/support/nsm/file.c
@@ -184,7 +184,8 @@ static char *
nsm_make_temp_pathname(const char *pathname)
{
size_t size;
- char *path, *base;
+ char *path;
+ const char *base;
int len;
size = strlen(pathname) + sizeof(".new") + 1;

40
meta/recipes-connectivity/nfs-utils/nfs-utils/0003-support-nfs-xcommon.c-fix-a-formatting-error-with-cl.patch
View File

@ -1,40 +0,0 @@
From cc59a7fe15b6ca2ee43cba0dc1d699323b36ffcc Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex@linutronix.de>
Date: Fri, 21 Mar 2025 10:42:56 +0100
Subject: [PATCH] support/nfs/xcommon.c: fix a formatting error with clang
Specifically, this happens:
| xcommon.c:101:24: error: format string is not a string literal [-Werror,-Wformat-nonliteral]
| 101 | vfprintf (stderr, fmt2, args);
| | ^~~~
A similar approach (print \n seprately) is already used elsewhere in
the same file.
Upstream-Status: Submitted [via email to steved@redhat.com,linux-nfs@vger.kernel.org]
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
support/nfs/xcommon.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/support/nfs/xcommon.c b/support/nfs/xcommon.c
index 3989f0b..1d04dd1 100644
--- a/support/nfs/xcommon.c
+++ b/support/nfs/xcommon.c
@@ -94,13 +94,11 @@ xstrconcat4 (const char *s, const char *t, const char *u, const char *v) {
void
nfs_error (const char *fmt, ...) {
va_list args;
- char *fmt2;
- fmt2 = xstrconcat2 (fmt, "\n");
va_start (args, fmt);
- vfprintf (stderr, fmt2, args);
+ vfprintf (stderr, fmt, args);
+ fprintf (stderr, "\n");
va_end (args);
- free (fmt2);
}
/* Make a canonical pathname from PATH. Returns a freshly malloced string.

4
meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.2.bb → meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.3.bb
View File

@ -22,13 +22,11 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x
file://nfsserver \
file://nfscommon \
file://0001-locktest-Makefile.am-Do-not-use-build-flags.patch \
file://0001-Fix-typecast-warning-with-clang.patch \
file://0004-Use-nogroup-for-nobody-group.patch \
file://0005-find-OE-provided-Kerberos.patch \
file://0003-support-nfs-xcommon.c-fix-a-formatting-error-with-cl.patch \
"
SRC_URI[sha256sum] = "a39bbea76ac0ab9e6e8699caf3c308b6b310c20d458e8fa8606196d358e7fb15"
SRC_URI[sha256sum] = "11e7c5847a8423a72931c865bd9296e7fd56ff270a795a849183900961711725"
# Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will
# pull in the remainder of the dependencies.