update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / os / CMakeLists.txt

diff --git a/ceph/src/os/CMakeLists.txt b/ceph/src/os/CMakeLists.txt
index 760244b9b435c8ca756e9aa28e0a68c45000cb94..9008f2ed8c04ed56dcb8967d20141c52c4810c9a 100644 (file)
--- a/ceph/src/os/CMakeLists.txt
+++ b/ceph/src/os/CMakeLists.txt
@@ -23,7 +23,6 @@ if(WITH_BLUESTORE)
   list(APPEND libos_srcs
     bluestore/Allocator.cc
     bluestore/BitmapFreelistManager.cc
-    bluestore/BlockDevice.cc
     bluestore/BlueFS.cc
     bluestore/bluefs_types.cc
     bluestore/BlueRocksEnv.cc
@@ -35,14 +34,14 @@ if(WITH_BLUESTORE)
     bluestore/BitmapAllocator.cc
     bluestore/AvlAllocator.cc
     bluestore/HybridAllocator.cc
-    bluestore/io_uring.cc
   )
 endif(WITH_BLUESTORE)
 
-if(HAVE_LIBAIO OR HAVE_POSIXAIO)
+if(WITH_ZBD)
   list(APPEND libos_srcs
-    bluestore/KernelDevice.cc
-    bluestore/aio.cc)
+    bluestore/zoned_types.cc
+    bluestore/ZonedFreelistManager.cc
+    bluestore/ZonedAllocator.cc)
 endif()
 
 if(WITH_FUSE)
@@ -50,11 +49,6 @@ if(WITH_FUSE)
     FuseStore.cc)
 endif(WITH_FUSE)
 
-if(WITH_BLUESTORE_PMEM)
-  list(APPEND libos_srcs
-    bluestore/PMEMDevice.cc)
-endif()
-
 if(HAVE_LIBXFS)
   list(APPEND libos_srcs
     filestore/XfsFileStoreBackend.cc
@@ -70,12 +64,8 @@ if(HAVE_LIBZFS)
   list(APPEND libos_srcs $<TARGET_OBJECTS:os_zfs_objs>)
 endif()
 
-if(WITH_SPDK)
-  list(APPEND libos_srcs
-    bluestore/NVMEDevice.cc)
-endif()
-
 add_library(os STATIC ${libos_srcs})
+target_link_libraries(os blk)
 
 target_link_libraries(os heap_profiler kv)
 
@@ -88,10 +78,6 @@ if(WITH_BLUEFS)
   install(TARGETS bluefs DESTINATION lib)
 endif(WITH_BLUEFS)
 
-if(HAVE_LIBAIO)
-  target_link_libraries(os ${AIO_LIBRARIES})
-endif(HAVE_LIBAIO)
-
 if(WITH_FUSE)
   target_link_libraries(os FUSE::FUSE)
 endif()
@@ -100,16 +86,15 @@ if(HAVE_LIBZFS)
   target_link_libraries(os ${ZFS_LIBRARIES})
 endif()
 
-if(WITH_SPDK)
-  target_link_libraries(os
-    ${SPDK_LIBRARIES})
-endif()
-
 if(WITH_LTTNG)
   add_dependencies(os objectstore-tp)
   add_dependencies(os bluestore-tp)
 endif()
 
+if(WITH_JAEGER)
+  target_link_libraries(os jaeger-base)
+endif()
+
 target_link_libraries(os kv)
 
 add_dependencies(os compressor_plugins)
@@ -124,37 +109,3 @@ if(WITH_BLUESTORE)
   install(TARGETS ceph-bluestore-tool
     DESTINATION bin)
 endif()
-
-if(WITH_BLUESTORE_PMEM)
-  target_link_libraries(os pmem::pmem)
-endif()
-
-if(WITH_EVENTTRACE)
-  add_dependencies(os eventtrace_tp)
-endif()
-
-if(WITH_LIBURING)
-  include(ExternalProject)
-  if("${CMAKE_GENERATOR}" MATCHES "Make")
-    set(make_cmd "$(MAKE)")
-  else()
-    set(make_cmd "make")
-  endif()
-  ExternalProject_Add(liburing_ext
-    DOWNLOAD_DIR ${CMAKE_BINARY_DIR}/src/
-    GIT_REPOSITORY http://git.kernel.dk/liburing
-    GIT_TAG "4e360f71131918c36774f51688e5c65dea8d43f2"
-    SOURCE_DIR ${CMAKE_BINARY_DIR}/src/liburing
-    CONFIGURE_COMMAND <SOURCE_DIR>/configure
-    BUILD_COMMAND env CC=${CMAKE_C_COMPILER} ${make_cmd} -C src -s
-    BUILD_IN_SOURCE 1
-    INSTALL_COMMAND "")
-  unset(make_cmd)
-  add_library(liburing STATIC IMPORTED GLOBAL)
-  add_dependencies(liburing liburing_ext)
-  set_target_properties(liburing PROPERTIES
-    IMPORTED_LINK_INTERFACE_LANGUAGES "C"
-    IMPORTED_LOCATION "${CMAKE_BINARY_DIR}/src/liburing/src/liburing.a")
-  target_link_libraries(os liburing)
-  target_include_directories(os SYSTEM PRIVATE "${CMAKE_BINARY_DIR}/src/liburing/src/include")
-endif(WITH_LIBURING)