diff options
| author | cajun-rat <phil@advancedtelematic.com> | 2018-02-02 15:09:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-02 15:09:54 +0100 |
| commit | 51173110ef607a90d3fe699a7f53b6fbe6c76385 (patch) | |
| tree | d92477a7b4eb371f1f057e13059bd2e692fbf51e /classes/sota.bbclass | |
| parent | 1ea77e2a98e77956d687cfa6c445518938a5e809 (diff) | |
| parent | 296497365ed9fa11c752d51d1e71b25a054cd5d4 (diff) | |
| download | meta-updater-51173110ef607a90d3fe699a7f53b6fbe6c76385.tar.gz | |
Merge pull request #248 from advancedtelematic/feat/mergerocko
Merge our current progress from Rocko to master
Diffstat (limited to 'classes/sota.bbclass')
| -rw-r--r-- | classes/sota.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/classes/sota.bbclass b/classes/sota.bbclass index 7e9adca..2a12e8f 100644 --- a/classes/sota.bbclass +++ b/classes/sota.bbclass | |||
| @@ -11,10 +11,10 @@ SOTA_CLIENT ??= "aktualizr" | |||
| 11 | SOTA_CLIENT_PROV ??= "aktualizr-auto-prov" | 11 | SOTA_CLIENT_PROV ??= "aktualizr-auto-prov" |
| 12 | IMAGE_INSTALL_append_sota = " ostree os-release ${SOTA_CLIENT} ${SOTA_CLIENT_PROV}" | 12 | IMAGE_INSTALL_append_sota = " ostree os-release ${SOTA_CLIENT} ${SOTA_CLIENT_PROV}" |
| 13 | IMAGE_CLASSES += " image_types_ostree image_types_ota" | 13 | IMAGE_CLASSES += " image_types_ostree image_types_ota" |
| 14 | IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'ostreepush garagesign otaimg wic', ' ', d)}" | 14 | IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'ostreepush garagesign garagecheck otaimg wic', ' ', d)}" |
| 15 | 15 | ||
| 16 | PACKAGECONFIG_append_pn-curl = "${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm', " ssl", " ", d)}" | 16 | PACKAGECONFIG_append_pn-curl = " ssl" |
| 17 | PACKAGECONFIG_remove_pn-curl = "${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm', " gnutls", " ", d)}" | 17 | PACKAGECONFIG_remove_pn-curl = "gnutls" |
| 18 | 18 | ||
| 19 | WKS_FILE_sota ?= "sdimage-sota.wks" | 19 | WKS_FILE_sota ?= "sdimage-sota.wks" |
| 20 | 20 | ||