Skip to contentSkip to conversation

nfs-utils: 2.6.4 -> 2.7.1

PATCH New [email protected] 1 participant 2 messages Sep 8, 2024

lore
Share & tools
lore
#0 lore raw

cover nfs-utils: 2.6.4 -> 2.7.1

From: Robert Yang <[email protected]>

The following changes since commit c7c9f827e914b7c27856d995da553a2e41372321:

recipes-bsp: usbutils: Fix usb-devices command using busybox (2024-09-07 07:31:16 +0100)

are available in the Git repository at:

https://github.com/robertlinux/yocto rbt/nfs-utils
https://github.com/robertlinux/yocto/tree/rbt/nfs-utils

Robert Yang (1):
nfs-utils: 2.6.4 -> 2.7.1

 ...nclude-unistd.h-to-compile-with-musl.patch | 34 ------------
 ...de-junction.h-Define-macros-for-musl.patch | 46 ++++++++++++++++
 ...t-junction-path.c-Fix-build-for-musl.patch | 35 ++++++++++++
 ...locktest-Use-intmax_t-to-print-off_t.patch | 53 -------------------
 ...{nfs-utils_2.6.4.bb => nfs-utils_2.7.1.bb} |  8 +--
 5 files changed, 85 insertions(+), 91 deletions(-)
 delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-reexport.h-Include-unistd.h-to-compile-with-musl.patch
 create mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-support-include-junction.h-Define-macros-for-musl.patch
 create mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-support-junction-path.c-Fix-build-for-musl.patch
 delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-tools-locktest-Use-intmax_t-to-print-off_t.patch
 rename meta/recipes-connectivity/nfs-utils/{nfs-utils_2.6.4.bb => nfs-utils_2.7.1.bb} (94%)
Signature · 1 line
2.44.1
#1 lore raw

PATCH 1/1 nfs-utils: 2.6.4 -> 2.7.1

From: Robert Yang <[email protected]>

* Remove 0001-tools-locktest-Use-intmax_t-to-print-off_t.patch, upstream has fixed it with %lld.

* Remove 0001-reexport.h-Include-unistd.h-to-compile-with-musl.patch, it builds well with musl without this patch.

* Add libxml2 to DEPENDS to fix:
configure: error: libxml2 not found.

* Add the following 2 patches to fix build errors with musl:
0001-support-include-junction.h-Define-macros-for-musl.patch 0001-support-junction-path.c-Fix-buld-for-musl.patch

---
 ...nclude-unistd.h-to-compile-with-musl.patch | 34 ------------
 ...de-junction.h-Define-macros-for-musl.patch | 46 ++++++++++++++++
 ...t-junction-path.c-Fix-build-for-musl.patch | 35 ++++++++++++
 ...locktest-Use-intmax_t-to-print-off_t.patch | 53 -------------------
 ...{nfs-utils_2.6.4.bb => nfs-utils_2.7.1.bb} |  8 +--
 5 files changed, 85 insertions(+), 91 deletions(-)
 delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-reexport.h-Include-unistd.h-to-compile-with-musl.patch
 create mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-support-include-junction.h-Define-macros-for-musl.patch
 create mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-support-junction-path.c-Fix-build-for-musl.patch
 delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-tools-locktest-Use-intmax_t-to-print-off_t.patch
 rename meta/recipes-connectivity/nfs-utils/{nfs-utils_2.6.4.bb => nfs-utils_2.7.1.bb} (94%)
meta/recipes-connectivity/nfs-utils/nfs-utils/0001-reexport.h-Include-unistd.h-to-compile-with-musl.patch deleted +0 -34
deleted file mode 100644
index 57d4660571..0000000000
@@ -1,34 +0,0 @@
-From 45597a58e98f351b18db8444292b1cf6dd0cd810 Mon Sep 17 00:00:00 2001
-From: Robert Yang <[email protected]>
-Date: Sat, 9 Dec 2023 23:34:08 -0800
-Subject: [PATCH] reexport.h: Include unistd.h to compile with musl
-
-Fixed error when compile with musl
-reexport.c: In function 'reexpdb_init':
-reexport.c:62:17: error: implicit declaration of function 'sleep' [-Werror=implicit-function-declaration]
-   62 |                 sleep(1);
-
-
-Upstream-Status: Submitted [https://marc.info/?l=linux-nfs&m=170254661824522&w=2]
-
-Signed-off-by: Robert Yang <[email protected]>
----
- support/reexport/reexport.h | 1 +
- 1 files changed, 1 insertions(+)
-
-diff --git a/support/reexport/reexport.h b/support/reexport/reexport.h
-index 85fd59c..02f8684 100644
---- a/support/reexport/reexport.h
-+++ b/support/reexport/reexport.h
-@@ -1,6 +1,8 @@
- #ifndef REEXPORT_H
- #define REEXPORT_H
- 
-+#include <unistd.h>
-+
- #include "nfslib.h"
- 
- enum {
--- 
-2.42.0
-
meta/recipes-connectivity/nfs-utils/nfs-utils/0001-support-include-junction.h-Define-macros-for-musl.patch new file +46 -0

46 lines not on this page · raw message

meta/recipes-connectivity/nfs-utils/nfs-utils/0001-support-junction-path.c-Fix-build-for-musl.patch new file +35 -0
new file mode 100644
index 0000000000..ae2b0c566c
@@ -0,0 +1,35 @@
+From ad4ec0c40aaea37b8e7ec3e73d7b35cbda2d3841 Mon Sep 17 00:00:00 2001
+From: Robert Yang <[email protected]>
+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 <[email protected]>
+---
+ 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>
+ 
meta/recipes-connectivity/nfs-utils/nfs-utils/0001-tools-locktest-Use-intmax_t-to-print-off_t.patch deleted +0 -53

53 lines not on this page · raw message

meta/recipes-connectivity/nfs-utils/nfs-utils_2.7.1.bb renamed from meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb +4 -4
similarity index 94%
rename from meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb
rename to meta/recipes-connectivity/nfs-utils/nfs-utils_2.7.1.bb
index 9aa8bc4eab..849ea0e43b 100644
@@ -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"
+DEPENDS = "libcap libevent util-linux sqlite3 libtirpc libxml2"
 RDEPENDS:${PN} = "${PN}-client"
 RRECOMMENDS:${PN} = "kernel-module-nfsd"
 
@@ -31,10 +31,10 @@ 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-tools-locktest-Use-intmax_t-to-print-off_t.patch \
-           file://0001-reexport.h-Include-unistd.h-to-compile-with-musl.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] = "01b3b0fb9c7d0bbabf5114c736542030748c788ec2fd9734744201e9b0a1119d"
+SRC_URI[sha256sum] = "885c948a84a58bca4148f459588f9a7369dbb40dcc466f04e455c6b10fd0aa48"
 
 # Only kernel-module-nfsd is required here (but can be built-in)  - the nfsd module will
 # pull in the remainder of the dependencies.
Signature · 1 line
2.44.1