summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Wise <phil@advancedtelematic.com>2018-02-05 16:36:24 +0100
committerPhil Wise <phil@advancedtelematic.com>2018-02-05 17:10:46 +0100
commit380fcb1cc5d9c773ab440173e7b29f91bfa2c81e (patch)
tree7c19b01e2e9670aae559d734f0f0a93a1ab4c62d
parent2d3e4530c07df2ad0cab16d90ede7f9c482c7022 (diff)
downloadmeta-updater-380fcb1cc5d9c773ab440173e7b29f91bfa2c81e.tar.gz
Remove manual installation of /usr/lib/sota/schemas
As of 6c0dd6c87f4f4027e9b89f9a9e0dc12ef386d39d these are installed with a normal 'make install' (via cmake)
-rw-r--r--recipes-sota/aktualizr/aktualizr_git.bb12
1 files changed, 6 insertions, 6 deletions
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index 3bbedb8..768ec3d 100644
--- a/recipes-sota/aktualizr/aktualizr_git.bb
+++ b/recipes-sota/aktualizr/aktualizr_git.bb
@@ -21,7 +21,7 @@ SRC_URI = " \
21 file://aktualizr.service \ 21 file://aktualizr.service \
22 file://aktualizr-serialcan.service \ 22 file://aktualizr-serialcan.service \
23 " 23 "
24SRCREV = "23eb094a8b3faaac7c0b2a85f902c67804a7d3d3" 24SRCREV = "d861896e7467e3e0cafdd7384ff87c62fe724640"
25BRANCH ?= "master" 25BRANCH ?= "master"
26 26
27S = "${WORKDIR}/git" 27S = "${WORKDIR}/git"
@@ -49,9 +49,6 @@ do_install_append_class-target () {
49 install -d ${D}${systemd_unitdir}/system 49 install -d ${D}${systemd_unitdir}/system
50 aktualizr_service=${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'serialcan', '${WORKDIR}/aktualizr-serialcan.service', '${WORKDIR}/aktualizr.service', d)} 50 aktualizr_service=${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'serialcan', '${WORKDIR}/aktualizr-serialcan.service', '${WORKDIR}/aktualizr.service', d)}
51 install -m 0644 ${aktualizr_service} ${D}${systemd_unitdir}/system/aktualizr.service 51 install -m 0644 ${aktualizr_service} ${D}${systemd_unitdir}/system/aktualizr.service
52
53 install -d ${D}${libdir}/sota/schemas
54 install -m 0755 ${S}/config/storage/* ${D}${libdir}/sota/schemas
55} 52}
56do_install_append_class-native () { 53do_install_append_class-native () {
57 rm -f ${D}${bindir}/aktualizr 54 rm -f ${D}${bindir}/aktualizr
@@ -66,19 +63,22 @@ do_install_append_class-native () {
66 install -m 0644 ${B}/src/sota_tools/garage-sign-prefix/src/garage-sign/lib/* ${D}${libdir} 63 install -m 0644 ${B}/src/sota_tools/garage-sign-prefix/src/garage-sign/lib/* ${D}${libdir}
67} 64}
68 65
66FILES_${PN}_append = " \
67 ${libdir}/sota \
68 "
69
69FILES_${PN}_class-target = " \ 70FILES_${PN}_class-target = " \
70 ${bindir}/aktualizr \ 71 ${bindir}/aktualizr \
71 ${bindir}/aktualizr-info \ 72 ${bindir}/aktualizr-info \
72 ${systemd_unitdir}/system/aktualizr.service \ 73 ${systemd_unitdir}/system/aktualizr.service \
73 ${libdir}/sota/schemas \
74 " 74 "
75
75FILES_${PN}_append_class-target = " ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'secondary-example', ' ${bindir}/example-interface', '', d)} " 76FILES_${PN}_append_class-target = " ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'secondary-example', ' ${bindir}/example-interface', '', d)} "
76FILES_${PN}_append_class-target = " ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'secondary-isotp-example', ' ${bindir}/isotp-test-interface', '', d)} " 77FILES_${PN}_append_class-target = " ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'secondary-isotp-example', ' ${bindir}/isotp-test-interface', '', d)} "
77FILES_${PN}_class-native = " \ 78FILES_${PN}_class-native = " \
78 ${bindir}/aktualizr_implicit_writer \ 79 ${bindir}/aktualizr_implicit_writer \
79 ${bindir}/garage-deploy \ 80 ${bindir}/garage-deploy \
80 ${bindir}/garage-push \ 81 ${bindir}/garage-push \
81 ${libdir}/sota/* \
82 " 82 "
83 83
84# vim:set ts=4 sw=4 sts=4 expandtab: 84# vim:set ts=4 sw=4 sts=4 expandtab: