Compare commits

...

92 Commits
f28 ... rawhide

Author SHA1 Message Date
Fedora Release Engineering
2247731166 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-22 00:32:36 +00:00
Kaleb S. KEITHLEY
1d3eea3550 Rebuilt for pyparsing-3.0.9, ceph w/ fmt-9
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2022-07-19 09:59:38 -04:00
Zbigniew Jędrzejewski-Szmek
f9b55e0398 Rebuilt for pyparsing-3.0.9 2022-07-19 11:12:47 +02:00
Python Maint
5c580d2bd9 Rebuilt for Python 3.11 2022-06-15 18:15:36 +02:00
Karolina Surma
7e4703a16c Fix bogus date in %%changelog 2022-03-04 11:20:47 +01:00
Karolina Surma
05d91f058c Fix build with cmake 3.23.0rc2 2022-03-04 11:18:12 +01:00
Karolina Surma
bb5c7d05d7 Don't BR setuptools, use Python's bundled distutils 2022-03-04 11:12:01 +01:00
Kaleb S. KEITHLEY
81fb321f45 NFS-Ganesha 4.1, w/ modern linker (mold), this time for real
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2022-01-28 08:20:10 -05:00
Kaleb S. KEITHLEY
924bfb7714 NFS-Ganesha 4.1, w/ modern linker (mold), this time for real
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2022-01-28 07:42:17 -05:00
Kaleb S. KEITHLEY
d15b9bb2b3 NFS-Ganesha 4.0, w/ modern linker (mold)
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2022-01-26 17:18:07 -05:00
Fedora Release Engineering
ef6ab3fb62 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-20 21:10:39 +00:00
Kaleb S. KEITHLEY
fb6e3e1938 NFS-Ganesha 4.0 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2021-12-21 17:16:59 -05:00
Kaleb S. KEITHLEY
9961703bbf NFS-Ganesha 4.0 RC6
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2021-12-17 09:09:04 -05:00
Kaleb S. KEITHLEY
047b685db6 NFS-Ganesha 4.0 RC4, w/ utils and gui_utils (python)
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2021-11-17 09:48:47 -05:00
Kaleb S. KEITHLEY
66fd3679e7 NFS-Ganesha 4.0 RC4
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2021-11-17 07:48:06 -05:00
Kaleb S. KEITHLEY
9caf1185dd NFS-Ganesha 4.0 RC3
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2021-11-09 15:00:28 -05:00
Fedora Release Engineering
4211c1b372 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-22 16:06:26 +00:00
Lars Kellogg-Stedman
0627c77bf2 make nfs-ganesha depend on dbus-tools
the nfs-ganesha.service unit requires dbus-send (from the dbus-tools
package) in its ExecStop operation.
2021-07-16 21:18:27 -04:00
Kaleb S. KEITHLEY
200e7b67e5 Rebuilt for userspace-rcu-0.13 again
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2021-06-22 09:23:18 -04:00
Kaleb S. KEITHLEY
df8718b521 - Rebuilt for libntirpc-3.5
- plus https://src.fedoraproject.org/rpms/nfs-ganesha/pull-request/2
2021-06-16 08:42:34 -04:00
Kaleb S. KEITHLEY
32896262e9 Rebuilt for userspace-rcu-0.13
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2021-06-08 15:40:40 -04:00
Python Maint
820b3b0f74 Rebuilt for Python 3.10 2021-06-04 20:12:51 +02:00
Zbigniew Jędrzejewski-Szmek
d42f7eb3a0 Rebuilt for updated systemd-rpm-macros
See https://pagure.io/fesco/issue/2583.
2021-03-02 16:13:18 +01:00
Kaleb S KEITHLEY
595ee3906f NFS-Ganesha 3.5, rebuild with ceph-16
Signed-off-by: Kaleb S KEITHLEY <kkeithle@redhat.com>
2021-02-09 11:22:01 -05:00
Kaleb S KEITHLEY
7f92338962 NFS-Ganesha 3.5 GA
fix for compiling with Ceph-16 (pacific)

Signed-off-by: Kaleb S KEITHLEY <kkeithle@redhat.com>
2021-01-28 14:19:07 -05:00
Fedora Release Engineering
3e84f439a2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-26 21:29:56 +00:00
Kaleb S KEITHLEY
bf71e90723 NFS-Ganesha 3.4 GA
Signed-off-by: Kaleb S KEITHLEY <kkeithle@redhat.com>
2020-12-24 08:19:55 -05:00
Kaleb S. KEITHLEY
14466c6a6e BuildRequires: make
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2020-11-05 13:44:36 -05:00
Kaleb S. KEITHLEY
3b2b58f384 BuildRequires: make
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2020-11-05 13:43:16 -05:00
Fedora Release Engineering
ab19725f23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-28 09:08:01 +00:00
Kaleb S. KEITHLEY
a4ec89c0bb use cmake_build and
DESTDIR="/home/kkeithle/rpmbuild/BUILDROOT/nfs-ganesha-3.3-6.fc33.x86_64" /usr/bin/cmake --install "."

Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2020-07-20 18:50:27 -04:00
Kaleb S. KEITHLEY
542de333e7 use /usr/bin/make install DESTDIR=/home/kkeithle/rpmbuild/BUILDROOT/nfs-ganesha-3.3-5.fc33.x86_64 INSTALL="/usr/bin/install -p"
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2020-07-20 17:32:17 -04:00
Kaleb S. KEITHLEY
a49b203422 use /usr/bin/make install DESTDIR=/home/kkeithle/rpmbuild/BUILDROOT/nfs-ganesha-3.3-5.fc33.x86_64 INSTALL="/usr/bin/install -p"
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2020-07-20 17:17:06 -04:00
Kaleb S. KEITHLEY
d96da186eb rpc-statd.conf.el8
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2020-07-13 08:31:14 -04:00
Kaleb S. KEITHLEY
165b431299 explicit BuildRequires: python3-setuptools
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2020-06-23 13:14:09 -04:00
Kaleb S. KEITHLEY
bc813f3e27 rhbz#1848208
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2020-06-18 13:05:47 -04:00
Kaleb S. KEITHLEY
9d6efd5167 rhbz#1848208
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2020-06-18 09:50:32 -04:00
Kaleb S. KEITHLEY
3ef69e3bfe NFS-Ganesha 3.3 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2020-06-08 19:22:54 -04:00
Miro Hrončok
88c1030d09 Rebuilt for Python 3.9 2020-05-26 02:54:07 +02:00
Kaleb S. KEITHLEY
293ee2225d NFS-Ganesha 3.2, NFSv4-compound-op-fails SEGV
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2020-03-23 11:23:00 -04:00
Kaleb S. KEITHLEY
8010aac0ae NFS-Ganesha 3.2, /var/log/ganesha, rhbz#1805493
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2020-02-20 16:48:26 -05:00
Fedora Release Engineering
6f0b4e91c5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-29 14:57:14 +00:00
Kaleb S. KEITHLEY
abe97aa180 NFS-Ganesha 3.2, gcc-10
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2020-01-23 07:22:29 -05:00
Kaleb S. KEITHLEY
9825f8b96a NFS-Ganesha 3.2 GA
3.1 was not built

Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-12-22 08:43:35 -05:00
Kaleb S. KEITHLEY
ab2d212e63 python3-qt5-devel
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-12-18 21:06:44 -05:00
Kaleb S. KEITHLEY
3e3ebff950 fix typo in ceph
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-12-18 20:35:07 -05:00
Kaleb S. KEITHLEY
4f6f7afe3b NFS-Ganesha 3.0 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-11-12 08:56:51 -05:00
Kaleb S. KEITHLEY
936882ed73 nfs-ganesha 3.0 RC5, rebuild w/ libntirpc-3.0 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-11-06 15:25:31 -05:00
Kaleb S. KEITHLEY
b5d9744c39 nfs-ganesha 3.0 RC5, enable fsal_mem (again)
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-11-05 07:21:24 -05:00
Kaleb S. KEITHLEY
cfc02de73c nfs-ganesha 3.0 RC5
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-11-04 06:40:20 -05:00
Kaleb S. KEITHLEY
2d0d6b1a89 nfs-ganesha 3.0 RC5
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-11-04 06:22:43 -05:00
Kaleb S. KEITHLEY
de44192b1b nfs-ganesha 3.0 RC5
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-11-04 06:20:19 -05:00
Kaleb S. KEITHLEY
79bb7eee69 nfs-ganesha 3.0 RC5
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-11-03 16:45:58 -05:00
Kaleb S. KEITHLEY
75adf590e8 PyQt4 -> PyQt5
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-09-25 10:03:44 -04:00
Miro Hrončok
a89e515064 Rebuilt for Python 3.8 2019-08-19 19:11:32 +02:00
Miro Hrončok
062930bf70 Rebuilt for Python 3.8 2019-08-19 10:20:44 +02:00
Kaleb S. KEITHLEY
6af7ffe044 nfs-ganesha 2.8.2 (f32/rawhide)
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-08-14 18:28:05 -04:00
Kaleb S. KEITHLEY
d81a79c315 nfs-ganesha 2.8.2 (f32/rawhide)
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-08-14 10:21:57 -04:00
Kaleb S. KEITHLEY
bbd24ff058 nfs-ganesha 2.8.2, #1741023
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-08-14 10:04:31 -04:00
Fedora Release Engineering
70b648dfcd - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-25 18:38:21 +00:00
Kaleb S. KEITHLEY
ff07091c53 nfs-ganesha 2.8.2 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-07-23 11:46:06 -04:00
Kaleb S. KEITHLEY
fc814435ed nfs-ganesha 2.8.2 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-07-23 11:45:27 -04:00
Kaleb S. KEITHLEY
513f8799eb nfs-ganesha 2.8.2 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-07-23 07:53:25 -04:00
Kaleb S. KEITHLEY
78e8f49df4 nfs-ganesha 2.8.1 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-07-02 16:28:32 -04:00
Kaleb S. KEITHLEY
07543d66ee nfs-ganesha 2.8.0.3
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-07-01 08:19:37 -04:00
Kaleb S. KEITHLEY
d8b0c47aad nfs-ganesha 2.8.0, 2.8.0.3
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-07-01 07:52:02 -04:00
Kaleb S. KEITHLEY
86b7cde6b7 nfs-ganesha 2.8.0, 2.8.0.2
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-06-16 11:27:27 -04:00
Kaleb S. KEITHLEY
b8c02c80a0 nfs-ganesha 2.8.0, 2.8.0.2
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-06-16 11:26:49 -04:00
Kaleb S. KEITHLEY
f628f3d066 nfs-ganesha 2.8.0, 2.8.0.1
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-06-11 13:45:20 -04:00
Kaleb S. KEITHLEY
def82dfa51 nfs-ganesha 2.8.0 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-06-01 08:24:22 -04:00
Kaleb S. KEITHLEY
a00bf8e864 nfs-ganesha 2.8.0 RC1, utils and gui_utils enabled
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-05-31 11:12:59 -04:00
Kaleb S. KEITHLEY
509613b1a7 nfs-ganesha 2.8.0 RC1, utils and gui_utils disabled until the python
byte_compile problems can be resolved

Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-05-30 18:09:29 -04:00
Kaleb S. KEITHLEY
418b8af108 nfs-ganesha 2.8.0 RC1, utils and gui_utils disabled until the python
byte_compile problems can be resolved

Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-05-30 18:07:08 -04:00
Miro Hrončok
022276c49e Avoid unversioned Python requires 2019-05-17 22:46:11 +02:00
Kaleb S. KEITHLEY
d73e4a2278 nfs-ganesha 2.7.3, enable utils w/ python2 on f30 and up
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-05-16 11:37:31 -04:00
Kaleb S. KEITHLEY
c19e20e90e nfs-ganesha 2.7.3, selinux bz#1706462
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-05-10 14:10:07 -04:00
Kaleb S. KEITHLEY
7ed9144fc2 nfs-ganesha 2.7.3 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-04-05 10:10:31 -04:00
Kaleb S. KEITHLEY
28bfca8b95 nfs-ganesha 2.7.3 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-04-05 09:22:41 -04:00
Kaleb S. KEITHLEY
18cd2f5bf7 nfs-ganesha 2.7.2 reenable ceph, rgw, rados from bad merge
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-03-11 12:43:35 -04:00
Kaleb S. KEITHLEY
0ef87e820b nfs-ganesha 2.7.2 reenable ceph, rgw, rados from bad merge
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-03-11 12:37:16 -04:00
Kaleb S. KEITHLEY
0c742b18ec nfs-ganesha 2.7.2 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-02-27 10:38:50 -05:00
Kaleb S. KEITHLEY
b0fd3e3246 rebuild for f31/rawhide
add libnsl2-devel on rhel8
 eliminate redundant cmake -DDSANITIZE_ADDRESS=OFF

Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2019-02-21 17:37:59 -05:00
Fedora Release Engineering
4b51389cab - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-01 12:19:18 +00:00
Igor Gnatenko
1e5501946e Remove obsolete Group tag
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
2019-01-28 20:24:18 +01:00
Kaleb S. KEITHLEY
e2b082d005 nfs-ganesha 2.7.1, fix selinux
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2018-12-19 08:25:47 -05:00
Kaleb S. KEITHLEY
c1ed297730 nfs-ganesha 2.7.1, rebuild w/ ceph-14
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2018-12-07 15:07:08 -05:00
Kaleb S. KEITHLEY
ce7655b8e8 nfs-ganesha 2.7.1, rebuild w/ ceph-14
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2018-12-07 14:37:57 -05:00
Kaleb S. KEITHLEY
5938cd0116 nfs-ganesha 2.7.1, rebuild w/ libntirpc-1.7.1-1
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2018-10-16 11:08:34 -04:00
Kaleb S. KEITHLEY
1aca25ecc2 nfs-ganesha 2.7.1 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2018-10-14 09:34:44 -04:00
Kaleb S. KEITHLEY
74231f2de2 nfs-ganesha 2.7.0, obsolete xfs, enable lttng
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2018-09-20 10:48:06 -04:00
Kaleb S. KEITHLEY
728473a63c nfs-ganesha 2.7.0, obsolete xfs, enable lttng
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2018-09-20 10:31:31 -04:00
Kaleb S. KEITHLEY
65db5435fb nfs-ganesha 2.7.0 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
2018-09-17 09:01:09 -04:00
4 changed files with 640 additions and 150 deletions

View File

@ -0,0 +1,16 @@
--- nfs-ganesha-3.5/src/config_samples/logrotate_ganesha.orig 2021-06-11 11:05:49.699522427 -0400
+++ nfs-ganesha-3.5/src/config_samples/logrotate_ganesha 2021-06-11 11:06:18.362010100 -0400
@@ -1,4 +1,5 @@
/var/log/ganesha/ganesha.log {
+ su ganesha ganesha
weekly
rotate 52
copytruncate
--- nfs-ganesha-3.5/src/config_samples/logrotate_fsal_gluster.orig 2021-06-11 11:05:59.857340860 -0400
+++ nfs-ganesha-3.5/src/config_samples/logrotate_fsal_gluster 2021-06-11 11:06:22.785931021 -0400
@@ -1,4 +1,5 @@
/var/log/ganesha/ganesha-gfapi.log {
+ su ganesha ganesha
weekly
rotate 52
copytruncate

78
0002-CMakeLists.txt.patch Normal file
View File

@ -0,0 +1,78 @@
--- nfs-ganesha-4-rc3/src/CMakeLists.txt.orig 2021-11-08 18:24:19.024041776 -0500
+++ nfs-ganesha-4-rc3/src/CMakeLists.txt 2021-11-09 13:54:02.553226811 -0500
@@ -558,11 +558,11 @@
gopt_test(USE_ADMIN_TOOLS)
if (USE_ADMIN_TOOLS)
- find_package (Python COMPONENTS Interpreter Development)
- if (NOT Python_Interpreter_FOUND)
+ find_package(PythonInterp ${USE_ADMIN_TOOLS_REQUIRED})
+ if (NOT PYTHONINTERP_FOUND)
message(WARNING "Cannot find python. Disablin admin tools")
set(USE_ADMIN_TOOLS OFF)
- endif (NOT Python_Interpreter_FOUND)
+ endif (NOT PYTHONINTERP_FOUND)
endif (USE_ADMIN_TOOLS)
gopt_test(USE_GUI_ADMIN_TOOLS)
--- nfs-ganesha-4-rc4/src/scripts/ganeshactl/CMakeLists.txt.orig 2021-11-17 09:22:20.860134361 -0500
+++ nfs-ganesha-4-rc4/src/scripts/ganeshactl/CMakeLists.txt 2021-11-17 09:41:47.651949504 -0500
@@ -44,7 +44,7 @@
Ganesha/QtUI/ui_log_dialog.ui
)
-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/ganeshactl_timestamp")
@@ -118,7 +118,7 @@
add_custom_command(
OUTPUT ${OUTPUT}
- COMMAND ${Python_EXECUTABLE} "${SETUP_PY}" build
+ COMMAND ${PYTHON_EXECUTABLE} "${SETUP_PY}" build
COMMAND ${CMAKE_COMMAND} -E touch ${OUTPUT}
DEPENDS ${GANESHA_SRCS} ${UI_PY_FILES} ${SCRIPTS}
)
@@ -127,9 +127,9 @@
install(
CODE
- "execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${Python_EXECUTABLE} ${SETUP_PY} install --skip-build --no-compile --prefix=\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX})"
+ "execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${PYTHON_EXECUTABLE} ${SETUP_PY} install --skip-build --no-compile --prefix=\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX})"
)
-endif(Python_FOUND)
+endif(PYTHONINTERP_FOUND)
# Man page
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}
COMMAND ${CMAKE_COMMAND} -E touch __init__.py
- COMMAND ${Python_EXECUTABLE} "${SETUP_PY}" build
+ COMMAND ${PYTHON_EXECUTABLE} "${SETUP_PY}" build
COMMAND ${CMAKE_COMMAND} -E touch ${OUTPUT}
DEPENDS ${GPFS_EPOCH_SRCS} ${SCRIPTS}
)
@@ -47,7 +47,7 @@
install(
CODE
- "execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${Python_EXECUTABLE} ${SETUP_PY} install --skip-build --no-compile --prefix=\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX} --install-scripts=\$ENV{DESTDIR}${LIBEXECDIR}/ganesha)"
+ "execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${PYTHON_EXECUTABLE} ${SETUP_PY} install --skip-build --no-compile --prefix=\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX} --install-scripts=\$ENV{DESTDIR}${LIBEXECDIR}/ganesha)"
)
- endif(Python_FOUND)
+ endif(PYTHONINTERP_FOUND)
endif(USE_FSAL_GPFS)

File diff suppressed because it is too large Load Diff

View File

@ -1 +1 @@
SHA512 (nfs-ganesha-2.6.3.tar.gz) = 0689fbf9ce65919611927439260b0d6508973b50dbb497bb8d808d907558b7b7ea58ff8134e6edf6dd0c0b61cdbc7521adf5179e10b3d2880befc5d47ad0ecae
SHA512 (nfs-ganesha-4.0.tar.gz) = c6ec8146159500f03a4a8b1beb0e03ce79da33c67e8c077d1c7aea8be67d77690839bb7e10c88a9b8a3a8a9cca00ca10851f34f71c6f047956b24e7b7d9a7770