summaryrefslogtreecommitdiffstats
path: root/recipes-sota
diff options
context:
space:
mode:
authorPatrick Vacek <patrickvacek@gmail.com>2017-12-06 09:20:27 +0100
committerPatrick Vacek <patrickvacek@gmail.com>2017-12-07 11:02:31 +0100
commitc99f5e78eaddc41904ebd6e2b15214b4fd4e5a91 (patch)
treed4e38878485e444226f890a090b35cbc53f252cc /recipes-sota
parent9dcadfe093edbc7a24e180080f672d3cfceceba6 (diff)
downloadmeta-updater-c99f5e78eaddc41904ebd6e2b15214b4fd4e5a91.tar.gz
Minor fixes and cleanup.
* hsm-test is no longer used. * Use Yocto variables where suitable. * Eliminate redundant directory slashes.
Diffstat (limited to 'recipes-sota')
-rw-r--r--recipes-sota/aktualizr/aktualizr-auto-prov.bb8
-rw-r--r--recipes-sota/aktualizr/aktualizr-hsm-test-prov.bb6
-rw-r--r--recipes-sota/aktualizr/aktualizr-implicit-prov.bb6
-rw-r--r--recipes-sota/garage-sign/garage-sign.bb7
4 files changed, 13 insertions, 14 deletions
diff --git a/recipes-sota/aktualizr/aktualizr-auto-prov.bb b/recipes-sota/aktualizr/aktualizr-auto-prov.bb
index cee5039..f05bf75 100644
--- a/recipes-sota/aktualizr/aktualizr-auto-prov.bb
+++ b/recipes-sota/aktualizr/aktualizr-auto-prov.bb
@@ -43,13 +43,13 @@ do_install() {
43 43
44 # deploy SOTA credentials 44 # deploy SOTA credentials
45 if [ -e ${SOTA_PACKED_CREDENTIALS} ]; then 45 if [ -e ${SOTA_PACKED_CREDENTIALS} ]; then
46 cp ${SOTA_PACKED_CREDENTIALS} ${D}/var/sota/sota_provisioning_credentials.zip 46 cp ${SOTA_PACKED_CREDENTIALS} ${D}${localstatedir}/sota/sota_provisioning_credentials.zip
47 # Device should not be able to push data to treehub 47 # Device should not be able to push data to treehub
48 zip -d ${D}/var/sota/sota_provisioning_credentials.zip treehub.json 48 zip -d ${D}${localstatedir}/sota/sota_provisioning_credentials.zip treehub.json
49 fi 49 fi
50 fi 50 fi
51 install -d ${D}/${systemd_unitdir}/system 51 install -d ${D}${systemd_unitdir}/system
52 install -m 0644 ${WORKDIR}/aktualizr.service ${D}/${systemd_unitdir}/system/aktualizr.service 52 install -m 0644 ${WORKDIR}/aktualizr.service ${D}${systemd_unitdir}/system/aktualizr.service
53} 53}
54 54
55FILES_${PN} = " \ 55FILES_${PN} = " \
diff --git a/recipes-sota/aktualizr/aktualizr-hsm-test-prov.bb b/recipes-sota/aktualizr/aktualizr-hsm-test-prov.bb
index ddc8dbf..e0a8efe 100644
--- a/recipes-sota/aktualizr/aktualizr-hsm-test-prov.bb
+++ b/recipes-sota/aktualizr/aktualizr-hsm-test-prov.bb
@@ -22,11 +22,11 @@ inherit systemd
22require environment.inc 22require environment.inc
23 23
24do_install() { 24do_install() {
25 install -d ${D}/${systemd_unitdir}/system 25 install -d ${D}${systemd_unitdir}/system
26 install -m 0644 ${WORKDIR}/aktualizr.service ${D}/${systemd_unitdir}/system/aktualizr.service 26 install -m 0644 ${WORKDIR}/aktualizr.service ${D}${systemd_unitdir}/system/aktualizr.service
27 install -d ${D}${libdir}/sota 27 install -d ${D}${libdir}/sota
28 aktualizr_implicit_writer -c ${SOTA_PACKED_CREDENTIALS} --no-root-ca \ 28 aktualizr_implicit_writer -c ${SOTA_PACKED_CREDENTIALS} --no-root-ca \
29 -i ${STAGING_DIR_NATIVE}/${libdir}/sota/sota_hsm_test.toml -o ${D}${libdir}/sota/sota.toml -p ${D} 29 -i ${STAGING_DIR_NATIVE}${libdir}/sota/sota_hsm_test.toml -o ${D}${libdir}/sota/sota.toml -p ${D}
30} 30}
31 31
32FILES_${PN} = " \ 32FILES_${PN} = " \
diff --git a/recipes-sota/aktualizr/aktualizr-implicit-prov.bb b/recipes-sota/aktualizr/aktualizr-implicit-prov.bb
index 37d0e91..5ce55e0 100644
--- a/recipes-sota/aktualizr/aktualizr-implicit-prov.bb
+++ b/recipes-sota/aktualizr/aktualizr-implicit-prov.bb
@@ -21,11 +21,11 @@ inherit systemd
21require environment.inc 21require environment.inc
22 22
23do_install() { 23do_install() {
24 install -d ${D}/${systemd_unitdir}/system 24 install -d ${D}${systemd_unitdir}/system
25 install -m 0644 ${WORKDIR}/aktualizr.service ${D}/${systemd_unitdir}/system/aktualizr.service 25 install -m 0644 ${WORKDIR}/aktualizr.service ${D}${systemd_unitdir}/system/aktualizr.service
26 install -d ${D}${libdir}/sota 26 install -d ${D}${libdir}/sota
27 aktualizr_implicit_writer -c ${SOTA_PACKED_CREDENTIALS} \ 27 aktualizr_implicit_writer -c ${SOTA_PACKED_CREDENTIALS} \
28 -i ${STAGING_DIR_NATIVE}/${libdir}/sota/sota_implicit_prov.toml -o ${D}${libdir}/sota/sota.toml -p ${D} 28 -i ${STAGING_DIR_NATIVE}${libdir}/sota/sota_implicit_prov.toml -o ${D}${libdir}/sota/sota.toml -p ${D}
29} 29}
30 30
31FILES_${PN} = " \ 31FILES_${PN} = " \
diff --git a/recipes-sota/garage-sign/garage-sign.bb b/recipes-sota/garage-sign/garage-sign.bb
index 61c4b5a..7057a57 100644
--- a/recipes-sota/garage-sign/garage-sign.bb
+++ b/recipes-sota/garage-sign/garage-sign.bb
@@ -27,8 +27,7 @@ do_install() {
27} 27}
28 28
29FILES_${PN} = " \ 29FILES_${PN} = " \
30 /usr/bin \ 30 ${bindir}/garage-sign.bat \
31 /usr/bin/garage-sign.bat \ 31 ${bindir}/garage-sign \
32 /usr/bin/garage-sign \ 32 ${libdir}/* \
33 /usr/lib/* \
34 " 33 "