From 08e225b8e66e25003108921c0b05688c7ea6892e Mon Sep 17 00:00:00 2001 From: Anton Gerasimov Date: Thu, 8 Jun 2017 17:54:32 +0200 Subject: Set default SOTA_CLIENT directly in sota.bbclass --- classes/sota.bbclass | 1 + conf/distro/sota.conf.inc | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/sota.bbclass b/classes/sota.bbclass index 2761111..dfd3c27 100644 --- a/classes/sota.bbclass +++ b/classes/sota.bbclass @@ -5,6 +5,7 @@ python __anonymous() { OVERRIDES .= "${@bb.utils.contains('DISTRO_FEATURES', 'sota', ':sota', '', d)}" +SOTA_CLIENT ??= aktualizr 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/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 @@ DISTRO_FEATURES_append = " sota" INHERIT += " sota" -SOTA_CLIENT ?= "aktualizr" # Prelinking increases the size of downloads and causes build errors USER_CLASSES_remove = "image-prelink" -- cgit v1.2.3-54-g00ecf From 10fce02ac1dc26921532002f9107b33b8f620b76 Mon Sep 17 00:00:00 2001 From: OYTIS Date: Fri, 9 Jun 2017 13:37:45 +0200 Subject: Fix a typo (missing double quotes) --- classes/sota.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/sota.bbclass b/classes/sota.bbclass index dfd3c27..a96429c 100644 --- a/classes/sota.bbclass +++ b/classes/sota.bbclass @@ -5,7 +5,7 @@ python __anonymous() { OVERRIDES .= "${@bb.utils.contains('DISTRO_FEATURES', 'sota', ':sota', '', d)}" -SOTA_CLIENT ??= aktualizr +SOTA_CLIENT ??= "aktualizr" 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)}" -- cgit v1.2.3-54-g00ecf