summaryrefslogtreecommitdiffstats
path: root/recipes-sota
diff options
context:
space:
mode:
authorPatrick Vacek <patrickvacek@gmail.com>2020-06-23 09:48:49 +0200
committerPatrick Vacek <patrickvacek@gmail.com>2020-06-23 13:00:17 +0200
commit3bb866358f738ba52b180e29715dc0ca888e4c3e (patch)
treec9a83f00d463beabfc4f7e4749be77be525b51c7 /recipes-sota
parentcd27c8baa28c406e456c5d1dba2d790e414066bb (diff)
downloadmeta-updater-3bb866358f738ba52b180e29715dc0ca888e4c3e.tar.gz
Put aktualizr-info in a separate package and use it in Secondaries.feat/secondary-aktualizr-info
We did the work a while ago to make aktualizr-info work for Secondaries, but until now we weren't putting the tool into the secondary-image we use for testing. Now it's there. Actually, it's in every image that inherits from sota.bbclass, which is probably a good thing. Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
Diffstat (limited to 'recipes-sota')
-rw-r--r--recipes-sota/aktualizr/aktualizr_git.bb12
1 files changed, 7 insertions, 5 deletions
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index 4f32887..d77655d 100644
--- a/recipes-sota/aktualizr/aktualizr_git.bb
+++ b/recipes-sota/aktualizr/aktualizr_git.bb
@@ -132,23 +132,25 @@ PACKAGESPLITFUNCS_prepend = "split_hosttools_packages "
132python split_hosttools_packages () { 132python split_hosttools_packages () {
133 bindir = d.getVar('bindir') 133 bindir = d.getVar('bindir')
134 134
135 # Split all binaries to their own packages except aktualizr-info, 135 # Split all binaries to their own packages.
136 # aktualizr-info should stay in main package aktualizr. 136 do_split_packages(d, bindir, '^(.*)$', '%s', 'Aktualizr tool - %s', extra_depends='aktualizr-configs', prepend=False)
137 do_split_packages(d, bindir, r'^((?!(aktualizr-info)).*)$', '%s', 'Aktualizr tool - %s', extra_depends='aktualizr-configs', prepend=False)
138} 137}
139 138
140PACKAGES_DYNAMIC = "^aktualizr-.* ^garage-.*" 139PACKAGES_DYNAMIC = "^aktualizr-.* ^garage-.*"
141 140
142PACKAGES =+ "${PN}-host-tools ${PN}-lib ${PN}-resource-control ${PN}-configs ${PN}-secondary ${PN}-secondary-lib ${PN}-sotatools-lib" 141PACKAGES =+ "${PN}-host-tools ${PN}-info ${PN}-lib ${PN}-resource-control ${PN}-configs ${PN}-secondary ${PN}-secondary-lib ${PN}-sotatools-lib"
143 142
144ALLOW_EMPTY_${PN}-host-tools = "1" 143ALLOW_EMPTY_${PN}-host-tools = "1"
145 144
146FILES_${PN} = " \ 145FILES_${PN} = " \
147 ${bindir}/aktualizr \ 146 ${bindir}/aktualizr \
148 ${bindir}/aktualizr-info \
149 ${systemd_unitdir}/system/aktualizr.service \ 147 ${systemd_unitdir}/system/aktualizr.service \
150 " 148 "
151 149
150FILES_${PN}-info = " \
151 ${bindir}/aktualizr-info \
152 "
153
152FILES_${PN}-lib = " \ 154FILES_${PN}-lib = " \
153 ${libdir}/libaktualizr.so \ 155 ${libdir}/libaktualizr.so \
154 " 156 "