diff options
author | Patrick Vacek <patrickvacek@gmail.com> | 2017-12-13 15:43:02 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-13 15:43:02 +0100 |
commit | 327acadbeedb40bdbd54d956ccfd4d4ee16db91e (patch) | |
tree | c94543ef88c2638ff1d8693f173b1194af7c7835 | |
parent | bf35f62a28acdf55c3d4b07a5e305255b67edebf (diff) | |
parent | 36c032b7972c42f6f31aeaf8c1dae6c9ce667194 (diff) | |
download | meta-updater-327acadbeedb40bdbd54d956ccfd4d4ee16db91e.tar.gz |
Merge pull request #204 from advancedtelematic/bugfix/example-interface
Properly install example-interface on target and remove it on host.
-rw-r--r-- | recipes-sota/aktualizr/aktualizr_git.bb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index 457abfd..e4ffc5a 100644 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb | |||
@@ -18,7 +18,7 @@ PR = "7" | |||
18 | SRC_URI = " \ | 18 | SRC_URI = " \ |
19 | git://github.com/advancedtelematic/aktualizr;branch=${BRANCH} \ | 19 | git://github.com/advancedtelematic/aktualizr;branch=${BRANCH} \ |
20 | " | 20 | " |
21 | SRCREV = "57e9cdb8aa1e8ee9e682628bd67031d9be7aaafa" | 21 | SRCREV = "5bf2975aee4af667a1af17381bf68c34a00f03a3" |
22 | BRANCH ?= "master" | 22 | BRANCH ?= "master" |
23 | 23 | ||
24 | S = "${WORKDIR}/git" | 24 | S = "${WORKDIR}/git" |
@@ -36,10 +36,12 @@ do_install_append () { | |||
36 | } | 36 | } |
37 | do_install_append_class-target () { | 37 | do_install_append_class-target () { |
38 | rm -f ${D}${bindir}/aktualizr_implicit_writer | 38 | rm -f ${D}${bindir}/aktualizr_implicit_writer |
39 | ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'secondary-example', '', 'rm -f ${D}${bindir}/example-interface', d)} | ||
39 | } | 40 | } |
40 | do_install_append_class-native () { | 41 | do_install_append_class-native () { |
41 | rm -f ${D}${bindir}/aktualizr | 42 | rm -f ${D}${bindir}/aktualizr |
42 | rm -f ${D}${bindir}/aktualizr-info | 43 | rm -f ${D}${bindir}/aktualizr-info |
44 | rm -f ${D}${bindir}/example-interface | ||
43 | install -d ${D}${libdir}/sota | 45 | install -d ${D}${libdir}/sota |
44 | install -m 0644 ${S}/config/sota_autoprov.toml ${D}/${libdir}/sota/sota_autoprov.toml | 46 | install -m 0644 ${S}/config/sota_autoprov.toml ${D}/${libdir}/sota/sota_autoprov.toml |
45 | install -m 0644 ${S}/config/sota_hsm_test.toml ${D}/${libdir}/sota/sota_hsm_test.toml | 47 | install -m 0644 ${S}/config/sota_hsm_test.toml ${D}/${libdir}/sota/sota_hsm_test.toml |
@@ -50,6 +52,7 @@ FILES_${PN}_class-target = " \ | |||
50 | ${bindir}/aktualizr \ | 52 | ${bindir}/aktualizr \ |
51 | ${bindir}/aktualizr-info \ | 53 | ${bindir}/aktualizr-info \ |
52 | " | 54 | " |
55 | FILES_${PN}_append_class-target = " ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'secondary-example', '${bindir}/example-interface', '', d)} " | ||
53 | FILES_${PN}_class-native = " \ | 56 | FILES_${PN}_class-native = " \ |
54 | ${bindir}/aktualizr_implicit_writer \ | 57 | ${bindir}/aktualizr_implicit_writer \ |
55 | ${bindir}/garage-deploy \ | 58 | ${bindir}/garage-deploy \ |