summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcajun-rat <p@beta16.co.uk>2017-06-12 17:18:33 +0200
committerGitHub <noreply@github.com>2017-06-12 17:18:33 +0200
commit5b7cf9b286ed81458ce8940c44643cf082000133 (patch)
treee8b5f8c6b55f1bda00d04d15737c43e87be009b0
parentc1d3335e548c4d54414791cc8197b652da84e9a3 (diff)
parent10fce02ac1dc26921532002f9107b33b8f620b76 (diff)
downloadmeta-updater-5b7cf9b286ed81458ce8940c44643cf082000133.tar.gz
Merge pull request #79 from advancedtelematic/bugfix/sotaclient
Set default SOTA_CLIENT directly in sota.bbclass
-rw-r--r--classes/sota.bbclass1
-rw-r--r--conf/distro/sota.conf.inc1
2 files changed, 1 insertions, 1 deletions
diff --git a/classes/sota.bbclass b/classes/sota.bbclass
index 2761111..a96429c 100644
--- a/classes/sota.bbclass
+++ b/classes/sota.bbclass
@@ -5,6 +5,7 @@ python __anonymous() {
5 5
6OVERRIDES .= "${@bb.utils.contains('DISTRO_FEATURES', 'sota', ':sota', '', d)}" 6OVERRIDES .= "${@bb.utils.contains('DISTRO_FEATURES', 'sota', ':sota', '', d)}"
7 7
8SOTA_CLIENT ??= "aktualizr"
8IMAGE_INSTALL_append_sota = " ostree os-release ${SOTA_CLIENT}" 9IMAGE_INSTALL_append_sota = " ostree os-release ${SOTA_CLIENT}"
9IMAGE_CLASSES += " image_types_ostree image_types_ota" 10IMAGE_CLASSES += " image_types_ostree image_types_ota"
10IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'ostreepush otaimg wic', ' ', d)}" 11IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'ostreepush otaimg wic', ' ', d)}"
diff --git a/conf/distro/sota.conf.inc b/conf/distro/sota.conf.inc
index 07844e3..7438424 100644
--- a/conf/distro/sota.conf.inc
+++ b/conf/distro/sota.conf.inc
@@ -6,6 +6,5 @@
6 6
7DISTRO_FEATURES_append = " sota" 7DISTRO_FEATURES_append = " sota"
8INHERIT += " sota" 8INHERIT += " sota"
9SOTA_CLIENT ?= "aktualizr"
10# Prelinking increases the size of downloads and causes build errors 9# Prelinking increases the size of downloads and causes build errors
11USER_CLASSES_remove = "image-prelink" 10USER_CLASSES_remove = "image-prelink"