diff options
| author | Patrick Vacek <patrickvacek@gmail.com> | 2019-06-05 14:00:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-05 14:00:32 +0200 |
| commit | 4af32c3d2b1ad79cb8e7fbefd4ddeb648f06c4d7 (patch) | |
| tree | 1fbeb18090f027dd64a3b4b647b8917b06f86fce /classes | |
| parent | eb63622b2f3aa4869e0a4e927b5b2ee5bd152053 (diff) | |
| parent | c3a41ee3310428872218f8780b380e059eb7e00f (diff) | |
| download | meta-updater-4af32c3d2b1ad79cb8e7fbefd4ddeb648f06c4d7.tar.gz | |
Merge pull request #524 from advancedtelematic/refactor/OTA-2798/rename-provisioning
Refactor/ota 2798/rename provisioning
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/sota.bbclass | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/classes/sota.bbclass b/classes/sota.bbclass index 56b9a8e..bf27b6d 100644 --- a/classes/sota.bbclass +++ b/classes/sota.bbclass | |||
| @@ -3,10 +3,24 @@ DISTROOVERRIDES .= "${@bb.utils.contains('DISTRO_FEATURES', 'sota', ':sota', '', | |||
| 3 | HOSTTOOLS_NONFATAL += "java" | 3 | HOSTTOOLS_NONFATAL += "java" |
| 4 | 4 | ||
| 5 | SOTA_CLIENT ??= "aktualizr" | 5 | SOTA_CLIENT ??= "aktualizr" |
| 6 | SOTA_CLIENT_PROV ??= "aktualizr-auto-prov" | 6 | SOTA_CLIENT_PROV ??= "aktualizr-shared-prov" |
| 7 | SOTA_DEPLOY_CREDENTIALS ?= "1" | 7 | SOTA_DEPLOY_CREDENTIALS ?= "1" |
| 8 | SOTA_HARDWARE_ID ??= "${MACHINE}" | 8 | SOTA_HARDWARE_ID ??= "${MACHINE}" |
| 9 | 9 | ||
| 10 | # Translate old provisioning recipe names into the new versions. | ||
| 11 | python () { | ||
| 12 | prov = d.getVar("SOTA_CLIENT_PROV") | ||
| 13 | if prov == "aktualizr-auto-prov": | ||
| 14 | bb.warn('aktualizr-auto-prov is deprecated. Please use aktualizr-shared-prov instead.') | ||
| 15 | d.setVar("SOTA_CLIENT_PROV", "aktualizr-shared-prov") | ||
| 16 | elif prov == "aktualizr-ca-implicit-prov": | ||
| 17 | bb.warn('aktualizr-ca-implicit-prov is deprecated. Please use aktualizr-device-prov instead.') | ||
| 18 | d.setVar("SOTA_CLIENT_PROV", "aktualizr-device-prov") | ||
| 19 | elif prov == "aktualizr-hsm-prov": | ||
| 20 | bb.warn('aktualizr-hsm-prov is deprecated. Please use aktualizr-device-prov-hsm instead.') | ||
| 21 | d.setVar("SOTA_CLIENT_PROV", "aktualizr-device-prov-hsm") | ||
| 22 | } | ||
| 23 | |||
| 10 | IMAGE_INSTALL_append_sota = " ostree os-release ${SOTA_CLIENT} ${SOTA_CLIENT_PROV}" | 24 | IMAGE_INSTALL_append_sota = " ostree os-release ${SOTA_CLIENT} ${SOTA_CLIENT_PROV}" |
| 11 | IMAGE_CLASSES += " image_types_ostree image_types_ota" | 25 | IMAGE_CLASSES += " image_types_ostree image_types_ota" |
| 12 | 26 | ||
