diff options
author | Phil Wise <phil@advancedtelematic.com> | 2018-06-15 09:48:32 +0200 |
---|---|---|
committer | Patrick Vacek <patrickvacek@gmail.com> | 2018-06-19 14:27:44 +0200 |
commit | 4a909cd7d21800f9514fe0c399b671fbf075dd3c (patch) | |
tree | 0942ad96d80fb31bb65a0217fa681228036af9d8 /recipes-sota/aktualizr | |
parent | 095c6c3efca58eff071868a9d1a8b65ac98d8063 (diff) | |
download | meta-updater-4a909cd7d21800f9514fe0c399b671fbf075dd3c.tar.gz |
aktualizr: support check-discovery and fix secondary tests.
Cherry-pick of 78422f6ca6e5cca90e33ad49aa1b39bb25c527b3 from master. Original
commit message follows:
Compatibility with latest aktualizr
Note that the HsmTests still sometimes fail
Diffstat (limited to 'recipes-sota/aktualizr')
-rwxr-xr-x | recipes-sota/aktualizr/aktualizr_git.bb | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index f2c01d4..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 " | |||
13 | RDEPENDS_${PN}_append_class-target = "${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'serialcan', ' slcand-start', '', d)} " | 13 | RDEPENDS_${PN}_append_class-target = "${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'serialcan', ' slcand-start', '', d)} " |
14 | RDEPENDS_${PN}_append_class-target = "${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm', ' softhsm softhsm-testtoken', '', d)}" | 14 | RDEPENDS_${PN}_append_class-target = "${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm', ' softhsm softhsm-testtoken', '', d)}" |
15 | 15 | ||
16 | RDEPENDS_${PN}_append_class-target = " ${PN}-tools " | ||
17 | RDEPENDS_${PN}-secondary_append_class-target = " ${PN}-tools " | ||
18 | |||
16 | PV = "1.0+git${SRCPV}" | 19 | PV = "1.0+git${SRCPV}" |
17 | PR = "7" | 20 | PR = "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 | " |
26 | SRCREV = "17c2eea66ebddbf47a37d66df7a0441225bd0db6" | 29 | SRCREV = "9f538a8a411ca917184fe11a6cf92e5ebf9efc61" |
27 | BRANCH ?= "master" | 30 | BRANCH ?= "master" |
28 | 31 | ||
29 | S = "${WORKDIR}/git" | 32 | S = "${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 | ||
84 | PACKAGES =+ " ${PN}-examples ${PN}-host-tools ${PN}-secondary " | 87 | PACKAGES =+ " ${PN}-examples ${PN}-host-tools ${PN}-tools ${PN}-secondary " |
85 | 88 | ||
86 | FILES_${PN} = " \ | 89 | FILES_${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 | ||
117 | FILES_${PN}-tools = " \ | ||
118 | ${bindir}/aktualizr-check-discovery \ | ||
119 | " | ||
120 | |||
114 | FILES_${PN}-secondary = " \ | 121 | FILES_${PN}-secondary = " \ |
115 | ${bindir}/aktualizr-secondary \ | 122 | ${bindir}/aktualizr-secondary \ |
116 | ${libdir}/sota/sota_secondary.toml \ | 123 | ${libdir}/sota/sota_secondary.toml \ |