From de44192b1be9e7057ccf7dbd9c51edee96841429 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Mon, 4 Nov 2019 06:20:19 -0500 Subject: [PATCH] nfs-ganesha 3.0 RC5 Signed-off-by: Kaleb S. KEITHLEY --- 0001-src-cmake-modules-FindNTIPC.cmake.patch | 1 - 0001-src-scripts-gpfs-epoch.patch | 8 ----- 0002-src-CMakeLists.txt.patch | 34 +++++++------------- 3 files changed, 12 insertions(+), 31 deletions(-) delete mode 100644 0001-src-scripts-gpfs-epoch.patch diff --git a/0001-src-cmake-modules-FindNTIPC.cmake.patch b/0001-src-cmake-modules-FindNTIPC.cmake.patch index affa17b..79f27e8 100644 --- a/0001-src-cmake-modules-FindNTIPC.cmake.patch +++ b/0001-src-cmake-modules-FindNTIPC.cmake.patch @@ -8,4 +8,3 @@ + REQUIRED_VARS NTIRPC_INCLUDE_DIR NTIRPC_LIBRARY VERSION_VAR NTIRPC_VERSION) # VERSION FPHSA options not handled by CMake version < 2.8.2) - # VERSION_VAR) diff --git a/0001-src-scripts-gpfs-epoch.patch b/0001-src-scripts-gpfs-epoch.patch deleted file mode 100644 index 51674ac..0000000 --- a/0001-src-scripts-gpfs-epoch.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- nfs-ganesha-2.8.2/src/scripts/gpfs-epoch.orig 2019-08-14 09:55:02.130227995 -0400 -+++ nfs-ganesha-2.8.2/src/scripts/gpfs-epoch 2019-08-14 09:55:13.982227995 -0400 -@@ -1,4 +1,4 @@ --#!/usr/bin/python2 -+#!/usr/bin/python3 - - # Usually ganesha daemon start up time is used as its epoch. This is - # fine for a single node configurations, but in clustered environment, diff --git a/0002-src-CMakeLists.txt.patch b/0002-src-CMakeLists.txt.patch index 96e6515..845abce 100644 --- a/0002-src-CMakeLists.txt.patch +++ b/0002-src-CMakeLists.txt.patch @@ -1,22 +1,12 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index cb10e10e4..a83873888 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -511,12 +511,15 @@ endif (USE_ADMIN_TOOLS) - gopt_test(USE_GUI_ADMIN_TOOLS) - if (USE_ADMIN_TOOLS) - if (USE_GUI_ADMIN_TOOLS) -- find_program(PYUIC NAMES pyuic4 DOC "PyQT UI-compiler executable") -+ find_program(PYUIC NAMES pyuic5 DOC "PyQT UI-compiler executable") -+ if (NOT PYUIC) -+ find_program(PYUIC NAMES pyuic4 DOC "PyQT UI-compiler executable") -+ endif (NOT PYUIC) - if (NOT PYUIC) - if (USE_GUI_ADMIN_TOOLS_REQUIRED) - message(FATAL_ERROR "Cannot find PyQt but GUI admin tools requested on command line") - else (USE_GUI_ADMIN_TOOLS_REQUIRED) -- message(WARNING "Cannot find PyQt4. Disabling GUI admin tools") -+ message(WARNING "Cannot find PyQt4 or PyQt5. Disabling GUI admin tools") - set(USE_GUI_ADMIN_TOOLS OFF) - endif (USE_GUI_ADMIN_TOOLS_REQUIRED) - endif (NOT PYUIC) +--- nfs-ganesha-3.0-rc5/src/CMakeLists.txt.orig 2019-11-04 06:12:36.480670795 -0500 ++++ nfs-ganesha-3.0-rc5/src/CMakeLists.txt 2019-11-04 06:13:24.795670795 -0500 +@@ -1033,6 +1033,9 @@ + if (NOT LIBURCU) + message(FATAL_ERROR "userspace-rcu library not found!") + endif(NOT LIBURCU) ++if (CMAKE_MAJOR_VERSION VERSION_EQUAL 3 AND CMAKE_MINOR_VERSION VERSION_GREATER 14) ++ include(CheckSymbolExists) ++endif(CMAKE_MAJOR_VERSION VERSION_EQUAL 3 AND CMAKE_MINOR_VERSION VERSION_GREATER 14) + check_symbol_exists(urcu_ref_get_unless_zero urcu/ref.h HAVE_URCU_REF_GET_UNLESS_ZERO) + + # All the plumbing in the basement