diff options
author | Laurent Bonnans <laurent.bonnans@here.com> | 2020-01-08 17:07:25 +0100 |
---|---|---|
committer | Patrick Vacek <patrickvacek@gmail.com> | 2020-01-15 11:04:27 +0100 |
commit | 87cf51bbb00678787c3b56f7f19b03ef3b311197 (patch) | |
tree | 1803e7954401965baacae3ee1ca00c864f4442bb | |
parent | 5eb6fafee23fb1639879c9b03c65bf7fd9cc5fd5 (diff) | |
download | meta-updater-87cf51bbb00678787c3b56f7f19b03ef3b311197.tar.gz |
Adapt to shared libraries changes in aktualizr
Signed-off-by: Laurent Bonnans <laurent.bonnans@here.com>
-rw-r--r-- | recipes-sota/aktualizr/aktualizr_git.bb | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index 4cc1a37..7771d47 100644 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=815ca599c9df247a0c7f619bab123dad" | |||
7 | 7 | ||
8 | DEPENDS = "boost curl openssl libarchive libsodium sqlite3 asn1c-native" | 8 | DEPENDS = "boost curl openssl libarchive libsodium sqlite3 asn1c-native" |
9 | DEPENDS_append = "${@bb.utils.contains('PTEST_ENABLED', '1', ' coreutils-native net-tools-native ostree-native aktualizr-native ', '', d)}" | 9 | DEPENDS_append = "${@bb.utils.contains('PTEST_ENABLED', '1', ' coreutils-native net-tools-native ostree-native aktualizr-native ', '', d)}" |
10 | RDEPENDS_${PN}_class-target = "aktualizr-configs aktualizr-hwid lshw" | 10 | RDEPENDS_${PN}_class-target = "${PN}-configs ${PN}-hwid lshw" |
11 | RDEPENDS_${PN}-host-tools = "aktualizr aktualizr-cert-provider ${@bb.utils.contains('PACKAGECONFIG', 'sota-tools', 'garage-deploy garage-push', '', d)}" | 11 | RDEPENDS_${PN}-host-tools = "aktualizr aktualizr-cert-provider ${@bb.utils.contains('PACKAGECONFIG', 'sota-tools', 'garage-deploy garage-push', '', d)}" |
12 | 12 | ||
13 | RDEPENDS_${PN}-ptest += "bash cmake curl python3-misc python3-modules openssl-bin sqlite3 valgrind" | 13 | RDEPENDS_${PN}-ptest += "bash cmake curl python3-misc python3-modules openssl-bin sqlite3 valgrind" |
@@ -30,7 +30,7 @@ SRC_URI = " \ | |||
30 | SRC_URI[garagesign.md5sum] = "3e1ae6d49cc66fda37cef47f849d9609" | 30 | SRC_URI[garagesign.md5sum] = "3e1ae6d49cc66fda37cef47f849d9609" |
31 | SRC_URI[garagesign.sha256sum] = "8d49b83efa222db2f092ee14348459ee1bfd048552b57c3cb5ab48db8e347d82" | 31 | SRC_URI[garagesign.sha256sum] = "8d49b83efa222db2f092ee14348459ee1bfd048552b57c3cb5ab48db8e347d82" |
32 | 32 | ||
33 | SRCREV = "6633d0d0e6353fdf8970001dc8da70e6a28203cd" | 33 | SRCREV = "bc54d32b8d4e97409908e700b9615fef2ca7ced2" |
34 | BRANCH ?= "master" | 34 | BRANCH ?= "master" |
35 | 35 | ||
36 | S = "${WORKDIR}/git" | 36 | S = "${WORKDIR}/git" |
@@ -140,7 +140,7 @@ python split_hosttools_packages () { | |||
140 | 140 | ||
141 | PACKAGES_DYNAMIC = "^aktualizr-.* ^garage-.*" | 141 | PACKAGES_DYNAMIC = "^aktualizr-.* ^garage-.*" |
142 | 142 | ||
143 | PACKAGES =+ "${PN}-resource-control ${PN}-examples ${PN}-secondary ${PN}-configs ${PN}-host-tools" | 143 | PACKAGES =+ "${PN}-host-tools ${PN}-lib ${PN}-resource-control ${PN}-configs ${PN}-examples ${PN}-secondary ${PN}-secondary-lib ${PN}-sotatools-lib" |
144 | 144 | ||
145 | ALLOW_EMPTY_${PN}-host-tools = "1" | 145 | ALLOW_EMPTY_${PN}-host-tools = "1" |
146 | 146 | ||
@@ -150,6 +150,10 @@ FILES_${PN} = " \ | |||
150 | ${systemd_unitdir}/system/aktualizr.service \ | 150 | ${systemd_unitdir}/system/aktualizr.service \ |
151 | " | 151 | " |
152 | 152 | ||
153 | FILES_${PN}-lib = " \ | ||
154 | ${libdir}/libaktualizr_lib.so \ | ||
155 | " | ||
156 | |||
153 | FILES_${PN}-resource-control = " \ | 157 | FILES_${PN}-resource-control = " \ |
154 | ${systemd_system_unitdir}/aktualizr.service.d/10-resource-control.conf \ | 158 | ${systemd_system_unitdir}/aktualizr.service.d/10-resource-control.conf \ |
155 | " | 159 | " |
@@ -169,6 +173,16 @@ FILES_${PN}-secondary = " \ | |||
169 | ${systemd_unitdir}/system/aktualizr-secondary.service \ | 173 | ${systemd_unitdir}/system/aktualizr-secondary.service \ |
170 | " | 174 | " |
171 | 175 | ||
176 | FILES_${PN}-secondary-lib = " \ | ||
177 | ${libdir}/libaktualizr_secondary_lib.so \ | ||
178 | " | ||
179 | |||
180 | FILES_${PN}-sotatools-lib = " \ | ||
181 | ${libdir}/libsota_tools_lib.so \ | ||
182 | " | ||
183 | |||
184 | FILES_${PN}-dev = "" | ||
185 | |||
172 | BBCLASSEXTEND = "native" | 186 | BBCLASSEXTEND = "native" |
173 | 187 | ||
174 | # vim:set ts=4 sw=4 sts=4 expandtab: | 188 | # vim:set ts=4 sw=4 sts=4 expandtab: |