From e827d33de0135b3c924061aa3fa05ac52e88fe89 Mon Sep 17 00:00:00 2001 From: Laurent Bonnans Date: Thu, 17 May 2018 11:30:18 +0200 Subject: Review shipped directories in aktualizr recipes Missing directories in FILES_xx were causing bitbake QA errors on sumo --- recipes-sota/aktualizr/aktualizr-auto-prov.bb | 1 + recipes-sota/aktualizr/aktualizr-ca-implicit-prov.bb | 3 ++- recipes-sota/aktualizr/aktualizr-hsm-prov.bb | 1 + recipes-sota/aktualizr/aktualizr-implicit-prov.bb | 1 + recipes-sota/aktualizr/aktualizr_git.bb | 2 +- 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/recipes-sota/aktualizr/aktualizr-auto-prov.bb b/recipes-sota/aktualizr/aktualizr-auto-prov.bb index 1a42184..8deee7e 100644 --- a/recipes-sota/aktualizr/aktualizr-auto-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-auto-prov.bb @@ -47,6 +47,7 @@ do_install() { } FILES_${PN} = " \ + ${libdir}/sota/conf.d \ ${libdir}/sota/conf.d/20-sota.toml \ ${localstatedir}/sota \ ${localstatedir}/sota/sota_provisioning_credentials.zip \ diff --git a/recipes-sota/aktualizr/aktualizr-ca-implicit-prov.bb b/recipes-sota/aktualizr/aktualizr-ca-implicit-prov.bb index a118dfd..319074e 100644 --- a/recipes-sota/aktualizr/aktualizr-ca-implicit-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-ca-implicit-prov.bb @@ -63,9 +63,10 @@ do_install() { } FILES_${PN} = " \ - ${localstatedir}/sota/* \ + ${libdir}/sota/conf.d \ ${libdir}/sota/conf.d/20-sota.toml \ ${libdir}/sota/root.crt \ + ${localstatedir}/sota/* \ " # vim:set ts=4 sw=4 sts=4 expandtab: diff --git a/recipes-sota/aktualizr/aktualizr-hsm-prov.bb b/recipes-sota/aktualizr/aktualizr-hsm-prov.bb index 290167f..504f0d8 100644 --- a/recipes-sota/aktualizr/aktualizr-hsm-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-hsm-prov.bb @@ -26,6 +26,7 @@ do_install() { } FILES_${PN} = " \ + ${libdir}/sota/conf.d \ ${libdir}/sota/conf.d/20-sota.toml \ " diff --git a/recipes-sota/aktualizr/aktualizr-implicit-prov.bb b/recipes-sota/aktualizr/aktualizr-implicit-prov.bb index 2f9980a..dcfaffb 100644 --- a/recipes-sota/aktualizr/aktualizr-implicit-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-implicit-prov.bb @@ -26,6 +26,7 @@ do_install() { } FILES_${PN} = " \ + ${libdir}/sota/conf.d \ ${libdir}/sota/conf.d/20-sota.toml \ ${libdir}/sota/root.crt \ " diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index 452a128..8ea1e63 100755 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb @@ -86,8 +86,8 @@ FILES_${PN} = " \ ${bindir}/aktualizr \ ${bindir}/aktualizr-info \ ${bindir}/aktualizr-check-discovery \ - ${libdir}/sota/conf.d \ ${systemd_unitdir}/system/aktualizr.service \ + ${libdir}/sota/conf.d \ ${sysconfdir}/sota/conf.d \ " -- cgit v1.2.3-54-g00ecf