diff options
Diffstat (limited to 'recipes-sota/aktualizr/aktualizr-auto-prov.bb')
| -rw-r--r-- | recipes-sota/aktualizr/aktualizr-auto-prov.bb | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/recipes-sota/aktualizr/aktualizr-auto-prov.bb b/recipes-sota/aktualizr/aktualizr-auto-prov.bb index 07e5bb8..1a42184 100644 --- a/recipes-sota/aktualizr/aktualizr-auto-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-auto-prov.bb | |||
| @@ -16,8 +16,6 @@ SRC_URI = " \ | |||
| 16 | require environment.inc | 16 | require environment.inc |
| 17 | require credentials.inc | 17 | require credentials.inc |
| 18 | 18 | ||
| 19 | export SOTA_PACKED_CREDENTIALS | ||
| 20 | |||
| 21 | do_install() { | 19 | do_install() { |
| 22 | if [ -n "${SOTA_AUTOPROVISION_CREDENTIALS}" ]; then | 20 | if [ -n "${SOTA_AUTOPROVISION_CREDENTIALS}" ]; then |
| 23 | bbwarn "SOTA_AUTOPROVISION_CREDENTIALS are ignored. Please use SOTA_PACKED_CREDENTIALS" | 21 | bbwarn "SOTA_AUTOPROVISION_CREDENTIALS are ignored. Please use SOTA_PACKED_CREDENTIALS" |
| @@ -32,12 +30,12 @@ do_install() { | |||
| 32 | bbwarn "OSTREE_PUSH_CREDENTIALS is ignored. Please use SOTA_PACKED_CREDENTIALS" | 30 | bbwarn "OSTREE_PUSH_CREDENTIALS is ignored. Please use SOTA_PACKED_CREDENTIALS" |
| 33 | fi | 31 | fi |
| 34 | 32 | ||
| 35 | install -d ${D}${libdir}/sota | 33 | install -m 0700 -d ${D}${libdir}/sota/conf.d |
| 36 | install -d ${D}${localstatedir}/sota | 34 | install -m 0700 -d ${D}${localstatedir}/sota |
| 37 | if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then | 35 | if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then |
| 38 | aktualizr_toml=${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'secondary-network', 'sota_autoprov_primary.toml', 'sota_autoprov.toml', d)} | 36 | aktualizr_toml=${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'secondary-network', 'sota_autoprov_primary.toml', 'sota_autoprov.toml', d)} |
| 39 | 37 | ||
| 40 | install -m 0644 ${STAGING_DIR_NATIVE}${libdir}/sota/${aktualizr_toml} ${D}${libdir}/sota/sota.toml | 38 | install -m 0644 ${STAGING_DIR_NATIVE}${libdir}/sota/${aktualizr_toml} ${D}${libdir}/sota/conf.d/20-sota.toml |
| 41 | 39 | ||
| 42 | # deploy SOTA credentials | 40 | # deploy SOTA credentials |
| 43 | if [ -e ${SOTA_PACKED_CREDENTIALS} ]; then | 41 | if [ -e ${SOTA_PACKED_CREDENTIALS} ]; then |
| @@ -49,7 +47,7 @@ do_install() { | |||
| 49 | } | 47 | } |
| 50 | 48 | ||
| 51 | FILES_${PN} = " \ | 49 | FILES_${PN} = " \ |
| 52 | ${libdir}/sota/sota.toml \ | 50 | ${libdir}/sota/conf.d/20-sota.toml \ |
| 53 | ${localstatedir}/sota \ | 51 | ${localstatedir}/sota \ |
| 54 | ${localstatedir}/sota/sota_provisioning_credentials.zip \ | 52 | ${localstatedir}/sota/sota_provisioning_credentials.zip \ |
| 55 | " | 53 | " |
