Merge pull request #148 from advancedtelematic/bugfix/PRO-4216/new-garage-push

Bugfix/pro 4216/new garage push

5 files changed, 11 insertions, 33 deletions

diff --git a/README.adoc b/README.adoc
index 9615f65..47c0a2b 100644
--- a/README.adoc
+++ b/README.adoc
@@ -71,7 +71,7 @@ Although we have used U-Boot so far, other boot loaders can be configured work w
 * OSTREE_BRANCHNAME - the branch your rootfs will be committed to. Defaults to "ota"
 * OSTREE_OSNAME - OS deployment name on your target device. For more information about deployments and osnames see the https://ostree.readthedocs.io/en/latest/manual/deployment/[OSTree documentation]. Defaults to "poky".
 * OSTREE_INITRAMFS_IMAGE - initramfs/initrd image that is used as a proxy while booting into OSTree deployment. Do not change this setting unless you are sure that your initramfs can serve as such a proxy.
-* OSTREE_PUSH_CREDENTIALS - when set, your ostree commit will be pushed to a remote repo as a bitbake step. This should be the path to a JSON credentials file in https://github.com/advancedtelematic/sota-tools#credentials[the format accepted by garage-push].
+* SOTA_PACKED_CREDENTIALS - when set, your ostree commit will be pushed to a remote repo as a bitbake step. This should be the path to a JSON credentials file in https://github.com/advancedtelematic/sota-tools#credentials[the format accepted by garage-push].
 
 == Usage
 
@@ -113,12 +113,12 @@ ostree pull agl-snapshot agl-ota
 ostree admin deploy --os=agl agl-snapshot:agl-ota
 ....
 
-=== SOTA tools
+=== garage-push
 
-SOTA tools currently contains only one tool, garage-push, which lets you push the changes in OSTree repository generated by bitbake process. It communicates with an http server capable of querying files with HEAD requests and uploading them with POST requests. In particular, this can be used with http://www.atsgarage.com/[ATS Garage]. garage-push is used as follows:
+The https://github.com/advancedtelematic/aktualizr[aktualizr repo] contains a tool, garage-push, which lets you push the changes in OSTree repository generated by bitbake process. It communicates with an http server capable of querying files with HEAD requests and uploading them with POST requests. In particular, this can be used with http://www.atsgarage.com/[ATS Garage]. garage-push is used as follows:
 
 ....
-garage-push --repo=/path/to/ostree-repo --ref=mybranch --credentials=/path/to/credentials.json
+garage-push --repo=/path/to/ostree-repo --ref=mybranch --credentials=/path/to/credentials.zip
 ....
 
-You can set OSTREE_PUSH_CREDENTIALS in your local.conf to make your build results be automatically synchronized with a remote server. Credentials are stored in the JSON format described in the https://github.com/advancedtelematic/sota-tools#credentials[sota-tools README].
+You can set SOTA_PACKED_CREDENTIALS in your local.conf to make your build results be automatically synchronized with a remote server. Credentials are stored in the JSON format described in the https://github.com/advancedtelematic/aktualizr/blob/master/README.sotatools.adoc[garage-push README]. This JSON file can be optionally stored inside a zip file, although if it is stored this way, the JSON file must be named treehub.json.
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}
-}