[packages/lustre] - updated to 2.15.6
qboosh
qboosh at pld-linux.org
Tue Apr 15 21:32:46 CEST 2025
commit 2427ceedf6391a6c44b33618c74d803c673e56b0
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Tue Apr 15 21:25:23 2025 +0200
- updated to 2.15.6
lustre-configure.patch | 41 ++++++++++++++++++++++++--
lustre-format.patch | 11 -------
lustre-warnings.patch | 20 +++++++++++++
lustre-zfs.patch | 79 --------------------------------------------------
lustre.spec | 11 ++++---
5 files changed, 65 insertions(+), 97 deletions(-)
---
diff --git a/lustre.spec b/lustre.spec
index fec1197..cd3ab7b 100644
--- a/lustre.spec
+++ b/lustre.spec
@@ -15,22 +15,22 @@ Summary: Linux kernel modules for Lustre(R) file system
Summary(en.UTF-8): Linux kernel modules for Lustre® file system
Summary(pl.UTF-8): Moduły jądra Linuksa dla systemu plików Lustre®
Name: lustre
-Version: 2.15.4
+Version: 2.15.6
# commit hash taken from tag at https://git.whamcloud.com/?p=fs/lustre-release.git;a=summary
-%define gitref cac870cf4d2bd9905b1b2bbe563defe6d748ac94
+%define gitref f7948c626181cda1f72d148adc73ad499eb60307
%define shortref %(echo %{gitref} | cut -c1-7)
Release: 0.1
License: GPL v2
Group: Base/Kernel
Source0: https://git.whamcloud.com/?p=fs/lustre-release.git;a=snapshot;h=%{gitref};sf=tgz#/%{name}-%{version}.tar.gz
-# Source0-md5: 346030ff22e4187a9fdc2ca26424f0ee
+# Source0-md5: 46b284ae56669a4b28a007dc6bf72b9c
Patch0: %{name}-format.patch
Patch1: %{name}-snmp.patch
Patch2: %{name}-32bit.patch
Patch3: %{name}-tests.patch
Patch4: %{name}-link.patch
Patch5: %{name}-configure.patch
-Patch6: %{name}-zfs.patch
+Patch6: %{name}-warnings.patch
Patch7: %{name}-heimdal.patch
URL: https://www.lustre.org/
BuildRequires: autoconf >= 2.57
@@ -198,6 +198,9 @@ CPPFLAGS="%{rpmcppflags} -I$(pwd)/lnet/include/uapi -I$(pwd)/lustre/include/uapi
--with-linux-obj=%{_kernelsrcdir} \
--with-systemdsystemunitdir=%{systemdunitdir}
+# broken configure check - messed kernel and userspace buildsystems
+%{__sed} -i -e 's/.*HAVE_ZFS_NVLIST_CONST_INTERFACES.*/#define HAVE_ZFS_NVLIST_CONST_INTERFACES 1/' config.h
+
%{__make}
%install
diff --git a/lustre-configure.patch b/lustre-configure.patch
index 58877d6..d54a6bb 100644
--- a/lustre-configure.patch
+++ b/lustre-configure.patch
@@ -1,5 +1,5 @@
---- lustre-release-cac870c/config/lustre-build.m4.orig 2023-12-23 04:15:24.000000000 +0100
-+++ lustre-release-cac870c/config/lustre-build.m4 2024-05-20 20:02:55.285060327 +0200
+--- lustre-release-f7948c6/config/lustre-build.m4.orig 2024-11-27 23:19:27.000000000 +0100
++++ lustre-release-f7948c6/config/lustre-build.m4 2025-04-15 05:42:27.332508008 +0200
@@ -154,6 +154,7 @@ AC_ARG_ENABLE([modules],
])
AC_MSG_RESULT([$enable_modules ($target_os)])
@@ -16,7 +16,7 @@
# Run any parallel compile tests
LB_PROG_LINUX_SRC
-@@ -509,7 +509,6 @@ AC_ARG_ENABLE([server],
+@@ -513,7 +513,6 @@ AC_ARG_ENABLE([server],
# before running, so until LB_CONFIG_MODULES can be reorganized, we
# call it here.
LB_CONFIG_MODULES
@@ -24,6 +24,19 @@
LB_CONFIG_LDISKFS
LB_CONFIG_ZFS
+@@ -611,10 +610,10 @@ elif test x$enable_gss = xno ; then
+ RPMBINARGS="$RPMBINARGS --without gss"
+ AC_SUBST(ENABLE_GSS, no)
+ fi
+-if test x$enable_crypto = xyes ; then
++if test x"$enable_crypto" != xno ; then
+ RPMBINARGS="$RPMBINARGS --with crypto"
+ AC_SUBST(ENABLE_CRYPTO, yes)
+-elif test x$enable_crypto = xno ; then
++elif test x"$enable_crypto" = xno ; then
+ RPMBINARGS="$RPMBINARGS --without crypto"
+ AC_SUBST(ENABLE_CRYPTO, no)
+ fi
--- lustre-release-cac870c/lustre/autoconf/lustre-core.m4.orig 2023-12-23 04:15:24.000000000 +0100
+++ lustre-release-cac870c/lustre/autoconf/lustre-core.m4 2024-05-20 20:26:24.607425373 +0200
@@ -286,7 +286,6 @@ AC_ARG_ENABLE([gss_keyring],
@@ -52,3 +65,25 @@
AC_DEFINE(HAVE_LUSTRE_CRYPTO, 1, [Enable Lustre client crypto via embedded llcrypt])
AC_DEFINE(CONFIG_LL_ENCRYPTION, 1, [embedded llcrypt])
AC_DEFINE(HAVE_FSCRYPT_DUMMY_CONTEXT_ENABLED, 1, [embedded llcrypt uses llcrypt_dummy_context_enabled()])
+--- lustre-release-f7948c6/config/lustre-build-linux.m4.orig 2025-04-15 05:38:14.350545196 +0200
++++ lustre-release-f7948c6/config/lustre-build-linux.m4 2025-04-15 05:38:20.513845139 +0200
+@@ -269,7 +269,7 @@ if test "$DEFAULT_LINUX" = "/lib/modules
+ else
+ PATHS="/usr/src/linux-headers-$(uname -r)"
+ fi
+-PATHS+=" $DEFAULT_LINUX"
++PATHS="$PATHS $DEFAULT_LINUX"
+ for DEFAULT_LINUX_OBJ in $PATHS; do
+ AS_IF([readlink -q -e $DEFAULT_LINUX_OBJ >/dev/null], [break])
+ done
+--- lustre-release-f7948c6/config/lustre-build-zfs.m4.orig 2024-11-27 23:19:27.000000000 +0100
++++ lustre-release-f7948c6/config/lustre-build-zfs.m4 2025-04-15 05:39:12.490230226 +0200
+@@ -783,7 +783,7 @@ your distribution.
+ [Have zfs_refcount.h])
+ ])
+ old_EXTRA_KCFLAGS=$EXTRA_KCFLAGS
+- EXTRA_KCFLAGS+=" -Werror"
++ EXTRA_KCFLAGS="$EXTRA_KCFLAGS -Werror"
+ dnl #
+ dnl # ZFS 2.2.0 nvpair now returns and expects constant args
+ dnl #
diff --git a/lustre-format.patch b/lustre-format.patch
index 1f47e18..884f443 100644
--- a/lustre-format.patch
+++ b/lustre-format.patch
@@ -1,14 +1,3 @@
---- lustre-release-cac870c/libcfs/include/libcfs/libcfs_cpu.h.orig 2023-12-23 04:15:24.000000000 +0100
-+++ lustre-release-cac870c/libcfs/include/libcfs/libcfs_cpu.h 2024-05-20 17:26:23.682439108 +0200
-@@ -305,7 +305,7 @@ struct workqueue_struct *cfs_cpt_bind_wo
- struct workqueue_attrs attrs = { };
- struct workqueue_struct *wq;
-
-- wq = alloc_workqueue(wq_name, WQ_UNBOUND | flags, nthrs);
-+ wq = alloc_workqueue("%s", WQ_UNBOUND | flags, nthrs, wq_name);
- if (!wq)
- return ERR_PTR(-ENOMEM);
-
--- lustre-release-cac870c/lustre/utils/lfs.c.orig 2023-12-23 04:15:24.000000000 +0100
+++ lustre-release-cac870c/lustre/utils/lfs.c 2024-05-20 18:17:43.426251832 +0200
@@ -2699,7 +2699,7 @@ new_comp:
diff --git a/lustre-warnings.patch b/lustre-warnings.patch
new file mode 100644
index 0000000..270f996
--- /dev/null
+++ b/lustre-warnings.patch
@@ -0,0 +1,20 @@
+--- lustre-release-f7948c6/libcfs/libcfs/util/nidstrings.c.orig 2024-11-27 23:19:27.000000000 +0100
++++ lustre-release-f7948c6/libcfs/libcfs/util/nidstrings.c 2025-04-15 05:45:21.684896793 +0200
+@@ -302,7 +302,7 @@ libcfs_ip_addr_range_expand(struct list_
+ static int
+ libcfs_ip_addr_range_print(char *buffer, int count, struct list_head *list)
+ {
+- int i = 0, j = 0;
++ int i = 0;
+ struct cfs_expr_list *el;
+
+ list_for_each_entry(el, list, el_link) {
+@@ -461,7 +461,7 @@ static int
+ libcfs_num_addr_range_print(char *buffer, int count, struct list_head *list)
+ {
+ struct cfs_expr_list *el;
+- int i = 0, j = 0;
++ int i = 0;
+
+ list_for_each_entry(el, list, el_link) {
+ assert(j++ < 1);
diff --git a/lustre-zfs.patch b/lustre-zfs.patch
deleted file mode 100644
index 9f55e7a..0000000
--- a/lustre-zfs.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- lustre-release-cac870c/lustre/utils/libmount_utils_zfs.c.orig 2023-12-23 04:15:24.000000000 +0100
-+++ lustre-release-cac870c/lustre/utils/libmount_utils_zfs.c 2024-05-20 21:19:50.733389631 +0200
-@@ -62,17 +62,17 @@ struct zfs_ldd_prop_bridge {
- int zlpb_ldd_offset;
- /* Function pointer responsible for reading in the @prop
- * property from @zhp and storing it in @ldd_field */
-- int (*zlpb_get_prop_fn)(zfs_handle_t *zhp, char *prop, void *ldd_field);
-+ int (*zlpb_get_prop_fn)(zfs_handle_t *zhp, const char *prop, void *ldd_field);
- /* Function pointer responsible for writing the value of @ldd_field
- * into the @prop dataset property in @zhp */
-- int (*zlpb_set_prop_fn)(zfs_handle_t *zhp, char *prop, void *ldd_field);
-+ int (*zlpb_set_prop_fn)(zfs_handle_t *zhp, const char *prop, void *ldd_field);
- };
-
- /* Forward declarations needed to initialize the ldd prop bridge list */
--static int zfs_get_prop_int(zfs_handle_t *, char *, void *);
--static int zfs_set_prop_int(zfs_handle_t *, char *, void *);
--static int zfs_get_prop_str(zfs_handle_t *, char *, void *);
--static int zfs_set_prop_str(zfs_handle_t *, char *, void *);
-+static int zfs_get_prop_int(zfs_handle_t *, const char *, void *);
-+static int zfs_set_prop_int(zfs_handle_t *, const char *, void *);
-+static int zfs_get_prop_str(zfs_handle_t *, const char *, void *);
-+static int zfs_set_prop_str(zfs_handle_t *, const char *, void *);
-
- /* Helper for initializing the entries in the special_ldd_prop_params list.
- * - @name: stored directly in the zlpb_prop_name field
-@@ -113,7 +113,7 @@ static libzfs_handle_t *g_zfs;
-
- void zfs_fini(void);
-
--static int zfs_set_prop_int(zfs_handle_t *zhp, char *prop, void *val)
-+static int zfs_set_prop_int(zfs_handle_t *zhp, const char *prop, void *val)
- {
- char str[64];
- int ret;
-@@ -129,7 +129,7 @@ static int zfs_set_prop_int(zfs_handle_t
- * Write the zfs property string, note that properties with a NULL or
- * zero-length value will not be written and 0 returned.
- */
--static int zfs_set_prop_str(zfs_handle_t *zhp, char *prop, void *val)
-+static int zfs_set_prop_str(zfs_handle_t *zhp, const char *prop, void *val)
- {
- int ret = 0;
-
-@@ -173,7 +173,7 @@ static int zfs_erase_prop(zfs_handle_t *
- return zfs_remove_prop(zhp, nvl, propname);
- }
-
--static int zfs_is_special_ldd_prop_param(char *name)
-+static int zfs_is_special_ldd_prop_param(const char *name)
- {
- int i;
-
-@@ -478,10 +478,10 @@ int zfs_erase_ldd(struct mkfs_opts *mop,
- return add_param(mop->mo_ldd.ldd_params, key, "");
- }
-
--static int zfs_get_prop_int(zfs_handle_t *zhp, char *prop, void *val)
-+static int zfs_get_prop_int(zfs_handle_t *zhp, const char *prop, void *val)
- {
- nvlist_t *propval;
-- char *propstr;
-+ const char *propstr;
- int ret;
-
- ret = nvlist_lookup_nvlist(zfs_get_user_props(zhp), prop, &propval);
-@@ -500,10 +500,10 @@ static int zfs_get_prop_int(zfs_handle_t
- return ret;
- }
-
--static int zfs_get_prop_str(zfs_handle_t *zhp, char *prop, void *val)
-+static int zfs_get_prop_str(zfs_handle_t *zhp, const char *prop, void *val)
- {
- nvlist_t *propval;
-- char *propstr;
-+ const char *propstr;
- int ret;
-
- ret = nvlist_lookup_nvlist(zfs_get_user_props(zhp), prop, &propval);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lustre.git/commitdiff/2427ceedf6391a6c44b33618c74d803c673e56b0
More information about the pld-cvs-commit
mailing list