diff options
author | OYTIS <tossel@gmail.com> | 2017-12-05 19:13:39 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-05 19:13:39 +0100 |
commit | 3b1d177698f0bf21524ebabbb5493f39793553e1 (patch) | |
tree | 0073bcd6a3751d76dd1ab46f5e1cff42675c6622 | |
parent | b238c2772512545789cef8da26898b703ee557fd (diff) | |
parent | 9948edf252ba57f7386d647884f9c50d4f31310e (diff) | |
download | meta-updater-3b1d177698f0bf21524ebabbb5493f39793553e1.tar.gz |
Merge pull request #199 from advancedtelematic/bugfix/usrlibsota
Always create /usr/lib/sota in autoprov recipe
-rw-r--r-- | recipes-sota/aktualizr/aktualizr-auto-prov.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-sota/aktualizr/aktualizr-auto-prov.bb b/recipes-sota/aktualizr/aktualizr-auto-prov.bb index 6588c20..dd23c06 100644 --- a/recipes-sota/aktualizr/aktualizr-auto-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-auto-prov.bb | |||
@@ -36,15 +36,15 @@ do_install() { | |||
36 | bbwarn "OSTREE_PUSH_CREDENTIALS is ignored. Please use SOTA_PACKED_CREDENTIALS" | 36 | bbwarn "OSTREE_PUSH_CREDENTIALS is ignored. Please use SOTA_PACKED_CREDENTIALS" |
37 | fi | 37 | fi |
38 | 38 | ||
39 | install -d ${D}${libdir}/sota | ||
40 | install -d ${D}${localstatedir}/sota | ||
39 | if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then | 41 | if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then |
40 | install -d ${D}/${systemd_unitdir}/system | 42 | install -d ${D}/${systemd_unitdir}/system |
41 | install -m 0644 ${WORKDIR}/aktualizr.service ${D}/${systemd_unitdir}/system/aktualizr.service | 43 | install -m 0644 ${WORKDIR}/aktualizr.service ${D}/${systemd_unitdir}/system/aktualizr.service |
42 | install -d ${D}${libdir}/sota | ||
43 | install -m "0644" ${STAGING_DIR_NATIVE}/${libdir}/sota/sota_autoprov.toml ${D}${libdir}/sota/sota.toml | 44 | install -m "0644" ${STAGING_DIR_NATIVE}/${libdir}/sota/sota_autoprov.toml ${D}${libdir}/sota/sota.toml |
44 | 45 | ||
45 | # deploy SOTA credentials | 46 | # deploy SOTA credentials |
46 | if [ -e ${SOTA_PACKED_CREDENTIALS} ]; then | 47 | if [ -e ${SOTA_PACKED_CREDENTIALS} ]; then |
47 | mkdir -p ${D}/var/sota | ||
48 | cp ${SOTA_PACKED_CREDENTIALS} ${D}/var/sota/sota_provisioning_credentials.zip | 48 | cp ${SOTA_PACKED_CREDENTIALS} ${D}/var/sota/sota_provisioning_credentials.zip |
49 | # Device should not be able to push data to treehub | 49 | # Device should not be able to push data to treehub |
50 | zip -d ${D}/var/sota/sota_provisioning_credentials.zip treehub.json | 50 | zip -d ${D}/var/sota/sota_provisioning_credentials.zip treehub.json |
@@ -58,5 +58,5 @@ do_install() { | |||
58 | FILES_${PN} = " \ | 58 | FILES_${PN} = " \ |
59 | ${systemd_unitdir}/system/aktualizr.service \ | 59 | ${systemd_unitdir}/system/aktualizr.service \ |
60 | ${libdir}/sota/sota.toml \ | 60 | ${libdir}/sota/sota.toml \ |
61 | /var/sota/sota_provisioning_credentials.zip \ | 61 | ${localstatedir}/sota/sota_provisioning_credentials.zip \ |
62 | " | 62 | " |