From 9c610430a3b94d3f881458b7b01133c9705d8d6b Mon Sep 17 00:00:00 2001
From: Patrick Vacek <patrickvacek@gmail.com>
Date: Wed, 9 May 2018 11:57:42 +0200
Subject: Put extra configs in their own files.

This is more reliable and readable than just dumping things with echo. Plus it
is easier for setting permissions, and it fixes some obscure problem with line
endings that only happens on shovel.
---
 recipes-sota/config/aktualizr-disable-send-ip.bb    | 3 ++-
 recipes-sota/config/aktualizr-example-interface.bb  | 3 ++-
 recipes-sota/config/aktualizr-log-debug.bb          | 3 ++-
 recipes-sota/config/files/30-disable-send-ip.toml   | 2 ++
 recipes-sota/config/files/30-example-interface.toml | 2 ++
 recipes-sota/config/files/90-log-debug.toml         | 2 ++
 6 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 recipes-sota/config/files/30-disable-send-ip.toml
 create mode 100644 recipes-sota/config/files/30-example-interface.toml
 create mode 100644 recipes-sota/config/files/90-log-debug.toml

diff --git a/recipes-sota/config/aktualizr-disable-send-ip.bb b/recipes-sota/config/aktualizr-disable-send-ip.bb
index ce492e9..cab7696 100644
--- a/recipes-sota/config/aktualizr-disable-send-ip.bb
+++ b/recipes-sota/config/aktualizr-disable-send-ip.bb
@@ -7,11 +7,12 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=9741c346eef56131163e13b9db1241
 
 SRC_URI = " \
             file://LICENSE \
+            file://30-disable-send-ip.toml \
             "
 
 do_install_append () {
     install -m 0700 -d ${D}${libdir}/sota/conf.d
-    echo "[telemetry]\nreport_network = false\n" > ${D}${libdir}/sota/conf.d/30-disable-send-ip.toml
+    install -m 0644 ${WORKDIR}/30-disable-send-ip.toml ${D}${libdir}/sota/conf.d/30-disable-send-ip.toml
 }
 
 FILES_${PN} = " \
diff --git a/recipes-sota/config/aktualizr-example-interface.bb b/recipes-sota/config/aktualizr-example-interface.bb
index 52ebe1c..37a9184 100644
--- a/recipes-sota/config/aktualizr-example-interface.bb
+++ b/recipes-sota/config/aktualizr-example-interface.bb
@@ -7,11 +7,12 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=9741c346eef56131163e13b9db1241
 
 SRC_URI = " \
             file://LICENSE \
+            file://30-example-interface.toml \
             "
 
 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/30-example-interface.toml
+    install -m 0644 ${WORKDIR}/30-example-interface.toml ${D}${libdir}/sota/conf.d/30-example-interface.toml
 }
 
 FILES_${PN} = " \
diff --git a/recipes-sota/config/aktualizr-log-debug.bb b/recipes-sota/config/aktualizr-log-debug.bb
index e32a414..5cfd198 100644
--- a/recipes-sota/config/aktualizr-log-debug.bb
+++ b/recipes-sota/config/aktualizr-log-debug.bb
@@ -7,11 +7,12 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=9741c346eef56131163e13b9db1241
 
 SRC_URI = " \
             file://LICENSE \
+            file://90-log-debug.toml \
             "
 
 do_install_append () {
     install -m 0700 -d ${D}${libdir}/sota/conf.d
-    echo "[logger]\nloglevel = 0\n" > ${D}${libdir}/sota/conf.d/90-log-debug.toml
+    install -m 0644 ${WORKDIR}/90-log-debug.toml ${D}${libdir}/sota/conf.d/90-log-debug.toml
 }
 
 FILES_${PN} = " \
diff --git a/recipes-sota/config/files/30-disable-send-ip.toml b/recipes-sota/config/files/30-disable-send-ip.toml
new file mode 100644
index 0000000..5cd5108
--- /dev/null
+++ b/recipes-sota/config/files/30-disable-send-ip.toml
@@ -0,0 +1,2 @@
+[telemetry]
+report_network = false
diff --git a/recipes-sota/config/files/30-example-interface.toml b/recipes-sota/config/files/30-example-interface.toml
new file mode 100644
index 0000000..fc4e9ec
--- /dev/null
+++ b/recipes-sota/config/files/30-example-interface.toml
@@ -0,0 +1,2 @@
+[uptane]
+legacy_interface = "/usr/bin/example-interface"
diff --git a/recipes-sota/config/files/90-log-debug.toml b/recipes-sota/config/files/90-log-debug.toml
new file mode 100644
index 0000000..100a146
--- /dev/null
+++ b/recipes-sota/config/files/90-log-debug.toml
@@ -0,0 +1,2 @@
+[logger]
+loglevel = 0
-- 
cgit v1.2.3-54-g00ecf