rpms: Add AWS cloud driver

diff --git a/bacula/platforms/rpms/redhat/bacula-cloud.spec.in b/bacula/platforms/rpms/redhat/bacula-cloud.spec.in
index 2c691db96113c6962baa23baa350e5477a557ec4..ab47b20aac6e9a22415bd71db247ecd567357f6b 100644 (file)
--- a/bacula/platforms/rpms/redhat/bacula-cloud.spec.in
+++ b/bacula/platforms/rpms/redhat/bacula-cloud.spec.in
@@ -74,7 +74,7 @@ Distribution: Bacula Cloud Storage
 Source0: http://www.prdownloads.sourceforge.net/bacula/depkgs-%{depkgs_version}.tar.gz
 Source1: https://www.bacula.org/downloads/bacula-%{_version}.tar.gz
 
-Requires: bacula-sd, %{base_package_name}-libs = %{_version}, libcurl
+Requires: bacula-sd, %{base_package_name}-libs = %{_version}, libcurl, awscli
 
 BuildRequires: libcurl-devel
 
@@ -121,6 +121,7 @@ cd ../bacula-%{_version}
         --with-oci \
         --with-gs \
         --with-s3=${cwd}/%{depkgs}/libs3 \
+        --with-aws \
         --disable-bat \
         --with-postgresql \
         --disable-build-dird \
@@ -138,7 +139,8 @@ cd ../bacula-%{_version}
         --with-mon-dir-password="XXX_REPLACE_WITH_DIRECTOR_MONITOR_PASSWORD_XXX" \
         --with-mon-fd-password="XXX_REPLACE_WITH_CLIENT_MONITOR_PASSWORD_XXX" \
         --with-mon-sd-password="XXX_REPLACE_WITH_STORAGE_MONITOR_PASSWORD_XXX" \
-        --with-openssl 
+        --with-openssl  \
+        --with-cython=cython3
 
 make
 
@@ -151,6 +153,8 @@ mkdir -p $RPM_BUILD_ROOT%{scripts_dir}/
 
 make DESTDIR=$RPM_BUILD_ROOT -C ../bacula-%{_version}/src/stored install-cloud
 make DESTDIR=$RPM_BUILD_ROOT -C ../bacula-%{_version}/src/stored install-s3-cloud
+make DESTDIR=$RPM_BUILD_ROOT -C ../bacula-%{_version}/src/stored install-aws-cloud
+make DESTDIR=$RPM_BUILD_ROOT -C ../bacula-%{_version}/scripts install-aws-cloud
 
 # install libs3 lib files
 cp -p %{depkgs}/libs3*/build/lib/*.so* $RPM_BUILD_ROOT%{lib_dir}
@@ -169,7 +173,6 @@ rm -f $RPM_BUILD_ROOT%{lib_dir}/libbac.*
 rm -f $RPM_BUILD_ROOT%{lib_dir}/libbac-*
 rm -f $RPM_BUILD_ROOT%{lib_dir}/libbacsd*
 rm -f $RPM_BUILD_ROOT%{plugin_dir}/bacula-sd-cloud-driver.so
-rm -f $RPM_BUILD_ROOT%{plugin_dir}/bacula-sd-cloud-s3-driver.so
 rm -f $RPM_BUILD_ROOT%{plugin_dir}/bacula-sd-cloud-was-driver.so
 rm -f $RPM_BUILD_ROOT%{plugin_dir}/bacula-sd-cloud-gs-driver.so
 rm -f $RPM_BUILD_ROOT%{plugin_dir}/bacula-sd-cloud-oci-driver.so
@@ -185,6 +188,8 @@ cp -p %{depkgs}/libs3-*/LICENSE $RPM_BUILD_ROOT%{docdir}/bacula-cloud-storage/li
 %defattr(-,root,root)
 %attr(755, root, root) %{plugin_dir}/bacula-sd-cloud-driver-%{version}.so
 %attr(755, root, root) %{plugin_dir}/bacula-sd-cloud-s3-driver-%{version}.so
+%attr(755, root, root) %{plugin_dir}/bacula-sd-cloud-aws-driver-%{version}.so
+%attr(755, root, root) %{plugin_dir}/aws_cloud_driver
 %{lib_dir}/libs3*
 %{docdir}/bacula-cloud-storage/libs3.license
 

diff --git a/bacula/platforms/rpms/redhat/bacula-docker-tools.spec.in b/bacula/platforms/rpms/redhat/bacula-docker-tools.spec.in
index 86be70fc01af61b0452294da1ea37933d8902f16..9b895c37e5f3fca89806209e4b6ee0330ba4536e 100644 (file)
--- a/bacula/platforms/rpms/redhat/bacula-docker-tools.spec.in
+++ b/bacula/platforms/rpms/redhat/bacula-docker-tools.spec.in
@@ -52,7 +52,7 @@ cp %{_sourcedir}/baculatar-docker-%{docker_tar_version}.tar.gz ${RPM_BUILD_ROOT}
 if which docker > /dev/null 2> /dev/null
 then
     echo "Importing Docker image"
-    docker load -i %{lib_dir}/bacula-backup-%{k8s_version}.tar.gz
+    docker load -i %{lib_dir}/bacula-backup-%{docker_tar_version}.tar.gz
 
     if [ ! $? -eq 0 ] ; then
         echo "Unable to install %{lib_dir}/baculatar-docker-%{docker_tar_version}.tar.gz Docker image automatically."