Use garage-push from aktualizr repo.

No need for sota-tools repo anymore.

Bump aktualizr version to get necessary build fix.

4 files changed, 6 insertions, 28 deletions

diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass
index adcafe3..1f8e195 100644
--- a/classes/image_types_ostree.bbclass
+++ b/classes/image_types_ostree.bbclass
@@ -159,7 +159,7 @@ IMAGE_CMD_ostree () {
 }
 
 IMAGE_TYPEDEP_ostreepush = "ostree"
-IMAGE_DEPENDS_ostreepush = "sota-tools-native:do_populate_sysroot"
+IMAGE_DEPENDS_ostreepush = "aktualizr-native:do_populate_sysroot"
 IMAGE_CMD_ostreepush () {
     # Print warnings if credetials are not set or if the file has not been found.
     if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then
diff --git a/recipes-sota/aktualizr/aktualizr-native_git.bb b/recipes-sota/aktualizr/aktualizr-native_git.bb
index 59479fd..b89e9de 100644
--- a/recipes-sota/aktualizr/aktualizr-native_git.bb
+++ b/recipes-sota/aktualizr/aktualizr-native_git.bb
@@ -1,16 +1,18 @@
 require aktualizr_common.inc
 
-DEPENDS = "boost-native openssl-native libarchive-native libsodium-native"
+DEPENDS = "boost-native glib-2.0-native curl-native openssl-native libarchive-native libsodium-native"
 
 inherit native
 
-EXTRA_OECMAKE = "-DWARNING_AS_ERROR=OFF -DCMAKE_BUILD_TYPE=Release -DBUILD_OSTREE=OFF -DAKTUALIZR_VERSION=${PV}"
+EXTRA_OECMAKE = "-DWARNING_AS_ERROR=OFF -DCMAKE_BUILD_TYPE=Release -DBUILD_SOTA_TOOLS=ON -DBUILD_OSTREE=OFF -DAKTUALIZR_VERSION=${PV}"
 
 do_install_append () {
     rm ${D}${bindir}/aktualizr
     rm ${D}${bindir}/aktualizr_cert_provider
+    rm ${D}${bindir}/garage-deploy
 }
 
 FILES_${PN} = " \
                 ${bindir}/aktualizr_implicit_writer \
+                ${bindir}/garage-push \
                 "
diff --git a/recipes-sota/aktualizr/aktualizr_common.inc b/recipes-sota/aktualizr/aktualizr_common.inc
index 7ed3614..79c5e37 100644
--- a/recipes-sota/aktualizr/aktualizr_common.inc
+++ b/recipes-sota/aktualizr/aktualizr_common.inc
@@ -11,7 +11,7 @@ PR = "7"
 SRC_URI = " \
   git://github.com/advancedtelematic/aktualizr;branch=${BRANCH} \
   "
-SRCREV = "59c276c1d4800d025594b53900ee964533695731"
+SRCREV = "67c4f44c4136d16871726449502e3926098e8524"
 BRANCH ?= "master"
 
 S = "${WORKDIR}/git"
diff --git a/recipes-sota/sota-tools/sota-tools_git.bb b/recipes-sota/sota-tools/sota-tools_git.bb
deleted file mode 100644
index 5403d9a..0000000
--- a/recipes-sota/sota-tools/sota-tools_git.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "Utility to push data to a server"
-LICENSE = "MPL-2.0"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=65d26fcc2f35ea6a181ac777e42db1ea"
-
-S = "${WORKDIR}/git"
-
-SRC_URI = "gitsm://github.com/advancedtelematic/sota-tools.git;branch=master"
-SRCREV = "216cb84db98e9b0f8c6c1c407f480c5dd0b3cf62"
-
-inherit cmake
-
-DEPENDS = "boost glib-2.0 curl libarchive"
-
-BBCLASSEXTEND = "native"
-
-FILES_${PN} = "${bindir}/garage-push"
-
-EXTRA_OECMAKE = "-DWARNING_AS_ERROR=OFF"
-
-do_install() {
-   install -d ${D}/${bindir}
-   install -m 755 garage-push ${D}/${bindir}
-}