nfs-utils: 2.7.1 -> 2.8.1

* Remove patches already merged by upstream:
  0001-support-include-junction.h-Define-macros-for-musl.patch
  0001-support-junction-path.c-Fix-build-for-musl.patch

* Add PACKAGECONFIG[nfsdctl]

(From OE-Core rev: 2dda60516bc6be173d299c44aab92f096fd960c3)

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
2024-11-05 05:18:20 -08:00
committed by Richard Purdie
parent 5a1c52e064
commit d572b58a62
3 changed files with 3 additions and 84 deletions

View File

@@ -1,46 +0,0 @@
From 6f82ffa0e01e88e4e73972cb0125fcb6e78e27cf Mon Sep 17 00:00:00 2001
From: Robert Yang <liezhi.yang@windriver.com>
Date: Sun, 8 Sep 2024 09:45:41 +0000
Subject: [PATCH] support/include/junction.h: Define macros for musl
Fixed 1:
In file included from cache.c:1217:
../../support/include/junction.h:128:21: error: expected ';' before 'char'
128 | __attribute_malloc__
| ^
| ;
129 | char **nfs_dup_string_array(char **array);
Fixed 2:
junction.c: In function 'junction_set_sticky_bit':
junction.c:164:39: error: 'ALLPERMS' undeclared (first use in this function)
164 | stb.st_mode &= (unsigned int)~ALLPERMS;
Upstream-Status: Submitted [https://marc.info/?l=linux-nfs&m=172579572428765&w=2]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
support/include/junction.h | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/support/include/junction.h b/support/include/junction.h
index 7257d80..d127dd5 100644
--- a/support/include/junction.h
+++ b/support/include/junction.h
@@ -26,6 +26,16 @@
#ifndef _NFS_JUNCTION_H_
#define _NFS_JUNCTION_H_
+/* For musl, refered to glibc's sys/cdefs.h */
+#ifndef __attribute_malloc__
+#define __attribute_malloc__ __attribute__((__malloc__))
+#endif
+
+/* For musl, refered to glibc's sys/stat.h */
+#ifndef ALLPERMS
+#define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)/* 07777 */
+#endif
+
#include <stdint.h>
/*

View File

@@ -1,35 +0,0 @@
From ad4ec0c40aaea37b8e7ec3e73d7b35cbda2d3841 Mon Sep 17 00:00:00 2001
From: Robert Yang <liezhi.yang@windriver.com>
Date: Sun, 8 Sep 2024 08:34:28 +0000
Subject: [PATCH] support/junction/path.c: Fix build for musl
Fixed:
path.c:164:24: error: implicit declaration of function 'strchrnul'; did you mean 'strchr'? [-Wimplicit-function-declaration]
[snip]
path.c:239:27: error: 'NAME_MAX' undeclared (first use in this function); did you mean 'AF_MAX'?
Upstream-Status: Submitted [https://marc.info/?l=linux-nfs&m=172579572228762&w=2]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
support/junction/path.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/support/junction/path.c b/support/junction/path.c
index c25cc52..6e28df3 100644
--- a/support/junction/path.c
+++ b/support/junction/path.c
@@ -23,6 +23,12 @@
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
*/
+/* For musl */
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+#include <limits.h>
+
#include <sys/types.h>
#include <sys/stat.h>

View File

@@ -31,10 +31,9 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x
file://0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch \
file://clang-warnings.patch \
file://0001-locktest-Makefile.am-Do-not-use-build-flags.patch \
file://0001-support-include-junction.h-Define-macros-for-musl.patch \
file://0001-support-junction-path.c-Fix-build-for-musl.patch \
"
SRC_URI[sha256sum] = "885c948a84a58bca4148f459588f9a7369dbb40dcc466f04e455c6b10fd0aa48"
SRC_URI[sha256sum] = "a0be95b08396908048583fcf6b34a7c1ab49d53e8a12eb28673ccfd2eff0c505"
# Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will
# pull in the remainder of the dependencies.
@@ -74,6 +73,7 @@ PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
PACKAGECONFIG[nfsv41] = "--enable-nfsv41,--disable-nfsv41,libdevmapper,libdevmapper"
# keyutils is available in meta-oe
PACKAGECONFIG[nfsv4] = "--enable-nfsv4,--disable-nfsv4,keyutils,python3-core"
PACKAGECONFIG[nfsdctl] = "--enable-nfsdctl,--disable-nfsdctl,libnl readline,"
PACKAGES =+ "${PN}-client ${PN}-mount ${PN}-stats ${PN}-rpcctl"