Merge pull request #313 from advancedtelematic/fix/qa-shipped-files

Review shipped directories in aktualizr recipes

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 58f2fd5..2c0d59f 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 \
                 "