diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2023-12-11 06:49:50 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-12-13 11:34:27 +0000 |
commit | b3f6a6d87dfba7f0dc82f7921a178bac022c4da7 (patch) | |
tree | 395c187baefc88f1cb5c94019f3370b37edb1853 /meta/recipes-connectivity/nfs-utils | |
parent | 7cf0c30096913f977c1bd0d7e2b167cac6b93aec (diff) | |
download | poky-b3f6a6d87dfba7f0dc82f7921a178bac022c4da7.tar.gz |
nfs-utils: Upgrade 2.6.3 -> 2.6.4
* Remove backported patch 0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch.
* Add 0001-reexport.h-Include-unistd.h-to-compile-with-musl.patch to fix build with musl
(From OE-Core rev: ff416e9fd6a1a65cf59ecd662613581b6190e05e)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/nfs-utils')
-rw-r--r-- | meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch | 80 | ||||
-rw-r--r-- | meta/recipes-connectivity/nfs-utils/nfs-utils/0001-reexport.h-Include-unistd.h-to-compile-with-musl.patch | 34 | ||||
-rw-r--r-- | meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb (renamed from meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.3.bb) | 8 |
3 files changed, 38 insertions, 84 deletions
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch deleted file mode 100644 index 5afc714f19..0000000000 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch +++ /dev/null | |||
@@ -1,80 +0,0 @@ | |||
1 | From b62a3fe424026b73ec6b1934483b16863c7dff23 Mon Sep 17 00:00:00 2001 | ||
2 | From: Wiktor Jaskulski <wjaskulski@adva.com> | ||
3 | Date: Thu, 11 May 2023 15:28:23 -0400 | ||
4 | Subject: [PATCH] configure.ac: libevent and libsqlite3 checked when nfsv4 is | ||
5 | disabled | ||
6 | |||
7 | Upstream-Status: Backport | ||
8 | (http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=bc4a5deef9f820c55fdac3c0070364c17cd91cca) | ||
9 | |||
10 | Signed-off-by: Steve Dickson <steved@redhat.com> | ||
11 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | ||
12 | --- | ||
13 | configure.ac | 38 +++++++++++++++----------------------- | ||
14 | 1 file changed, 15 insertions(+), 23 deletions(-) | ||
15 | |||
16 | diff --git a/configure.ac b/configure.ac | ||
17 | index 4ade528d..519cacbf 100644 | ||
18 | --- a/configure.ac | ||
19 | +++ b/configure.ac | ||
20 | @@ -335,42 +335,34 @@ AC_CHECK_HEADER(rpc/rpc.h, , | ||
21 | AC_MSG_ERROR([Header file rpc/rpc.h not found - maybe try building with --enable-tirpc])) | ||
22 | CPPFLAGS="${nfsutils_save_CPPFLAGS}" | ||
23 | |||
24 | +dnl check for libevent libraries and headers | ||
25 | +AC_LIBEVENT | ||
26 | + | ||
27 | +dnl Check for sqlite3 | ||
28 | +AC_SQLITE3_VERS | ||
29 | + | ||
30 | +case $libsqlite3_cv_is_recent in | ||
31 | +yes) ;; | ||
32 | +unknown) | ||
33 | + dnl do not fail when cross-compiling | ||
34 | + AC_MSG_WARN([assuming sqlite is at least v3.3]) ;; | ||
35 | +*) | ||
36 | + AC_MSG_ERROR([nfsdcld requires sqlite-devel]) ;; | ||
37 | +esac | ||
38 | + | ||
39 | if test "$enable_nfsv4" = yes; then | ||
40 | - dnl check for libevent libraries and headers | ||
41 | - AC_LIBEVENT | ||
42 | |||
43 | dnl check for the keyutils libraries and headers | ||
44 | AC_KEYUTILS | ||
45 | |||
46 | - dnl Check for sqlite3 | ||
47 | - AC_SQLITE3_VERS | ||
48 | - | ||
49 | if test "$enable_nfsdcld" = "yes"; then | ||
50 | AC_CHECK_HEADERS([libgen.h sys/inotify.h], , | ||
51 | AC_MSG_ERROR([Cannot find header needed for nfsdcld])) | ||
52 | - | ||
53 | - case $libsqlite3_cv_is_recent in | ||
54 | - yes) ;; | ||
55 | - unknown) | ||
56 | - dnl do not fail when cross-compiling | ||
57 | - AC_MSG_WARN([assuming sqlite is at least v3.3]) ;; | ||
58 | - *) | ||
59 | - AC_MSG_ERROR([nfsdcld requires sqlite-devel]) ;; | ||
60 | - esac | ||
61 | fi | ||
62 | |||
63 | if test "$enable_nfsdcltrack" = "yes"; then | ||
64 | AC_CHECK_HEADERS([libgen.h sys/inotify.h], , | ||
65 | AC_MSG_ERROR([Cannot find header needed for nfsdcltrack])) | ||
66 | - | ||
67 | - case $libsqlite3_cv_is_recent in | ||
68 | - yes) ;; | ||
69 | - unknown) | ||
70 | - dnl do not fail when cross-compiling | ||
71 | - AC_MSG_WARN([assuming sqlite is at least v3.3]) ;; | ||
72 | - *) | ||
73 | - AC_MSG_ERROR([nfsdcltrack requires sqlite-devel]) ;; | ||
74 | - esac | ||
75 | fi | ||
76 | |||
77 | else | ||
78 | -- | ||
79 | 2.41.0 | ||
80 | |||
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-reexport.h-Include-unistd.h-to-compile-with-musl.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-reexport.h-Include-unistd.h-to-compile-with-musl.patch new file mode 100644 index 0000000000..8607b64cb1 --- /dev/null +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-reexport.h-Include-unistd.h-to-compile-with-musl.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From 45597a58e98f351b18db8444292b1cf6dd0cd810 Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Sat, 9 Dec 2023 23:34:08 -0800 | ||
4 | Subject: [PATCH] reexport.h: Include unistd.h to compile with musl | ||
5 | |||
6 | Fixed error when compile with musl | ||
7 | reexport.c: In function 'reexpdb_init': | ||
8 | reexport.c:62:17: error: implicit declaration of function 'sleep' [-Werror=implicit-function-declaration] | ||
9 | 62 | sleep(1); | ||
10 | |||
11 | |||
12 | Upstream-Status: Pending | ||
13 | |||
14 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
15 | --- | ||
16 | support/reexport/reexport.h | 1 + | ||
17 | 1 files changed, 1 insertions(+) | ||
18 | |||
19 | diff --git a/support/reexport/reexport.h b/support/reexport/reexport.h | ||
20 | index 85fd59c..02f8684 100644 | ||
21 | --- a/support/reexport/reexport.h | ||
22 | +++ b/support/reexport/reexport.h | ||
23 | @@ -1,6 +1,8 @@ | ||
24 | #ifndef REEXPORT_H | ||
25 | #define REEXPORT_H | ||
26 | |||
27 | +#include <unistd.h> | ||
28 | + | ||
29 | #include "nfslib.h" | ||
30 | |||
31 | enum { | ||
32 | -- | ||
33 | 2.42.0 | ||
34 | |||
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.3.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb index 35cf6af6d4..2f2644f9a8 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.3.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb | |||
@@ -30,11 +30,11 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x | |||
30 | file://bugfix-adjust-statd-service-name.patch \ | 30 | file://bugfix-adjust-statd-service-name.patch \ |
31 | file://0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch \ | 31 | file://0001-Makefile.am-fix-undefined-function-for-libnsm.a.patch \ |
32 | file://clang-warnings.patch \ | 32 | file://clang-warnings.patch \ |
33 | file://0001-configure.ac-libevent-and-libsqlite3-checked-when-nf.patch \ | 33 | file://0001-locktest-Makefile.am-Do-not-use-build-flags.patch \ |
34 | file://0001-locktest-Makefile.am-Do-not-use-build-flags.patch \ | 34 | file://0001-tools-locktest-Use-intmax_t-to-print-off_t.patch \ |
35 | file://0001-tools-locktest-Use-intmax_t-to-print-off_t.patch \ | 35 | file://0001-reexport.h-Include-unistd.h-to-compile-with-musl.patch \ |
36 | " | 36 | " |
37 | SRC_URI[sha256sum] = "38d89e853a71d3c560ff026af3d969d75e24f782ff68324e76261fe0344459e1" | 37 | SRC_URI[sha256sum] = "01b3b0fb9c7d0bbabf5114c736542030748c788ec2fd9734744201e9b0a1119d" |
38 | 38 | ||
39 | # Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will | 39 | # Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will |
40 | # pull in the remainder of the dependencies. | 40 | # pull in the remainder of the dependencies. |