diff options
| author | Ricardo Salveti <ricardo@opensourcefoundries.com> | 2018-05-10 19:10:16 -0300 |
|---|---|---|
| committer | Ricardo Salveti <ricardo@opensourcefoundries.com> | 2018-05-10 19:10:21 -0300 |
| commit | df10525b72f953a797338d30696c1891aafd6469 (patch) | |
| tree | d625bb231d38872bf750acb3e9b882bf8b7af214 | |
| parent | 3fefd902b3fa0aff94a8d5b47a1ad22542830943 (diff) | |
aktualizr: aktualizr-info: add support to report image name and hash
Useful for debugging issues when updating the system.
Signed-off-by: Ricardo Salveti <ricardo@opensourcefoundries.com>
| -rw-r--r-- | recipes-sota/aktualizr/aktualizr/aktualizr-info-add-support-to-report-current-image-h.patch | 35 | ||||
| -rw-r--r-- | recipes-sota/aktualizr/aktualizr_%.bbappend | 1 |
2 files changed, 36 insertions, 0 deletions
diff --git a/recipes-sota/aktualizr/aktualizr/aktualizr-info-add-support-to-report-current-image-h.patch b/recipes-sota/aktualizr/aktualizr/aktualizr-info-add-support-to-report-current-image-h.patch new file mode 100644 index 0000000..87b6440 --- /dev/null +++ b/recipes-sota/aktualizr/aktualizr/aktualizr-info-add-support-to-report-current-image-h.patch @@ -0,0 +1,35 @@ +From 259653c88ba844e881aeb8afd9e5c5505764888b Mon Sep 17 00:00:00 2001 +From: Ricardo Salveti <ricardo@opensourcefoundries.com> +Date: Thu, 10 May 2018 19:07:14 -0300 +Subject: [PATCH] aktualizr-info: add support to report current image hash and + filename + +Signed-off-by: Ricardo Salveti <ricardo@opensourcefoundries.com> +--- + src/aktualizr_info/main.cc | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/src/aktualizr_info/main.cc b/src/aktualizr_info/main.cc +index 7e0f9df4..37ddb6b5 100644 +--- a/src/aktualizr_info/main.cc ++++ b/src/aktualizr_info/main.cc +@@ -85,6 +85,16 @@ int main(int argc, char **argv) { + std::cout << "Provisioned on server: " << (storage->loadEcuRegistered() ? "yes" : "no") << std::endl; + std::cout << "Fetched metadata: " << (has_metadata ? "yes" : "no") << std::endl; + ++ std::vector<Uptane::Target> installed_versions; ++ std::string current_hash = storage->loadInstalledVersions(&installed_versions); ++ std::vector<Uptane::Target>::iterator it; ++ for (it = installed_versions.begin(); it != installed_versions.end(); it++) { ++ if (it->sha256Hash() == current_hash) { ++ std::cout << "Current image name: " << it->filename() << std::endl; ++ std::cout << "Current image hash: " << it->sha256Hash() << std::endl; ++ } ++ } ++ + if (has_metadata) { + if (vm.count("images-root") != 0u) { + std::cout << "image root.json content:" << std::endl; +-- +2.17.0 + diff --git a/recipes-sota/aktualizr/aktualizr_%.bbappend b/recipes-sota/aktualizr/aktualizr_%.bbappend index 3c1844f..dd7c0c7 100644 --- a/recipes-sota/aktualizr/aktualizr_%.bbappend +++ b/recipes-sota/aktualizr/aktualizr_%.bbappend @@ -3,6 +3,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI_append += " \ file://Move-default-sota-config-from-usr-lib-to-var.patch \ file://sota_tools-always-set-cacerts-if-specified-by-the-us.patch \ + file://aktualizr-info-add-support-to-report-current-image-h.patch \ file://increase-restartsec-service.patch;patchdir=.. \ " |