Update aktualizr config to use default locations.

Fix permissions, drop explicit aktualizr dependency, put everything in
/usr/lib/sota/conf.d, rename with numeric prefixes to make precedence
more clear.

3 files changed, 6 insertions, 9 deletions

diff --git a/recipes-sota/config/aktualizr-disable-send-ip.bb b/recipes-sota/config/aktualizr-disable-send-ip.bb
index 32c55f3..ce492e9 100644
--- a/recipes-sota/config/aktualizr-disable-send-ip.bb
+++ b/recipes-sota/config/aktualizr-disable-send-ip.bb
@@ -5,18 +5,17 @@ SECTION = "base"
 LICENSE = "MPL-2.0"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=9741c346eef56131163e13b9db1241b3"
 
-DEPENDS = "aktualizr "
 SRC_URI = " \
             file://LICENSE \
             "
 
 do_install_append () {
     install -m 0700 -d ${D}${libdir}/sota/conf.d
-    echo "[telemetry]\nreport_network = false\n" > ${D}${libdir}/sota/conf.d/disable-send-ip.toml
+    echo "[telemetry]\nreport_network = false\n" > ${D}${libdir}/sota/conf.d/30-disable-send-ip.toml
 }
 
 FILES_${PN} = " \
-                ${libdir}/sota/conf.d/disable-send-ip.toml \
+                ${libdir}/sota/conf.d/30-disable-send-ip.toml \
                 "
 
 # vim:set ts=4 sw=4 sts=4 expandtab:
diff --git a/recipes-sota/config/aktualizr-example-interface.bb b/recipes-sota/config/aktualizr-example-interface.bb
index 05f63bf..52ebe1c 100644
--- a/recipes-sota/config/aktualizr-example-interface.bb
+++ b/recipes-sota/config/aktualizr-example-interface.bb
@@ -5,18 +5,17 @@ SECTION = "base"
 LICENSE = "MPL-2.0"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=9741c346eef56131163e13b9db1241b3"
 
-DEPENDS = "aktualizr "
 SRC_URI = " \
             file://LICENSE \
             "
 
 do_install_append () {
     install -m 0700 -d ${D}${libdir}/sota/conf.d
-    echo "[uptane]\nlegacy_interface = \"/usr/bin/example-interface\"\n" > ${D}${libdir}/sota/conf.d/example-interface.toml
+    echo "[uptane]\nlegacy_interface = \"/usr/bin/example-interface\"\n" > ${D}${libdir}/sota/conf.d/30-example-interface.toml
 }
 
 FILES_${PN} = " \
-                ${libdir}/sota/conf.d/example-interface.toml \
+                ${libdir}/sota/conf.d/30-example-interface.toml \
                 "
 
 # vim:set ts=4 sw=4 sts=4 expandtab:
diff --git a/recipes-sota/config/aktualizr-log-debug.bb b/recipes-sota/config/aktualizr-log-debug.bb
index 512599f..e32a414 100644
--- a/recipes-sota/config/aktualizr-log-debug.bb
+++ b/recipes-sota/config/aktualizr-log-debug.bb
@@ -5,18 +5,17 @@ SECTION = "base"
 LICENSE = "MPL-2.0"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=9741c346eef56131163e13b9db1241b3"
 
-DEPENDS = "aktualizr "
 SRC_URI = " \
             file://LICENSE \
             "
 
 do_install_append () {
     install -m 0700 -d ${D}${libdir}/sota/conf.d
-    echo "[logger]\nloglevel = 0\n" > ${D}${libdir}/sota/conf.d/log-debug.toml
+    echo "[logger]\nloglevel = 0\n" > ${D}${libdir}/sota/conf.d/90-log-debug.toml
 }
 
 FILES_${PN} = " \
-                ${libdir}/sota/conf.d/log-debug.toml \
+                ${libdir}/sota/conf.d/90-log-debug.toml \
                 "
 
 # vim:set ts=4 sw=4 sts=4 expandtab: