cmake: drop WITH_PYTHON2 option

WITH_PYTHON2 option was deprecated in
5fc657b40dc7d27e84d4b62b5f37d9c771d74fcd, that commit was included by
Ceph v15.1.0 and up, assuming all downstream packagings have removed
WITH_PYTHON2 option, we are now removing it completely.

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b4f9c74cb9231f4df56fb3fb3d5651f8ed189b7e..4dcb320c1e7573043234547e671a1e34296c5552 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -430,12 +430,7 @@ option(WITH_CEPHFS "CephFS is enabled" ON)
 
 # Please specify 3.[0-7] if you want to build with a certain version of python3.
 set(WITH_PYTHON3 "3" CACHE STRING "build with specified python3 version")
-if(NOT WITH_PYTHON3)
-  message(FATAL_ERROR "WITH_PYTHON3 should always be enabled")
-elseif(WITH_PYTHON3 MATCHES "^(1|ON|YES|TRUE|Y)$")
-  set(WITH_PYTHON3 "3")
-  message(NOTICE "Please specify a Python3 version instead of a BOOLEAN")
-elseif(NOT WITH_PYTHON3 STREQUAL "3")
+if(NOT WITH_PYTHON3 STREQUAL "3")
   set(find_python3_exact "EXACT")
 endif()
 find_package(Python3 ${WITH_PYTHON3} ${find_python3_exact} REQUIRED

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 86b4e0ab5028df7548a3798e3466727589d4475d..78ee4e2c03a806b7472b4982db1b459523e1f838 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -250,12 +250,6 @@ if(WITH_CEPHFS_JAVA)
   add_subdirectory(java)
 endif()
 
-# Python stuff
-option(WITH_PYTHON2 "build python2 bindings" OFF)
-if(WITH_PYTHON2)
-  message(FATAL_ERROR "Python 2 is not supported anymore")
-endif()
-
 # sort out which allocator to use
 if(ALLOCATOR STREQUAL "tcmalloc")
   set(ALLOC_LIBS gperftools::tcmalloc)

diff --git a/src/tools/cephfs/CMakeLists.txt b/src/tools/cephfs/CMakeLists.txt
index a739fb5d704bbe449bd7dac344678606854f76cf..ae7d4d7492e2a4a3f654341b1330b882b25dc24d 100644 (file)
--- a/src/tools/cephfs/CMakeLists.txt
+++ b/src/tools/cephfs/CMakeLists.txt
@@ -49,12 +49,8 @@ install(TARGETS
 
 option(WITH_CEPHFS_SHELL "install cephfs-shell" OFF)
 if(WITH_CEPHFS_SHELL)
-  if(NOT WITH_PYTHON3)
-    message(WARNING "Please enable WITH_PYTHON3 for cephfs-shell")
-  else()
-    include(Distutils)
-    distutils_install_module(cephfs-shell)
-  endif()
+  include(Distutils)
+  distutils_install_module(cephfs-shell)
   if(WITH_TESTS)
     include(AddCephTest)
     add_tox_test(cephfs-shell)

diff --git a/win32_build.sh b/win32_build.sh
index 441cffe4828919f5d4947a9a3847a2b127fa48f4..1986387a9508f8a5de0d0af70b2da9e39b4f4cd9 100755 (executable)
--- a/win32_build.sh
+++ b/win32_build.sh
@@ -88,7 +88,6 @@ fi
 # or circular), we'll have to stick to static linking.
 cmake -D CMAKE_PREFIX_PATH=$depsDirs \
       -D CMAKE_TOOLCHAIN_FILE="$CEPH_DIR/cmake/toolchains/mingw32.cmake" \
-      -D WITH_PYTHON2=OFF -D WITH_PYTHON3=ON \
       -D MGR_PYTHON_VERSION=$pyVersion \
       -D WITH_RDMA=OFF -D WITH_OPENLDAP=OFF \
       -D WITH_GSSAPI=OFF -D WITH_FUSE=OFF -D WITH_XFS=OFF \