From: Robert Yang <liezhi.yang@windriver.com>
Date: Thu, 21 May 2026 07:46:46 +0000 (-0700)
Subject: nfs-utils: 2.8.7 -> 2.9.1
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=fa3c34dc704a672a1331ec33f15e12ebbff8aeb6;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

nfs-utils: 2.8.7 -> 2.9.1

* Add libnl to DEPENDS to fix:
  configure: error: Package requirements (libnl-3.0 >= 3.1) were not met:

* Add 0001-fh_key_file.c-Fix-build-error-for-musl.patch to fix build with musl:
  error: implicit declaration of function 'strerror'

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Antonin Godard <antonin.godard@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-fh_key_file.c-Fix-build-error-for-musl.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-fh_key_file.c-Fix-build-error-for-musl.patch
new file mode 100644
index 00000000000..d6db1fe0c0b
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-fh_key_file.c-Fix-build-error-for-musl.patch
@@ -0,0 +1,31 @@
+From 98048fd9262b3e4e024248ebd07d5ff66175e4ec Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Thu, 7 May 2026 03:32:57 -0700
+Subject: [PATCH] fh_key_file.c: Fix build error with musl
+
+Fixed:
+error: implicit declaration of function 'strerror'
+
+Upstream-Status: Backport [https://lore.kernel.org/linux-nfs/b2b370b6-8576-493a-b124-776e1249c312@redhat.com/]
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ support/nfs/fh_key_file.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/support/nfs/fh_key_file.c b/support/nfs/fh_key_file.c
+index 5f5eafc..89555ce 100644
+--- a/support/nfs/fh_key_file.c
++++ b/support/nfs/fh_key_file.c
+@@ -30,6 +30,8 @@
+ 
+ #include "nfslib.h"
+ 
++#include <string.h>
++
+ #define HASH_BLOCKSIZE  256
+ int hash_fh_key_file(const char *fh_key_file, uuid_t uuid)
+ {
+-- 
+2.49.0
+
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.7.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.9.1.bb
similarity index 96%
rename from meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.7.bb
rename to meta/recipes-connectivity/nfs-utils/nfs-utils_2.9.1.bb
index 7693a88682f..6f00bee0d80 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.7.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.9.1.bb
@@ -8,7 +8,7 @@ LICENSE = "MIT & GPL-2.0-or-later & BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=95f3a93a5c3c7888de623b46ea085a84"
 
 # util-linux for libblkid
-DEPENDS = "libcap libevent util-linux sqlite3 libtirpc libxml2"
+DEPENDS = "libcap libevent util-linux sqlite3 libtirpc libxml2 libnl"
 RDEPENDS:${PN} = "netbase ${PN}-client"
 RRECOMMENDS:${PN} = "kernel-module-nfsd"
 
@@ -23,9 +23,10 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x
            file://nfscommon \
            file://0004-Use-nogroup-for-nobody-group.patch \
            file://0005-find-OE-provided-Kerberos.patch \
+           file://0001-fh_key_file.c-Fix-build-error-for-musl.patch \
            "
 
-SRC_URI[sha256sum] = "59d0f1e17b18efaa60ea3ccf89a9cad3217f8d3b23c18d2fe34b25c8969d60ae"
+SRC_URI[sha256sum] = "302846343bf509f8f884c23bdbd0fe853b7f7cbb6572060a9082279d13b21a2c"
 
 # Only kernel-module-nfsd is required here (but can be built-in)  - the nfsd module will
 # pull in the remainder of the dependencies.