diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-getport-fix-missing-stddef.h-inclusion.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-getport-fix-missing-stddef.h-inclusion.patch deleted file mode 100644 index 1683e9692b5..00000000000 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-getport-fix-missing-stddef.h-inclusion.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Jaipaul Cheernam -Date: Thu, 6 Aug 2026 10:55:00 +0000 -Subject: [PATCH] getport: fix missing stddef.h inclusion - -getport.c uses offsetof() but does not include . On glibc -this works because offsetof is pulled in transitively, but on musl it -is not available without the explicit include, causing: - - getport.c:459:41: error: implicit declaration of function 'offsetof' - -Upstream-Status: Submitted [https://lore.kernel.org/linux-nfs/20260806112023.25090-1-jaipaul.cheernam@est.tech/] -Signed-off-by: Jaipaul Cheernam ---- - support/nfs/getport.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/support/nfs/getport.c b/support/nfs/getport.c ---- a/support/nfs/getport.c -+++ b/support/nfs/getport.c -@@ -27,6 +27,7 @@ - #include - #endif - -+#include - #include - #include - #include diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0004-Use-nogroup-for-nobody-group.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0004-Use-nogroup-for-nobody-group.patch index 7e63cb62826..1bc3fc832be 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0004-Use-nogroup-for-nobody-group.patch +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/0004-Use-nogroup-for-nobody-group.patch @@ -1,4 +1,4 @@ -From 5f4739475f3c01145174734ed8a3b31b3da99b77 Mon Sep 17 00:00:00 2001 +From f8407c33b26641c08ad76422ba2ff78214364b19 Mon Sep 17 00:00:00 2001 From: Daniel McGregor Date: Tue, 6 Jun 2023 16:07:53 -0600 Subject: [PATCH] Use "nogroup" for nobody group @@ -24,7 +24,7 @@ index 2a2f79a..e6f3724 100644 [Translation] diff --git a/utils/idmapd/idmapd.c b/utils/idmapd/idmapd.c -index 5231f56..e1aa8a5 100644 +index c41ae1f..7339a88 100644 --- a/utils/idmapd/idmapd.c +++ b/utils/idmapd/idmapd.c @@ -89,7 +89,7 @@ diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0005-find-OE-provided-Kerberos.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0005-find-OE-provided-Kerberos.patch index bb152c2754b..e88608bd376 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0005-find-OE-provided-Kerberos.patch +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/0005-find-OE-provided-Kerberos.patch @@ -1,4 +1,4 @@ -From a1759d9079a436096be5ce44622a3a5a85ec9faa Mon Sep 17 00:00:00 2001 +From 43a992e7bb491fd6e7e50861c9eaf0c549e98293 Mon Sep 17 00:00:00 2001 From: Daniel McGregor Date: Wed, 8 Nov 2023 16:24:20 -0600 Subject: [PATCH] find OE provided Kerberos diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0006-configure.ac-gate-HAVE_NFSD_NETLINK-on-enable-nfsdct.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0006-configure.ac-gate-HAVE_NFSD_NETLINK-on-enable-nfsdct.patch deleted file mode 100644 index d15ea1ac5dd..00000000000 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0006-configure.ac-gate-HAVE_NFSD_NETLINK-on-enable-nfsdct.patch +++ /dev/null @@ -1,47 +0,0 @@ -From: Jaipaul Cheernam -Date: Wed, 5 Aug 2026 06:55:00 +0000 -Subject: [PATCH] configure.ac: gate HAVE_NFSD_NETLINK on --enable-nfsdctl - -HAVE_NFSD_NETLINK is currently defined unconditionally, but the -implementation of nfsd_nl_cmd_str() in support/nfs/nfsdnl.c is only -compiled into libnfs when CONFIG_NFSDCTL is true (--enable-nfsdctl). - -This causes a link failure when building with --disable-nfsdctl: - - ld: exportfs-exportfs.o: in function `unexportfs_parsed': - exportfs.c:491: undefined reference to `nfsd_nl_cmd_str' - -The callers (exportfs.c) guard their usage with #ifdef HAVE_NFSD_NETLINK, -and nfsdnl.h provides a static inline stub returning -ENOSYS when the -macro is not defined. So the correct fix is to only define -HAVE_NFSD_NETLINK when --enable-nfsdctl is in effect, keeping netlink -support as an opt-in feature consistent with the CONFIG_NFSDCTL guard -on nfsdnl.c. - -Upstream-Status: Submitted [https://lore.kernel.org/linux-nfs/9fec9f1b-1c10-4a20-8282-dfc9addb4ee8@est.tech/T/#u] -Signed-off-by: Jaipaul Cheernam ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac ---- a/configure.ac -+++ b/configure.ac -@@ -256,8 +256,6 @@ - PKG_CHECK_MODULES(LIBNLGENL3, libnl-genl-3.0 >= 3.1) - - AC_CHECK_HEADERS(linux/nfsd_netlink.h) --AC_DEFINE([HAVE_NFSD_NETLINK], 1, -- [Define to 1 if nfsd generic netlink support is available]) - - # ensure the system netlink headers have the latest features - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], -@@ -279,6 +277,8 @@ - enable_nfsdctl="yes") - AM_CONDITIONAL(CONFIG_NFSDCTL, [test "$enable_nfsdctl" = "yes" ]) - if test "$enable_nfsdctl" = yes; then -+ AC_DEFINE([HAVE_NFSD_NETLINK], 1, -+ [Define to 1 if nfsd generic netlink support is available]) - PKG_CHECK_MODULES(LIBREADLINE, readline) - fi - diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.9.2.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_3.1.1.bb similarity index 96% rename from meta/recipes-connectivity/nfs-utils/nfs-utils_2.9.2.bb rename to meta/recipes-connectivity/nfs-utils/nfs-utils_3.1.1.bb index c2017a14ef3..89a69ca72c1 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.9.2.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_3.1.1.bb @@ -23,11 +23,9 @@ 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://0006-configure.ac-gate-HAVE_NFSD_NETLINK-on-enable-nfsdct.patch \ - file://0001-getport-fix-missing-stddef.h-inclusion.patch \ " -SRC_URI[sha256sum] = "e1dd8a9c95af15492065942cc3b52b1339ffd586baa2280ed86c9d3dc4097e8c" +SRC_URI[sha256sum] = "7dbc05eb8b32828b322872b759a62cb3979cb4118f344dd8616813d1390e84e0" # Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will # pull in the remainder of the dependencies.