Compare commits
92 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
2247731166 | ||
|
1d3eea3550 | ||
|
f9b55e0398 | ||
|
5c580d2bd9 | ||
|
7e4703a16c | ||
|
05d91f058c | ||
|
bb5c7d05d7 | ||
|
81fb321f45 | ||
|
924bfb7714 | ||
|
d15b9bb2b3 | ||
|
ef6ab3fb62 | ||
|
fb6e3e1938 | ||
|
9961703bbf | ||
|
047b685db6 | ||
|
66fd3679e7 | ||
|
9caf1185dd | ||
|
4211c1b372 | ||
|
0627c77bf2 | ||
|
200e7b67e5 | ||
|
df8718b521 | ||
|
32896262e9 | ||
|
820b3b0f74 | ||
|
d42f7eb3a0 | ||
|
595ee3906f | ||
|
7f92338962 | ||
|
3e84f439a2 | ||
|
bf71e90723 | ||
|
14466c6a6e | ||
|
3b2b58f384 | ||
|
ab19725f23 | ||
|
a4ec89c0bb | ||
|
542de333e7 | ||
|
a49b203422 | ||
|
d96da186eb | ||
|
165b431299 | ||
|
bc813f3e27 | ||
|
9d6efd5167 | ||
|
3ef69e3bfe | ||
|
88c1030d09 | ||
|
293ee2225d | ||
|
8010aac0ae | ||
|
6f0b4e91c5 | ||
|
abe97aa180 | ||
|
9825f8b96a | ||
|
ab2d212e63 | ||
|
3e3ebff950 | ||
|
4f6f7afe3b | ||
|
936882ed73 | ||
|
b5d9744c39 | ||
|
cfc02de73c | ||
|
2d0d6b1a89 | ||
|
de44192b1b | ||
|
79bb7eee69 | ||
|
75adf590e8 | ||
|
a89e515064 | ||
|
062930bf70 | ||
|
6af7ffe044 | ||
|
d81a79c315 | ||
|
bbd24ff058 | ||
|
70b648dfcd | ||
|
ff07091c53 | ||
|
fc814435ed | ||
|
513f8799eb | ||
|
78e8f49df4 | ||
|
07543d66ee | ||
|
d8b0c47aad | ||
|
86b7cde6b7 | ||
|
b8c02c80a0 | ||
|
f628f3d066 | ||
|
def82dfa51 | ||
|
a00bf8e864 | ||
|
509613b1a7 | ||
|
418b8af108 | ||
|
022276c49e | ||
|
d73e4a2278 | ||
|
c19e20e90e | ||
|
7ed9144fc2 | ||
|
28bfca8b95 | ||
|
18cd2f5bf7 | ||
|
0ef87e820b | ||
|
0c742b18ec | ||
|
b0fd3e3246 | ||
|
4b51389cab | ||
|
1e5501946e | ||
|
e2b082d005 | ||
|
c1ed297730 | ||
|
ce7655b8e8 | ||
|
5938cd0116 | ||
|
1aca25ecc2 | ||
|
74231f2de2 | ||
|
728473a63c | ||
|
65db5435fb |
16
0001-config_samples-log_rotate.patch
Normal file
16
0001-config_samples-log_rotate.patch
Normal 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
78
0002-CMakeLists.txt.patch
Normal 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)
|
688
nfs-ganesha.spec
688
nfs-ganesha.spec
File diff suppressed because it is too large
Load Diff
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (nfs-ganesha-2.6.3.tar.gz) = 0689fbf9ce65919611927439260b0d6508973b50dbb497bb8d808d907558b7b7ea58ff8134e6edf6dd0c0b61cdbc7521adf5179e10b3d2880befc5d47ad0ecae
|
SHA512 (nfs-ganesha-4.0.tar.gz) = c6ec8146159500f03a4a8b1beb0e03ce79da33c67e8c077d1c7aea8be67d77690839bb7e10c88a9b8a3a8a9cca00ca10851f34f71c6f047956b24e7b7d9a7770
|
||||||
|
Loading…
Reference in New Issue
Block a user