diff options
author | Patrick Vacek <patrickvacek@gmail.com> | 2018-02-27 15:19:11 +0100 |
---|---|---|
committer | Patrick Vacek <patrickvacek@gmail.com> | 2018-02-27 15:23:03 +0100 |
commit | 7af1246236624d607df7f9a261396efc4566f625 (patch) | |
tree | 274afbe79e926b1f76d1b1d9ec1bfdc7e7639f7e /recipes-sota/aktualizr | |
parent | 5b298ba8726cc7bb4fb894dc0a274695bed54925 (diff) | |
parent | 4b4fb87a79c7b6c6d787e9152758401ddf86485a (diff) | |
download | meta-updater-7af1246236624d607df7f9a261396efc4566f625.tar.gz |
Merge remote-tracking branch 'ats/pyro' into test/PRO-4481/hsm-rocko
Bring in updates to oe-selftest.
Diffstat (limited to 'recipes-sota/aktualizr')
-rw-r--r-- | recipes-sota/aktualizr/aktualizr_git.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index a453ba2..4c4e975 100644 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb | |||
@@ -10,7 +10,6 @@ DEPENDS_append_class-target = "ostree ${@bb.utils.contains('SOTA_CLIENT_FEATURES | |||
10 | DEPENDS_append_class-native = "glib-2.0-native " | 10 | DEPENDS_append_class-native = "glib-2.0-native " |
11 | 11 | ||
12 | RDEPENDS_${PN}_class-target = "lshw " | 12 | RDEPENDS_${PN}_class-target = "lshw " |
13 | RDEPENDS_${PN}_append_class-target = "${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm', ' engine-pkcs11', '', d)} " | ||
14 | 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)} " |
15 | 14 | ||
16 | PV = "1.0+git${SRCPV}" | 15 | PV = "1.0+git${SRCPV}" |
@@ -41,9 +40,9 @@ do_install_append () { | |||
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 | rm -f ${D}${bindir}/aktualizr_cert_provider | ||
47 | ${@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)} |
48 | ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'secondary-isotp-example', '', 'rm -f ${D}${bindir}/isotp-test-interface', d)} | 47 | ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'secondary-isotp-example', '', 'rm -f ${D}${bindir}/isotp-test-interface', d)} |
49 | 48 | ||
@@ -79,6 +78,7 @@ FILES_${PN}_class-target = " \ | |||
79 | FILES_${PN}_append_class-target = " ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'secondary-example', ' ${bindir}/example-interface', '', d)} " | 78 | FILES_${PN}_append_class-target = " ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'secondary-example', ' ${bindir}/example-interface', '', d)} " |
80 | FILES_${PN}_append_class-target = " ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'secondary-isotp-example', ' ${bindir}/isotp-test-interface', '', d)} " | 79 | FILES_${PN}_append_class-target = " ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'secondary-isotp-example', ' ${bindir}/isotp-test-interface', '', d)} " |
81 | FILES_${PN}_class-native = " \ | 80 | FILES_${PN}_class-native = " \ |
81 | ${bindir}/aktualizr_cert_provider \ | ||
82 | ${bindir}/aktualizr_implicit_writer \ | 82 | ${bindir}/aktualizr_implicit_writer \ |
83 | ${bindir}/garage-deploy \ | 83 | ${bindir}/garage-deploy \ |
84 | ${bindir}/garage-push \ | 84 | ${bindir}/garage-push \ |