summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMykhaylo Sul <ext-mykhaylo.sul@here.com>2019-11-05 09:17:53 +0100
committerPatrick Vacek <patrickvacek@gmail.com>2019-11-20 10:42:55 +0100
commitc46091d99004e7ecab810d8c91da6bd45c49b80b (patch)
tree4a0e905d1421dc1a8a46537fc91f8b0302c652eb
parentd74b923847554cce139e201554fd4962434f779a (diff)
downloadmeta-updater-c46091d99004e7ecab810d8c91da6bd45c49b80b.tar.gz
OTA-3988: force an ostree boot indication only in case of non-systemd distro
Signed-off-by: Mykhaylo Sul <ext-mykhaylo.sul@here.com> Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
-rw-r--r--classes/sota.bbclass2
-rw-r--r--conf/distro/poky-sota.conf2
2 files changed, 3 insertions, 1 deletions
diff --git a/classes/sota.bbclass b/classes/sota.bbclass
index 27b2765..5620b76 100644
--- a/classes/sota.bbclass
+++ b/classes/sota.bbclass
@@ -21,7 +21,7 @@ python () {
21 d.setVar("SOTA_CLIENT_PROV", "aktualizr-device-prov-hsm") 21 d.setVar("SOTA_CLIENT_PROV", "aktualizr-device-prov-hsm")
22} 22}
23 23
24IMAGE_INSTALL_append_sota = " ostree os-release ${SOTA_CLIENT} ${SOTA_CLIENT_PROV} ostree-booted" 24IMAGE_INSTALL_append_sota = " ostree os-release ${SOTA_CLIENT} ${SOTA_CLIENT_PROV}"
25IMAGE_CLASSES += " image_types_ostree image_types_ota" 25IMAGE_CLASSES += " image_types_ostree image_types_ota"
26 26
27IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'ostreepush garagesign garagecheck ota-ext4 wic', ' ', d)}" 27IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'ostreepush garagesign garagecheck ota-ext4 wic', ' ', d)}"
diff --git a/conf/distro/poky-sota.conf b/conf/distro/poky-sota.conf
index 3fb1d20..bfac90f 100644
--- a/conf/distro/poky-sota.conf
+++ b/conf/distro/poky-sota.conf
@@ -5,3 +5,5 @@ DISTRO = "poky-sota"
5DISTRO_NAME = "OTA-enabled Linux" 5DISTRO_NAME = "OTA-enabled Linux"
6DISTRO_VERSION = "1.0" 6DISTRO_VERSION = "1.0"
7DISTRO_CODENAME = "sota" 7DISTRO_CODENAME = "sota"
8
9IMAGE_INSTALL_append_sota = " ostree-booted"