From dc69033763cc116c6ccdf1f97149a74248691042 Mon Sep 17 00:00:00 2001
From: Tim Serong <tserong@suse.com>
Date: Thu, 21 Jul 2022 15:55:19 +1000
Subject: [PATCH] cephfs-shell: move source to separate subdirectory

This ensures the package discovery done by python setuptools >= 61
doesn't get confused when building cephfs-shell and cephfs-top.
This commit moves cephfs-shell to a separate "shell" subdirectory,
which is the same approach we've already got with the cephfs-top
tool being in a separate "top" subdirectory.

Fixes: https://tracker.ceph.com/issues/56658
Signed-off-by: Tim Serong <tserong@suse.com>
---
 src/tools/cephfs/CMakeLists.txt           | 7 +------
 src/tools/cephfs/shell/CMakeLists.txt     | 7 +++++++
 src/tools/cephfs/{ => shell}/cephfs-shell | 0
 src/tools/cephfs/{ => shell}/setup.py     | 0
 src/tools/cephfs/{ => shell}/tox.ini      | 0
 5 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 src/tools/cephfs/shell/CMakeLists.txt
 rename src/tools/cephfs/{ => shell}/cephfs-shell (100%)
 rename src/tools/cephfs/{ => shell}/setup.py (100%)
 rename src/tools/cephfs/{ => shell}/tox.ini (100%)

diff --git a/src/tools/cephfs/CMakeLists.txt b/src/tools/cephfs/CMakeLists.txt
index 7449e3704b0..5d40f8ffb17 100644
--- a/src/tools/cephfs/CMakeLists.txt
+++ b/src/tools/cephfs/CMakeLists.txt
@@ -49,12 +49,7 @@ install(TARGETS
 
 option(WITH_CEPHFS_SHELL "install cephfs-shell" OFF)
 if(WITH_CEPHFS_SHELL)
-  include(Distutils)
-  distutils_install_module(cephfs-shell)
-  if(WITH_TESTS)
-    include(AddCephTest)
-    add_tox_test(cephfs-shell)
-  endif()
+  add_subdirectory(shell)
 endif()
 
 option(WITH_CEPHFS_TOP "install cephfs-top utility" ON)
diff --git a/src/tools/cephfs/shell/CMakeLists.txt b/src/tools/cephfs/shell/CMakeLists.txt
new file mode 100644
index 00000000000..5a1f6ad8020
--- /dev/null
+++ b/src/tools/cephfs/shell/CMakeLists.txt
@@ -0,0 +1,7 @@
+include(Distutils)
+distutils_install_module(cephfs-shell)
+
+if(WITH_TESTS)
+  include(AddCephTest)
+  add_tox_test(cephfs-shell)
+endif()
diff --git a/src/tools/cephfs/cephfs-shell b/src/tools/cephfs/shell/cephfs-shell
similarity index 100%
rename from src/tools/cephfs/cephfs-shell
rename to src/tools/cephfs/shell/cephfs-shell
diff --git a/src/tools/cephfs/setup.py b/src/tools/cephfs/shell/setup.py
similarity index 100%
rename from src/tools/cephfs/setup.py
rename to src/tools/cephfs/shell/setup.py
diff --git a/src/tools/cephfs/tox.ini b/src/tools/cephfs/shell/tox.ini
similarity index 100%
rename from src/tools/cephfs/tox.ini
rename to src/tools/cephfs/shell/tox.ini