summaryrefslogtreecommitdiffstats
path: root/recipes-sota
diff options
context:
space:
mode:
authorPhil Wise <phil@advancedtelematic.com>2018-06-15 09:48:32 +0200
committerPhil Wise <phil@advancedtelematic.com>2018-06-15 09:48:32 +0200
commit78422f6ca6e5cca90e33ad49aa1b39bb25c527b3 (patch)
treec7922042f6e0fe451653cbcf351530843109d0dc /recipes-sota
parent642559cd005076bc4f53fd066b8ce4a62be72864 (diff)
downloadmeta-updater-78422f6ca6e5cca90e33ad49aa1b39bb25c527b3.tar.gz
Compatibility with latest aktualizr
Note that the HsmTests still sometimes fail
Diffstat (limited to 'recipes-sota')
-rw-r--r--recipes-sota/aktualizr/aktualizr-hsm-prov.bb1
-rw-r--r--recipes-sota/aktualizr/aktualizr-implicit-prov.bb1
-rwxr-xr-xrecipes-sota/aktualizr/aktualizr_git.bb11
3 files changed, 9 insertions, 4 deletions
diff --git a/recipes-sota/aktualizr/aktualizr-hsm-prov.bb b/recipes-sota/aktualizr/aktualizr-hsm-prov.bb
index d526cd2..a5ce3b0 100644
--- a/recipes-sota/aktualizr/aktualizr-hsm-prov.bb
+++ b/recipes-sota/aktualizr/aktualizr-hsm-prov.bb
@@ -23,7 +23,6 @@ do_install() {
23 ${D}${libdir}/sota/conf.d/20-sota_hsm_prov.toml 23 ${D}${libdir}/sota/conf.d/20-sota_hsm_prov.toml
24 if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then 24 if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then
25 aktualizr_implicit_writer -c ${SOTA_PACKED_CREDENTIALS} --no-root-ca \ 25 aktualizr_implicit_writer -c ${SOTA_PACKED_CREDENTIALS} --no-root-ca \
26 -i ${STAGING_DIR_NATIVE}${libdir}/sota/sota_hsm_prov.toml \
27 -o ${D}${libdir}/sota/conf.d/30-implicit_server.toml -p ${D} 26 -o ${D}${libdir}/sota/conf.d/30-implicit_server.toml -p ${D}
28 fi 27 fi
29} 28}
diff --git a/recipes-sota/aktualizr/aktualizr-implicit-prov.bb b/recipes-sota/aktualizr/aktualizr-implicit-prov.bb
index e08eeef..544e83d 100644
--- a/recipes-sota/aktualizr/aktualizr-implicit-prov.bb
+++ b/recipes-sota/aktualizr/aktualizr-implicit-prov.bb
@@ -23,7 +23,6 @@ do_install() {
23 ${D}${libdir}/sota/conf.d/20-sota_implicit_prov.toml 23 ${D}${libdir}/sota/conf.d/20-sota_implicit_prov.toml
24 if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then 24 if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then
25 aktualizr_implicit_writer -c ${SOTA_PACKED_CREDENTIALS} \ 25 aktualizr_implicit_writer -c ${SOTA_PACKED_CREDENTIALS} \
26 -i ${STAGING_DIR_NATIVE}${libdir}/sota/sota_implicit_prov.toml \
27 -o ${D}${libdir}/sota/conf.d/30-implicit_server.toml -p ${D} 26 -o ${D}${libdir}/sota/conf.d/30-implicit_server.toml -p ${D}
28 fi 27 fi
29} 28}
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index 8dc4b31..f1540b2 100755
--- a/recipes-sota/aktualizr/aktualizr_git.bb
+++ b/recipes-sota/aktualizr/aktualizr_git.bb
@@ -13,6 +13,9 @@ RDEPENDS_${PN}_class-target = "lshw "
13RDEPENDS_${PN}_append_class-target = "${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'serialcan', ' slcand-start', '', d)} " 13RDEPENDS_${PN}_append_class-target = "${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'serialcan', ' slcand-start', '', d)} "
14RDEPENDS_${PN}_append_class-target = "${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm', ' softhsm softhsm-testtoken', '', d)}" 14RDEPENDS_${PN}_append_class-target = "${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm', ' softhsm softhsm-testtoken', '', d)}"
15 15
16RDEPENDS_${PN}_append_class-target = " ${PN}-tools "
17RDEPENDS_${PN}-secondary_append_class-target = " ${PN}-tools "
18
16PV = "1.0+git${SRCPV}" 19PV = "1.0+git${SRCPV}"
17PR = "7" 20PR = "7"
18 21
@@ -23,7 +26,7 @@ SRC_URI = " \
23 file://aktualizr-secondary.socket \ 26 file://aktualizr-secondary.socket \
24 file://aktualizr-serialcan.service \ 27 file://aktualizr-serialcan.service \
25 " 28 "
26SRCREV = "114dc6c519ca9a605d73ad292821348607d0fa12" 29SRCREV = "9f538a8a411ca917184fe11a6cf92e5ebf9efc61"
27BRANCH ?= "master" 30BRANCH ?= "master"
28 31
29S = "${WORKDIR}/git" 32S = "${WORKDIR}/git"
@@ -81,7 +84,7 @@ do_install_append_class-native () {
81 install -m 0644 ${B}/src/sota_tools/garage-sign/lib/* ${D}${libdir} 84 install -m 0644 ${B}/src/sota_tools/garage-sign/lib/* ${D}${libdir}
82} 85}
83 86
84PACKAGES =+ " ${PN}-examples ${PN}-host-tools ${PN}-secondary " 87PACKAGES =+ " ${PN}-examples ${PN}-host-tools ${PN}-tools ${PN}-secondary "
85 88
86FILES_${PN} = " \ 89FILES_${PN} = " \
87 ${bindir}/aktualizr \ 90 ${bindir}/aktualizr \
@@ -111,6 +114,10 @@ FILES_${PN}-host-tools = " \
111 ${libdir}/sota/sota_implicit_prov_ca.toml \ 114 ${libdir}/sota/sota_implicit_prov_ca.toml \
112 " 115 "
113 116
117FILES_${PN}-tools = " \
118 ${bindir}/aktualizr-check-discovery \
119 "
120
114FILES_${PN}-secondary = " \ 121FILES_${PN}-secondary = " \
115 ${bindir}/aktualizr-secondary \ 122 ${bindir}/aktualizr-secondary \
116 ${libdir}/sota/sota_secondary.toml \ 123 ${libdir}/sota/sota_secondary.toml \