The package rpms/nfs-ganesha.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/nfs-ganesha.git/commit/?id=58d734...
https://src.fedoraproject.org/cgit/rpms/nfs-ganesha.git/commit/?id=7ea846...
https://src.fedoraproject.org/cgit/rpms/nfs-ganesha.git/commit/?id=5093e9....
Change:
-%ifnarch i686 armv7hl
+%ifnarch i686 armv7hl
-%ifnarch i686 armv7hl
Thanks.
Full change:
============
commit 58d7341bf76abae542921491790fa8b2058dec6e
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Tue May 21 07:18:29 2024 -0400
NFS-Ganesha 5.8, enable ceph again
Signed-off-by: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec
index 8f1cd3a..4feac18 100644
--- a/nfs-ganesha.spec
+++ b/nfs-ganesha.spec
@@ -45,11 +45,7 @@ Requires: openSUSE-release
%endif
%global use_fsal_ceph %{on_off_switch ceph}
-%ifnarch i686 armv7hl
-%bcond_without rgw
-%else
%bcond_with rgw
-%endif
%global use_fsal_rgw %{on_off_switch rgw}
%bcond_without gluster
commit 7ea8466da18938ddb05ba5c39245d84161335198
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Tue May 21 05:50:35 2024 -0400
NFS-Ganesha 5.8, enable ceph again
Signed-off-by: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec
index 7d11f68..8f1cd3a 100644
--- a/nfs-ganesha.spec
+++ b/nfs-ganesha.spec
@@ -38,10 +38,18 @@ Requires: openSUSE-release
%bcond_with lustre
%global use_fsal_lustre %{on_off_switch lustre}
+%ifnarch i686 armv7hl
+%bcond_without ceph
+%else
%bcond_with ceph
+%endif
%global use_fsal_ceph %{on_off_switch ceph}
+%ifnarch i686 armv7hl
+%bcond_without rgw
+%else
%bcond_with rgw
+%endif
%global use_fsal_rgw %{on_off_switch rgw}
%bcond_without gluster
@@ -76,10 +84,18 @@ Requires: openSUSE-release
%bcond_without man_page
%global use_man_page %{on_off_switch man_page}
+%ifnarch i686 armv7hl
+%bcond_without rados_recov
+%else
%bcond_with rados_recov
+%endif
%global use_rados_recov %{on_off_switch rados_recov}
+%ifnarch i686 armv7hl
+%bcond_without rados_urls
+%else
%bcond_with rados_urls
+%endif
%global use_rados_urls %{on_off_switch rados_urls}
%bcond_without rpcbind
@@ -106,7 +122,7 @@ Requires: openSUSE-release
Name: nfs-ganesha
Version: 5.8
-Release: 1%{?dev:%{dev}}%{?dist}
+Release: 2%{?dev:%{dev}}%{?dist}
Summary: NFS-Ganesha is a NFS Server running in user space
License: LGPL-3.0-or-later
Url:
https://github.com/nfs-ganesha/nfs-ganesha/wiki
@@ -919,6 +935,9 @@ exit 0
%endif
%changelog
+* Tue May 21 2024 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 5.8-2
+- NFS-Ganesha 5.8, enable ceph again
+
* Mon May 20 2024 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 5.8-1
- NFS-Ganesha 5.8 GA
- temporarily disable ceph until there is an updated build
commit e3ac850fef47c7fa0178085f4a79cf98a15125d1
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Mon May 20 13:34:56 2024 -0400
NFS-Ganesha 5.8 GA
temporarily disable ceph until there is an updated build
Signed-off-by: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
diff --git a/0003-python-installer.patch b/0003-python-installer.patch
deleted file mode 100644
index 1c93f2b..0000000
--- a/0003-python-installer.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 631225223..1336103c5 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1125,6 +1125,9 @@ if(USE_CAPS)
- endif (CAPS_FOUND)
- endif(USE_CAPS)
-
-+# default to ON so that it does the right thing in the CentOS CI
-+goption(USE_LEGACY_PYTHON_INSTALL "Use 'python setup.py install'" ON)
-+
- # Check if we have libblkid and libuuid, will just be reported under one
- # flag USE_BLKID
-
-@@ -1616,6 +1619,12 @@ else(SANITIZE_ADDRESS)
- set(BCOND_SANITIZE_ADDRESS "%bcond_with")
- endif(SANITIZE_ADDRESS)
-
-+if(USE_LEGACY_PYTHON_INSTALL)
-+ set(BCOND_LEGACY_PYTHON_INSTALL "%bcond_without")
-+else(USE_LEGACY_PYTHON_INSTALL)
-+ set(BCOND_LEGACY_PYTHON_INSTALL "%bcond_with")
-+endif(USE_LEGACY_PYTHON_INSTALL)
-+
- # Now create a usable specfile
- configure_file(
- "${PROJECT_SOURCE_DIR}/nfs-ganesha.spec-in.cmake"
-diff --git a/src/scripts/ganesha-top/CMakeLists.txt
b/src/scripts/ganesha-top/CMakeLists.txt
-index f2f0e1df6..59c2eebac 100644
---- a/src/scripts/ganesha-top/CMakeLists.txt
-+++ b/src/scripts/ganesha-top/CMakeLists.txt
-@@ -56,18 +56,36 @@ if(USE_ADMIN_TOOLS)
-
- configure_file(${SETUP_PY_IN} ${SETUP_PY})
-
-- add_custom_command(
-- OUTPUT ${OUTPUT}
-- COMMAND ${Python3_EXECUTABLE} "${SETUP_PY}" build
-- COMMAND ${CMAKE_COMMAND} -E touch ${OUTPUT}
-- DEPENDS ${GANESHA_TOP_SRCS} ${SCRIPTS}
-- )
-+ if(USE_LEGACY_PYTHON_INSTALL)
-+ add_custom_command(
-+ OUTPUT ${OUTPUT}
-+ COMMAND ${Python3_EXECUTABLE} "${SETUP_PY}" build
-+ COMMAND ${CMAKE_COMMAND} -E touch ${OUTPUT}
-+ DEPENDS ${GANESHA_TOP_SRCS} ${SCRIPTS}
-+ )
-+ else()
-+ add_custom_command(
-+ OUTPUT ${OUTPUT}
-+ COMMAND ${Python3_EXECUTABLE} -m build --wheel --no-isolation .
-+ COMMAND ${CMAKE_COMMAND} -E touch ${OUTPUT}
-+ DEPENDS ${GANESHA_TOP_SRCS} ${SCRIPTS}
-+ )
-+ endif()
-
- add_custom_target(python_ganesha_top ALL DEPENDS ${OUTPUT})
-
-- install(
-- CODE
-- "execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND
${Python3_EXECUTABLE} ${SETUP_PY} install --skip-build --no-compile
--prefix=\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX})"
-- )
-+ if(USE_LEGACY_PYTHON_INSTALL)
-+ install(
-+ CODE
-+ "execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-+ COMMAND ${Python3_EXECUTABLE} ${SETUP_PY} install --skip-build --no-compile
--prefix=\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX})"
-+ )
-+ else()
-+ install(
-+ CODE
-+ "execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-+ COMMAND ${Python3_EXECUTABLE} -m installer --destdir \$ENV{DESTDIR}
dist/ganesha-top-${GANESHA_MAJOR_VERSION}${GANESHA_MINOR_VERSION}-py3-none-any.whl)"
-+ )
-+ endif()
- endif(Python3_FOUND)
- endif(USE_ADMIN_TOOLS)
-diff --git a/src/scripts/ganeshactl/CMakeLists.txt
b/src/scripts/ganeshactl/CMakeLists.txt
-index a6ba73ede..1339ccafe 100644
---- a/src/scripts/ganeshactl/CMakeLists.txt
-+++ b/src/scripts/ganeshactl/CMakeLists.txt
-@@ -137,19 +137,37 @@ if(Python3_FOUND)
-
- configure_file(${SETUP_PY_IN} ${SETUP_PY})
-
-- add_custom_command(
-- OUTPUT ${OUTPUT}
-- COMMAND ${Python3_EXECUTABLE} "${SETUP_PY}" build
-- COMMAND ${CMAKE_COMMAND} -E touch ${OUTPUT}
-- DEPENDS ${GANESHA_SRCS} ${UI_PY_FILES} ${SCRIPTS}
-- )
-+ if(USE_LEGACY_PYTHON_INSTALL)
-+ add_custom_command(
-+ OUTPUT ${OUTPUT}
-+ COMMAND ${Python3_EXECUTABLE} "${SETUP_PY}" build
-+ COMMAND ${CMAKE_COMMAND} -E touch ${OUTPUT}
-+ DEPENDS ${GANESHA_SRCS} ${UI_PY_FILES} ${SCRIPTS}
-+ )
-+ else()
-+ add_custom_command(
-+ OUTPUT ${OUTPUT}
-+ COMMAND ${Python3_EXECUTABLE} -m build --wheel --no-isolation .
-+ COMMAND ${CMAKE_COMMAND} -E touch ${OUTPUT}
-+ DEPENDS ${GANESHA_SRCS} ${UI_PY_FILES} ${SCRIPTS}
-+ )
-+ endif()
-
- add_custom_target(python_ganeshactl ALL DEPENDS ${OUTPUT})
-
-- install(
-- CODE
-- "execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND
${Python3_EXECUTABLE} ${SETUP_PY} install --skip-build --no-compile
--prefix=\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX})"
-- )
-+ if(USE_LEGACY_PYTHON_INSTALL)
-+ install(
-+ CODE
-+ "execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-+ COMMAND ${Python3_EXECUTABLE} ${SETUP_PY} install --skip-build --no-compile
--prefix=\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX})"
-+ )
-+ else()
-+ install(
-+ CODE
-+ "execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-+ COMMAND ${Python3_EXECUTABLE} -m installer --destdir \$ENV{DESTDIR}
dist/ganeshactl-${GANESHA_MAJOR_VERSION}${GANESHA_MINOR_VERSION}-py3-none-any.whl)"
-+ )
-+ endif()
- endif(Python3_FOUND)
-
- # Man page
-diff --git a/src/scripts/gpfs-epoch/CMakeLists.txt
b/src/scripts/gpfs-epoch/CMakeLists.txt
-index af8035444..796a3a64e 100644
---- a/src/scripts/gpfs-epoch/CMakeLists.txt
-+++ b/src/scripts/gpfs-epoch/CMakeLists.txt
-@@ -56,19 +56,38 @@ if(USE_FSAL_GPFS)
-
- configure_file(${SETUP_PY_IN} ${SETUP_PY})
-
-- add_custom_command(
-- OUTPUT ${OUTPUT}
-- COMMAND ${CMAKE_COMMAND} -E touch __init__.py
-- COMMAND ${Python3_EXECUTABLE} "${SETUP_PY}" build
-- COMMAND ${CMAKE_COMMAND} -E touch ${OUTPUT}
-- DEPENDS ${GPFS_EPOCH_SRCS} ${SCRIPTS}
-- )
-+ if(USE_LEGACY_PYTHON_INSTALL)
-+ add_custom_command(
-+ OUTPUT ${OUTPUT}
-+ COMMAND ${CMAKE_COMMAND} -E touch __init__.py
-+ COMMAND ${Python3_EXECUTABLE} "${SETUP_PY}" build
-+ COMMAND ${CMAKE_COMMAND} -E touch ${OUTPUT}
-+ DEPENDS ${GPFS_EPOCH_SRCS} ${SCRIPTS}
-+ )
-+ else()
-+ add_custom_command(
-+ OUTPUT ${OUTPUT}
-+ COMMAND ${CMAKE_COMMAND} -E touch __init__.py
-+ COMMAND ${Python3_EXECUTABLE} -m build --wheel --no-isolation .
-+ COMMAND ${CMAKE_COMMAND} -E touch ${OUTPUT}
-+ DEPENDS ${GPFS_EPOCH_SRCS} ${SCRIPTS}
-+ )
-+ endif()
-
- add_custom_target(python_gpfs_epoch ALL DEPENDS ${OUTPUT})
-
-- install(
-- CODE
-- "execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND
${Python3_EXECUTABLE} ${SETUP_PY} install --skip-build --no-compile
--prefix=\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}
--install-scripts=\$ENV{DESTDIR}${LIBEXECDIR}/ganesha)"
-- )
-+ if (USE_LEGACY_PYTHON_INSTALL)
-+ install(
-+ CODE
-+ "execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-+ COMMAND ${Python3_EXECUTABLE} ${SETUP_PY} install --skip-build --no-compile
--prefix=\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}
--install-scripts=\$ENV{DESTDIR}${LIBEXECDIR}/ganesha)"
-+ )
-+ else()
-+ install(
-+ CODE
-+ "execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-+ COMMAND ${Python3_EXECUTABLE} -m installer --destdir \$ENV{DESTDIR}
dist/gpfs-${GANESHA_MAJOR_VERSION}${GANESHA_MINOR_VERSION}-py3-none-any.whl)"
-+ )
-+ endif()
- endif(Python3_FOUND)
- endif(USE_FSAL_GPFS)
diff --git a/0004-gcc-14.patch b/0004-gcc-14.patch
deleted file mode 100644
index f9ccc59..0000000
--- a/0004-gcc-14.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- nfs-ganesha-5.7/src/monitoring/monitoring.cc.orig 2024-01-19 10:17:09.609065781
-0500
-+++ nfs-ganesha-5.7/src/monitoring/monitoring.cc 2024-01-19 10:17:28.535732620 -0500
-@@ -26,6 +26,7 @@
- #include <memory>
- #include <sstream>
- #include <string>
-+#include <algorithm>
-
- #include "prometheus/counter.h"
- #include "prometheus/exposer.h"
-@@ -260,7 +261,7 @@
- std::shared_ptr<prometheus::Registry> registry;
-
- static void toLowerCase(std::string &s) {
-- transform(s.begin(), s.end(), s.begin(), ::tolower);
-+ std::transform(s.begin(), s.end(), s.begin(), ::tolower);
- }
-
- static void observeNfsRequest(const char *operation,
---- nfs-ganesha-5.7/src/FSAL/FSAL_RGW/handle.c.orig 2024-01-19 10:26:57.758293091 -0500
-+++ nfs-ganesha-5.7/src/FSAL/FSAL_RGW/handle.c 2024-01-19 10:44:35.158948523 -0500
-@@ -131,14 +131,7 @@
- attrmask_t attrmask;
- };
-
--#if ((LIBRGW_FILE_VER_MAJOR > 1) || \
-- ((LIBRGW_FILE_VER_MAJOR == 1) && \
-- ((LIBRGW_FILE_VER_MINOR > 2) || \
-- ((LIBRGW_FILE_VER_MINOR == 2) && (LIBRGW_FILE_VER_EXTRA >= 1)))))
- static int
--#else
--static bool
--#endif
- rgw_cb(const char *name, void *arg, uint64_t offset,
- struct stat *st, uint32_t st_mask, uint32_t flags)
- {
diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec
index 06fe139..7d11f68 100644
--- a/nfs-ganesha.spec
+++ b/nfs-ganesha.spec
@@ -47,6 +47,9 @@ Requires: openSUSE-release
%bcond_without gluster
%global use_fsal_gluster %{on_off_switch gluster}
+%bcond_without saunafs
+%global use_fsal_saunafs %{on_off_switch saunafs}
+
%bcond_with kvsfs
%global use_fsal_kvsfs %{on_off_switch kvsfs}
@@ -446,6 +449,17 @@ This package contains a FSAL shared object to
be used with NFS-Ganesha to support Gluster
%endif
+# SAUNA
+%if ( 0%{?with_saunafs} )
+%package saunafs
+Summary: The NFS-GANESHA SAUNAFS FSAL
+Requires: nfs-ganesha = %{version}-%{release}
+
+%description saunafs
+This package contains a FSAL shared object to
+be used with NFS-Ganesha to support Sauna FS
+%endif
+
# SELINUX
%if ( 0%{?fedora} >= 29 || 0%{?rhel} >= 8 )
%package selinux
@@ -527,6 +541,7 @@ cd src && %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DUSE_FSAL_GPFS=%{use_fsal_gpfs} \
-DUSE_FSAL_KVSFS=%{use_fsal_kvsfs} \
-DUSE_FSAL_GLUSTER=%{use_fsal_gluster} \
+ -DUSE_FSAL_SAUNAFS=%{use_fsal_saunafs} \
-DUSE_SYSTEM_NTIRPC=%{use_system_ntirpc} \
-DUSE_9P_RDMA=%{use_rdma} \
-DUSE_LTTNG=%{use_lttng} \
@@ -837,6 +852,11 @@ exit 0
%endif
%endif
+%if ( 0%{?with_saunafs} )
+%files saunafs
+%{_libdir}/ganesha/libfsalsaunafs*
+%endif
+
%if ( 0%{?fedora} >= 30 || 0%{?rhel} >= 8 )
%files selinux
%attr(0644,root,root) %{_selinux_store_path}/packages/ganesha.pp.bz2
@@ -901,6 +921,7 @@ exit 0
%changelog
* Mon May 20 2024 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 5.8-1
- NFS-Ganesha 5.8 GA
+- temporarily disable ceph until there is an updated build
* Fri May 10 2024 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 5.7-9
- enable VFS_POSIX_ACL, for real this time
diff --git a/sources b/sources
index 2d5db93..21a567d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nfs-ganesha-5.7.tar.gz) =
611687283dbbdd87a67ec4b637297bf1442b4533ba88e8f2b29dba7a870cd249db135e8645686aef73d3af3e155729df9896da038a11992c87fc2da5192e8f8f
+SHA512 (nfs-ganesha-5.8.tar.gz) =
611457a6c0b651308bf5047aea7cfb1ebef79ea8652516be23996e0e06185a78a134c1bcb677b9b3d91174ae0fa9fe000afd428f265e04f3d242ae861bb0151e
commit 5093e93d6ef93baaf6242ce64ac383a6d7a26c89
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Mon May 20 11:39:51 2024 -0400
nfs-ganesha 5.8 GA
diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec
index e3354e8..06fe139 100644
--- a/nfs-ganesha.spec
+++ b/nfs-ganesha.spec
@@ -38,18 +38,10 @@ Requires: openSUSE-release
%bcond_with lustre
%global use_fsal_lustre %{on_off_switch lustre}
-%ifnarch i686 armv7hl
-%bcond_without ceph
-%else
%bcond_with ceph
-%endif
%global use_fsal_ceph %{on_off_switch ceph}
-%ifnarch i686 armv7hl
-%bcond_without rgw
-%else
%bcond_with rgw
-%endif
%global use_fsal_rgw %{on_off_switch rgw}
%bcond_without gluster
@@ -81,18 +73,10 @@ Requires: openSUSE-release
%bcond_without man_page
%global use_man_page %{on_off_switch man_page}
-%ifnarch i686 armv7hl
-%bcond_without rados_recov
-%else
%bcond_with rados_recov
-%endif
%global use_rados_recov %{on_off_switch rados_recov}
-%ifnarch i686 armv7hl
-%bcond_without rados_urls
-%else
%bcond_with rados_urls
-%endif
%global use_rados_urls %{on_off_switch rados_urls}
%bcond_without rpcbind
@@ -118,16 +102,14 @@ Requires: openSUSE-release
#%%global dev rc6
Name: nfs-ganesha
-Version: 5.7
-Release: 9%{?dev:%{dev}}%{?dist}
+Version: 5.8
+Release: 1%{?dev:%{dev}}%{?dist}
Summary: NFS-Ganesha is a NFS Server running in user space
License: LGPL-3.0-or-later
Url:
https://github.com/nfs-ganesha/nfs-ganesha/wiki
Source0:
https://github.com/%{name}/%{name}/archive/V%{version}%{?dev:-%{dev}}/%{n...
Patch0001: 0001-config_samples-log_rotate.patch
-Patch0003: 0003-python-installer.patch
-Patch0004: 0004-gcc-14.patch
BuildRequires: cmake
BuildRequires: make
@@ -392,7 +374,7 @@ be used with NFS-Ganesha to support GPFS backend
%package ceph
Summary: The NFS-GANESHA CephFS FSAL
Requires: nfs-ganesha = %{version}-%{release}
-BuildRequires: libcephfs2-devel >= 12.2.0
+BuildRequires: libcephfs-devel >= 12.2.0
BuildRequires: libacl-devel
%description ceph
@@ -405,7 +387,7 @@ be used with NFS-Ganesha to support CephFS
%package rgw
Summary: The NFS-GANESHA Ceph RGW FSAL
Requires: nfs-ganesha = %{version}-%{release}
-BuildRequires: librgw2-devel >= 12.2.0
+BuildRequires: librgw-devel >= 12.2.0
%description rgw
This package contains a FSAL shared object to
@@ -917,6 +899,9 @@ exit 0
%endif
%changelog
+* Mon May 20 2024 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 5.8-1
+- NFS-Ganesha 5.8 GA
+
* Fri May 10 2024 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 5.7-9
- enable VFS_POSIX_ACL, for real this time