diff options
author | Phil Wise <phil@advancedtelematic.com> | 2018-06-15 09:48:32 +0200 |
---|---|---|
committer | Patrick Vacek <patrickvacek@gmail.com> | 2018-07-02 10:51:03 +0200 |
commit | 4067c543901526d1d039ba97af6550de48b5b423 (patch) | |
tree | f1bce75b3840b4612259f3745a7f041526fd9228 /recipes-sota/aktualizr | |
parent | 045ab4d6b4eb58c34a80786736bb802d0d95a18d (diff) | |
download | meta-updater-4067c543901526d1d039ba97af6550de48b5b423.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 | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index a2d03f2..a6e7dd2 100755 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb | |||
@@ -15,6 +15,9 @@ RDEPENDS_${PN}_append_class-target = "${@bb.utils.contains('SOTA_CLIENT_FEATURES | |||
15 | RDEPENDS_${PN}_append_class-target = " ${@oe.utils.ifelse(d.getVar('OSTREE_BOOTLOADER', True) == 'u-boot', 'u-boot-fw-utils', '')}" | 15 | RDEPENDS_${PN}_append_class-target = " ${@oe.utils.ifelse(d.getVar('OSTREE_BOOTLOADER', True) == 'u-boot', 'u-boot-fw-utils', '')}" |
16 | RDEPENDS_${PN}_append_class-target = " ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'ubootenv', ' aktualizr-uboot-env-rollback', '', d)} " | 16 | RDEPENDS_${PN}_append_class-target = " ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'ubootenv', ' aktualizr-uboot-env-rollback', '', d)} " |
17 | 17 | ||
18 | RDEPENDS_${PN}_append_class-target = " ${PN}-tools " | ||
19 | RDEPENDS_${PN}-secondary_append_class-target = " ${PN}-tools " | ||
20 | |||
18 | PV = "1.0+git${SRCPV}" | 21 | PV = "1.0+git${SRCPV}" |
19 | PR = "7" | 22 | PR = "7" |
20 | 23 | ||
@@ -85,7 +88,7 @@ do_install_append_class-native () { | |||
85 | install -m 0644 ${B}/src/sota_tools/garage-sign/lib/* ${D}${libdir} | 88 | install -m 0644 ${B}/src/sota_tools/garage-sign/lib/* ${D}${libdir} |
86 | } | 89 | } |
87 | 90 | ||
88 | PACKAGES =+ " ${PN}-examples ${PN}-host-tools ${PN}-secondary " | 91 | PACKAGES =+ " ${PN}-examples ${PN}-host-tools ${PN}-tools ${PN}-secondary " |
89 | 92 | ||
90 | FILES_${PN} = " \ | 93 | FILES_${PN} = " \ |
91 | ${bindir}/aktualizr \ | 94 | ${bindir}/aktualizr \ |
@@ -116,6 +119,10 @@ FILES_${PN}-host-tools = " \ | |||
116 | ${libdir}/sota/sota_uboot_env.toml \ | 119 | ${libdir}/sota/sota_uboot_env.toml \ |
117 | " | 120 | " |
118 | 121 | ||
122 | FILES_${PN}-tools = " \ | ||
123 | ${bindir}/aktualizr-check-discovery \ | ||
124 | " | ||
125 | |||
119 | FILES_${PN}-secondary = " \ | 126 | FILES_${PN}-secondary = " \ |
120 | ${bindir}/aktualizr-secondary \ | 127 | ${bindir}/aktualizr-secondary \ |
121 | ${libdir}/sota/sota_secondary.toml \ | 128 | ${libdir}/sota/sota_secondary.toml \ |