Merge pull request #73 from advancedtelematic/bugfix/PRO-3195/sotaclient

Add option to choose which sota client to use (if any)

3 files changed, 3 insertions, 3 deletions

diff --git a/classes/sota.bbclass b/classes/sota.bbclass
index d786b69..2761111 100644
--- a/classes/sota.bbclass
+++ b/classes/sota.bbclass
@@ -5,7 +5,7 @@ python __anonymous() {
 
 OVERRIDES .= "${@bb.utils.contains('DISTRO_FEATURES', 'sota', ':sota', '', d)}"
 
-IMAGE_INSTALL_append_sota = " ostree os-release"
+IMAGE_INSTALL_append_sota = " ostree os-release ${SOTA_CLIENT}"
 IMAGE_CLASSES += " image_types_ostree image_types_ota"
 IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'ostreepush otaimg wic', ' ', d)}"
 
diff --git a/conf/distro/poky-sota-systemd.conf b/conf/distro/poky-sota-systemd.conf
index 726e9f9..7d008a9 100644
--- a/conf/distro/poky-sota-systemd.conf
+++ b/conf/distro/poky-sota-systemd.conf
@@ -10,4 +10,4 @@ DISTRO_CODENAME = "sota"
 DISTRO_FEATURES_append = " systemd"
 VIRTUAL-RUNTIME_init_manager = "systemd"
 
-IMAGE_INSTALL_append = " connman connman-client rvi-sota-client"
+IMAGE_INSTALL_append = " connman connman-client"
diff --git a/conf/distro/sota.conf.inc b/conf/distro/sota.conf.inc
index fddd1d2..07844e3 100644
--- a/conf/distro/sota.conf.inc
+++ b/conf/distro/sota.conf.inc
@@ -6,6 +6,6 @@
 
 DISTRO_FEATURES_append = " sota"
 INHERIT += " sota"
-IMAGE_INSTALL_append = " aktualizr"
+SOTA_CLIENT ?= "aktualizr"
 # Prelinking increases the size of downloads and causes build errors
 USER_CLASSES_remove = "image-prelink"