diff options
author | Patrick Vacek <patrickvacek@gmail.com> | 2018-02-14 17:08:52 +0100 |
---|---|---|
committer | Patrick Vacek <patrickvacek@gmail.com> | 2018-02-20 11:01:34 +0100 |
commit | 7bcbb8046672ff66ca7aa0bdf48460d1a11000c3 (patch) | |
tree | 4eee56ef7b41024a1cbdd79647bcdba72ef6de2c /recipes-sota | |
parent | 9a404b4e60c3a9166d98491fed778c64a67150bc (diff) | |
download | meta-updater-7bcbb8046672ff66ca7aa0bdf48460d1a11000c3.tar.gz |
Test that implicit_writer and cert_provider work.
This required setting the LD_LIBRARY_PATH to get some dependencies that
are liable to conflict with the host's normal installation. I adapted
that for the sota_tools tests as well for good measure.
Also, we now actually install cert_provider in the native build.
Diffstat (limited to 'recipes-sota')
-rw-r--r-- | recipes-sota/aktualizr/aktualizr_git.bb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index 0194dbb..bcc1438 100644 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb | |||
@@ -37,10 +37,10 @@ EXTRA_OECMAKE_append_class-target = " -DBUILD_OSTREE=ON -DBUILD_ISOTP=ON ${@bb.u | |||
37 | EXTRA_OECMAKE_append_class-native = " -DBUILD_SOTA_TOOLS=ON -DBUILD_OSTREE=OFF " | 37 | EXTRA_OECMAKE_append_class-native = " -DBUILD_SOTA_TOOLS=ON -DBUILD_OSTREE=OFF " |
38 | 38 | ||
39 | do_install_append () { | 39 | do_install_append () { |
40 | rm -f ${D}${bindir}/aktualizr_cert_provider | ||
41 | rm -fr ${D}${libdir}/systemd | 40 | rm -fr ${D}${libdir}/systemd |
42 | } | 41 | } |
43 | do_install_append_class-target () { | 42 | do_install_append_class-target () { |
43 | rm -f ${D}${bindir}/aktualizr_cert_provider | ||
44 | rm -f ${D}${bindir}/aktualizr_implicit_writer | 44 | rm -f ${D}${bindir}/aktualizr_implicit_writer |
45 | rm -f ${D}${libdir}/sota/sota.toml | 45 | rm -f ${D}${libdir}/sota/sota.toml |
46 | ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'secondary-example', '', 'rm -f ${D}${bindir}/example-interface', d)} | 46 | ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'secondary-example', '', 'rm -f ${D}${bindir}/example-interface', d)} |
@@ -76,6 +76,7 @@ FILES_${PN}_class-target = " \ | |||
76 | FILES_${PN}_append_class-target = " ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'secondary-example', ' ${bindir}/example-interface', '', d)} " | 76 | FILES_${PN}_append_class-target = " ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'secondary-example', ' ${bindir}/example-interface', '', d)} " |
77 | FILES_${PN}_append_class-target = " ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'secondary-isotp-example', ' ${bindir}/isotp-test-interface', '', d)} " | 77 | FILES_${PN}_append_class-target = " ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'secondary-isotp-example', ' ${bindir}/isotp-test-interface', '', d)} " |
78 | FILES_${PN}_class-native = " \ | 78 | FILES_${PN}_class-native = " \ |
79 | ${bindir}/aktualizr_cert_provider \ | ||
79 | ${bindir}/aktualizr_implicit_writer \ | 80 | ${bindir}/aktualizr_implicit_writer \ |
80 | ${bindir}/garage-deploy \ | 81 | ${bindir}/garage-deploy \ |
81 | ${bindir}/garage-push \ | 82 | ${bindir}/garage-push \ |