droplet support

CMakeLists.txt

@@ -427,8 +427,6 @@ if(${HAVE_SYS_XATTR_H})
    set(have_xattr ${HAVE_SYS_XATTR_H})
 endif()
 
-set(have_droplet "" )
-
 if(${HAVE_RADOS_LIBRADOS_H})
    set(HAVE_CEPH_RADOS 1)
    set(have_ceph_rados ${HAVE_CEPH_RADOS} )
@@ -606,7 +604,7 @@ MESSAGE("   ACL support:                  ${acl} ${ACL_FOUND} ${ACL_LIBS}")
 MESSAGE("   XATTR support:                ${have_xattr} ")
 MESSAGE("   SCSI Crypto support:          ${scsi-crypto} ${HAVE_LOWLEVEL_SCSI_INTERFACE} ")
 MESSAGE("   GFAPI(GLUSTERFS) support:     ${GFAPI_FOUND} ${GFAPI_LIBRARIES} ${GFAPI_INCLUDE_DIRS} ")
-MESSAGE("   DROPLET support:              ${have_droplet} ")
+MESSAGE("   DROPLET support:              ${HAVE_DROPLET} ")
 MESSAGE("   CEPH RADOS support:           ${RADOS_FOUND} ${RADOS_LIBRARIES} ${RADOS_INCLUDE_DIRS} ")
 MESSAGE("   RADOS striping support:       ${RADOSSTRIPER_FOUND} ${RADOSSTRIPER_LIBRARIES} ${RADOSSTRIPER_INCLUDE_DIRS} ")
 MESSAGE("   CEPHFS support:               ${CEPHFS_FOUND} ${CEPHFS_LIBRARIES} ${CEPHFS_INCLUDE_DIRS} ")

cmake/BareosSetVariableDefaults.cmake

@@ -484,6 +484,9 @@ IF(DEFINED traymonitor)
    SET(HAVE_TRAYMONITOR 1)
 ENDIF()
 
+IF(DEFINED droplet)
+   SET(HAVE_DROPLET 1)
+ENDIF()
 
 
 # do not destroy bareos-config-lib.sh

platforms/packaging/bareos.spec

@@ -136,7 +136,7 @@ BuildRequires: systemd-rpm-macros
 %{?systemd_requires}
 %endif
 
-%if 0%{?objectstorage}
+%if 0%{droplet}
 BuildRequires: libdroplet-devel
 %endif
 
@@ -324,7 +324,7 @@ Requires(pre): shadow-utils
 Requires: bareos-tools
 %endif
 
-%if 0%{?objectstorage}
+%if 0%{droplet}
 %package    storage-droplet
 Summary:    Object Storage support (through libdroplet) for the Bareos Storage daemon
 Group:      Productivity/Archiving/Backup
@@ -592,7 +592,7 @@ This package contains the Storage Daemon
 This package contains the Storage Daemon tape support
 (Bareos service to read and write data from/to tape media)
 
-%if 0%{?objectstorage}
+%if 0%{droplet}
 %description storage-droplet
 %{dscr}
 
@@ -775,6 +775,9 @@ cmake  .. \
   -Dhostname="XXX_REPLACE_WITH_LOCAL_HOSTNAME_XXX" \
 %if 0%{?systemd_support}
   -Dsystemd=yes \
+%endif
+%if 0%{droplet}
+  -Ddroplet=yes \
 %endif
   -Dincludes=yes
 
@@ -1049,7 +1052,7 @@ echo "This is a meta package to install a full bareos system" > %{buildroot}%{_d
 %attr(0640, %{director_daemon_user}, %{daemon_group}) %{_sysconfdir}/bareos/bareos-dir.d/storage/NULL.conf.example
 %attr(0640, %{storage_daemon_user}, %{daemon_group})  %{_sysconfdir}/bareos/bareos-sd.d/device/NULL.conf.example
 
-%if 0%{?objectstorage}
+%if 0%{droplet}
 %files storage-droplet
 %defattr(-, root, root)
 %{backend_dir}/libbareossd-chunked*.so

src/stored/backends/CMakeLists.txt

@@ -45,11 +45,7 @@ INSTALL(TARGETS libbareossd-gfapi DESTINATION ${backenddir})
 target_link_libraries(libbareossd-gfapi ${GFAPI_LIBRARIES})
 endif()
 
-add_library(libbareossd-elasto MODULE elasto_device.cc)
-# do not prefix with "lib"
-set_target_properties(libbareossd-elasto PROPERTIES PREFIX "")
-#INSTALL(TARGETS libbareossd-elasto DESTINATION ${backenddir})
-
+if(${HAVE_DROPLET})
 add_library(libbareossd-droplet MODULE droplet_device.cc)
 # do not prefix with "lib"
 set_target_properties(libbareossd-droplet PROPERTIES PREFIX "")
@@ -59,6 +55,12 @@ add_library(libbareossd-chunked MODULE chunked_device.cc)
 # do not prefix with "lib"
 set_target_properties(libbareossd-chunked PROPERTIES PREFIX "")
 #INSTALL(TARGETS libbareossd-chunked DESTINATION ${backenddir})
+endif()
+
+add_library(libbareossd-elasto MODULE elasto_device.cc)
+# do not prefix with "lib"
+set_target_properties(libbareossd-elasto PROPERTIES PREFIX "")
+#INSTALL(TARGETS libbareossd-elasto DESTINATION ${backenddir})
 
 add_library(libbareossd-fifo MODULE unix_fifo_device.cc)
 # do not prefix with "lib"