mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

nfs-utils: 2.8.3 -> 2.8.4

Browse Source 
* Remove backported patch 0002-Fix-build-with-glibc-2.42.patch.

(From OE-Core rev: 988dc5702eb22d81ba414133b38bd6cadc8cda6b)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Robert Yang
2025-09-15 21:10:56 -07:00
committed by Richard Purdie
parent 70d32ed86b
commit 7d02a8689f
2 changed files with 1 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
meta/recipes-connectivity/nfs-utils/nfs-utils/0002-Fix-build-with-glibc-2.42.patch
View File

@@ -1,57 +0,0 @@
From d74ef9afacf9dc4a067a2f984f52ad136fb46c31 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Fri, 27 Jun 2025 04:54:08 -0500
Subject: [PATCH] Fix build with glibc-2.42
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
exportfs.c: In function ‘release_lockfile’:
exportfs.c:83:17: error: ignoring return value of ‘lockf’ declared with attribute ‘warn_unused_result’ [-Werror=unused-result]
83 | lockf(_lockfd, F_ULOCK, 0);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
exportfs.c: In function ‘grab_lockfile’:
exportfs.c:77:17: error: ignoring return value of ‘lockf’ declared with attribute ‘warn_unused_result’ [-Werror=unused-result]
77 | lockf(_lockfd, F_LOCK, 0);
| ^~~~~~~~~~~~~~~~~~~~~~~~~
lockf is now marked with attribute warn_unused_result:
https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=f3c82fc1b41261f582f5f9fa12f74af9bcbc88f9
Upstream-Status: Backport [https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=9f974046c37b7c28705d5558328759fff708b1cb]
Signed-off-by: Steve Dickson <steved@redhat.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
utils/exportfs/exportfs.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
index b03a047..748c38e 100644
--- a/utils/exportfs/exportfs.c
+++ b/utils/exportfs/exportfs.c
@@ -74,13 +74,19 @@ grab_lockfile(void)
{
_lockfd = open(lockfile, O_CREAT|O_RDWR, 0666);
if (_lockfd != -1)
- lockf(_lockfd, F_LOCK, 0);
+ if (lockf(_lockfd, F_LOCK, 0) != 0) {
+ xlog_warn("%s: lockf() failed: errno %d (%s)",
+ __func__, errno, strerror(errno));
+ }
}
static void
release_lockfile(void)
{
if (_lockfd != -1) {
- lockf(_lockfd, F_ULOCK, 0);
+ if (lockf(_lockfd, F_ULOCK, 0) != 0) {
+ xlog_warn("%s: lockf() failed: errno %d (%s)",
+ __func__, errno, strerror(errno));
+ }
close(_lockfd);
_lockfd = -1;
}
--
2.43.0

3
meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.3.bb → meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.4.bb
View File

@@ -22,12 +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://0002-Fix-build-with-glibc-2.42.patch \
file://0004-Use-nogroup-for-nobody-group.patch \
file://0005-find-OE-provided-Kerberos.patch \
"
SRC_URI[sha256sum] = "11e7c5847a8423a72931c865bd9296e7fd56ff270a795a849183900961711725"
SRC_URI[sha256sum] = "11c4cc598a434d7d340bad3e072a373ba1dcc2c49f855d44b202222b78ecdbf5"
# Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will
# pull in the remainder of the dependencies.