From 9780a853516a423659c70a2fa340b4a32b1fa4e0 Mon Sep 17 00:00:00 2001 From: Kaleb S. KEITHLEY Date: Nov 19 2022 13:41:20 +0000 Subject: Merge remote-tracking branch 'origin/c9s-sig-storage-nfs-ganesha-4' into c8s-sig-storage-nfs-ganesha-4 Signed-off-by: Kaleb S. KEITHLEY --- diff --git a/.nfs-ganesha.metadata b/.nfs-ganesha.metadata index d6ba70d..4113bce 100644 --- a/.nfs-ganesha.metadata +++ b/.nfs-ganesha.metadata @@ -1 +1 @@ -7642610756b3220bc5cf0e04bbb569d7663aaa44 SOURCES/nfs-ganesha-4.0.tar.gz +14978047310d4eda5ba0043de4979794d38bd4fc SOURCES/nfs-ganesha-4.1.tar.gz diff --git a/README.md b/README.md index 617ac95..f489bb4 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ The master brach is unused. Use an existing branch instead. Branch names follow convention like `c-sig-storage-nfs-ganesha-` as descibed on [Naming and Patterns for Mapping Git Branches to Koji Tags](https://wiki.centos.org/BrianStinson/GitBranchesandKojiTags) * c7-sig-storage-nfs-ganesha-30: CentOS-7, nfs-ganesha-30 +* c7-sig-storage-nfs-ganesha-4: CentOS-7, nfs-ganesha-4 * c8-sig-storage-nfs-ganesha-3: CentOS-8, nfs-ganesha-3 * c8s-sig-storage-nfs-ganesha-3: CentOS-Stream8, nfs-ganesha-3 * c8s-sig-storage-nfs-ganesha-4: CentOS-Stream8, nfs-ganesha-4 diff --git a/SOURCES/0002-CMakeLists.txt.patch b/SOURCES/0002-CMakeLists.txt.patch index 16a4e10..e69ce30 100644 --- a/SOURCES/0002-CMakeLists.txt.patch +++ b/SOURCES/0002-CMakeLists.txt.patch @@ -49,14 +49,6 @@ set(man8_file ganesha_conf.man) --- nfs-ganesha-4-rc4/src/scripts/gpfs-epoch/CMakeLists.txt.orig 2021-11-17 09:22:55.938555754 -0500 +++ nfs-ganesha-4-rc4/src/scripts/gpfs-epoch/CMakeLists.txt 2021-11-17 09:41:32.836208727 -0500 -@@ -1,6 +1,6 @@ - - if(USE_FSAL_GPFS) -- if(Python_FOUND) -+ if(PYTHONINTERP_FOUND) - set(SETUP_PY_IN "${CMAKE_CURRENT_SOURCE_DIR}/setup.py.in") - set(SETUP_PY "${CMAKE_CURRENT_BINARY_DIR}/setup.py") - set(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/build/gpfs_epoch_timestamp") @@ -38,7 +38,7 @@ add_custom_command( OUTPUT ${OUTPUT} diff --git a/SPECS/nfs-ganesha.spec b/SPECS/nfs-ganesha.spec index 7c7dc7c..9054515 100644 --- a/SPECS/nfs-ganesha.spec +++ b/SPECS/nfs-ganesha.spec @@ -60,9 +60,6 @@ Requires: openSUSE-release %bcond_with kvsfs %global use_fsal_kvsfs %{on_off_switch kvsfs} -%bcond_with proxy_v3 -%global use_proxy_v3 %{on_off_switch proxy_v3} - %bcond_with rdma %global use_rdma %{on_off_switch rdma} @@ -114,10 +111,10 @@ Requires: openSUSE-release %endif %global dev_version %{lua: s = string.gsub('@GANESHA_EXTRA_VERSION@', '^%-', ''); s2 = string.gsub(s, '%-', '.'); print((s2 ~= nil and s2 ~= '') and s2 or "0.1") } -#%%global dev rc3 +#%%global dev rc4 Name: nfs-ganesha -Version: 4.0 +Version: 4.1 Release: 1%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space License: LGPLv3+ @@ -159,7 +156,7 @@ BuildRequires: libwbclient-devel %endif BuildRequires: gcc-c++ %if ( %{with_system_ntirpc} ) -BuildRequires: libntirpc-devel >= 4.0 +BuildRequires: libntirpc-devel >= 4.1 %else Requires: libntirpc = @NTIRPC_VERSION_EMBED@ %endif @@ -255,7 +252,6 @@ Requires: nfs-ganesha = %{version}-%{release} This package contains a FSAL shared object to be used with NFS-Ganesha to support PROXY_V4 based filesystems -%if %{with proxy_v3} %package proxy-v3 Summary: The NFS-GANESHA PROXY_V3 FSAL BuildRequires: libattr-devel @@ -264,7 +260,6 @@ Requires: nfs-ganesha = %{version}-%{release} %description proxy-v3 This package contains a FSAL shared object to be used with NFS-Ganesha to support PROXY_V3 based filesystems -%endif %if %{with utils} %package utils @@ -536,7 +531,7 @@ cd src && %{cmake} . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DRADOS_URLS=%{use_rados_urls} \ -DUSE_FSAL_VFS=ON \ -DUSE_FSAL_PROXY_V4=ON \ - -DUSE_FSAL_PROXY_V3=OFF \ + -DUSE_FSAL_PROXY_V3=ON \ -DUSE_DBUS=ON \ -DUSE_9P=%{use_9P} \ -DDISTNAME_HAS_GIT_DATA=OFF \ @@ -687,7 +682,6 @@ exit 0 %config(noreplace) %{_sysconfdir}/logrotate.d/ganesha %dir %{_sysconfdir}/ganesha/ %config(noreplace) %{_sysconfdir}/ganesha/ganesha.conf -%doc src/ChangeLog %dir %{_rundir}/ganesha %dir %{_libexecdir}/ganesha/ %{_libexecdir}/ganesha/nfs-ganesha-config.sh @@ -744,13 +738,11 @@ exit 0 %{_mandir}/*/ganesha-proxy-v4-config.8.gz %endif -%if %{with proxy_v3} %files proxy-v3 %{_libdir}/ganesha/libfsalproxy_v3* %if %{with man_page} %{_mandir}/*/ganesha-proxy-v3-config.8.gz %endif -%endif # Optional packages %if %{with lustre} @@ -780,9 +772,6 @@ exit 0 %config(noreplace) %{_sysconfdir}/ganesha/gpfs.ganesha.main.conf %config(noreplace) %{_sysconfdir}/ganesha/gpfs.ganesha.log.conf %config(noreplace) %{_sysconfdir}/ganesha/gpfs.ganesha.exports.conf -%if %{with utils} -%{_libexecdir}/ganesha/gpfs-epoch -%endif %if %{with man_page} %{_mandir}/*/ganesha-gpfs-config.8.gz %endif @@ -892,6 +881,16 @@ exit 0 * Wed Dec 22 2021 Kaleb S. KEITHLEY - 4.0-1 - NFS-Ganesha 4.0 GA +* Fri Nov 18 2022 Kaleb S. KEITHLEY - 4.1-1 +- NFS-Ganesha 4.1 GA + +* Wed Dec 22 2021 Kaleb S. KEITHLEY - 4.0-1 +- NFS-Ganesha 4.0 GA + +* Wed Nov 17 2021 Kaleb S. KEITHLEY - 4.0-0.3rc4 +- NFS-Ganesha 4.0 RC4, w/ utils and gui_utils (python) + +>>>>>>> origin/c9s-sig-storage-nfs-ganesha-4 * Wed Nov 17 2021 Kaleb S. KEITHLEY - 4.0-0.2rc4 - NFS-Ganesha 4.0 RC4