summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Bonnans <laurent.bonnans@here.com>2019-05-27 14:25:03 +0200
committerLaurent Bonnans <laurent.bonnans@here.com>2019-05-27 15:45:31 +0200
commit9616f2c908adfb94f4455b219856daf147a41748 (patch)
treed1c6c22fcc86ef0d6c9acae01ad14c781b00c42e
parentdee37f753ab376ead12f2444cc049952c38c6983 (diff)
downloadmeta-updater-9616f2c908adfb94f4455b219856daf147a41748.tar.gz
Add some sample configuration in default local.conffeat/OTA-2578/log-persist
Signed-off-by: Laurent Bonnans <laurent.bonnans@here.com>
-rw-r--r--conf/local.conf.sample.append35
-rwxr-xr-xscripts/envsetup.sh5
2 files changed, 38 insertions, 2 deletions
diff --git a/conf/local.conf.sample.append b/conf/local.conf.sample.append
new file mode 100644
index 0000000..4588ec3
--- /dev/null
+++ b/conf/local.conf.sample.append
@@ -0,0 +1,35 @@
1
2#
3# meta-updater configuration, see README.adoc and aktualizr's
4# documentation for more options and detailed documentation
5#
6
7MACHINE = "##MACHINE##"
8DISTRO = "poky-sota-systemd"
9
10# General SOTA setup
11#SOTA_CLIENT_PROV = "aktualizr-auto-prov"
12#SOTA_PACKED_CREDENTIALS = "/path/to/credentials.zip"
13
14# Uncomment this line to start an ssh server at boot automatically
15#IMAGE_FEATURES += "ssh-server-dropbear"
16
17# Uncomment this line to set the log level of aktualizr to 'debug' (from 'info'
18# by default)
19#IMAGE_INSTALL_append += " aktualizr-log-debug"
20
21# Store systemd logs in persistent storage
22#
23# It greatly helps diagnosing issues on testing devices but should be
24# carefully weighted against file system usage and flash device wear for
25# production systems. Please refer to systemd's docs for more details
26IMAGE_INSTALL_append += " systemd-journald-persistent"
27
28# Set resource limits for aktualizr service
29#
30# Uncomment these lines to change the default parameters.
31#
32#RESOURCE_CPU_WEIGHT_pn-aktualizr = "100"
33#RESOURCE_MEMORY_HIGH_pn-aktualizr = "100M"
34#RESOURCE_MEMORY_MAX_pn-aktualizr = "80%"
35IMAGE_INSTALL_append += " aktualizr-resource-control"
diff --git a/scripts/envsetup.sh b/scripts/envsetup.sh
index ff78681..6103cf6 100755
--- a/scripts/envsetup.sh
+++ b/scripts/envsetup.sh
@@ -25,11 +25,12 @@ METADIR="${SOURCEDIR}/../.."
25 25
26if [[ ! -f "${BUILDDIR}/conf/local.conf" ]]; then 26if [[ ! -f "${BUILDDIR}/conf/local.conf" ]]; then
27 source "$METADIR/poky/oe-init-build-env" "$BUILDDIR" 27 source "$METADIR/poky/oe-init-build-env" "$BUILDDIR"
28
28 echo "METADIR := \"\${@os.path.abspath('${METADIR}')}\"" >> conf/bblayers.conf 29 echo "METADIR := \"\${@os.path.abspath('${METADIR}')}\"" >> conf/bblayers.conf
29 cat "${METADIR}/meta-updater/conf/include/bblayers/sota.inc" >> conf/bblayers.conf 30 cat "${METADIR}/meta-updater/conf/include/bblayers/sota.inc" >> conf/bblayers.conf
30 cat "${METADIR}/meta-updater/conf/include/bblayers/sota_${MACHINE}.inc" >> conf/bblayers.conf 31 cat "${METADIR}/meta-updater/conf/include/bblayers/sota_${MACHINE}.inc" >> conf/bblayers.conf
31 echo "MACHINE = \"${MACHINE}\"" >> conf/local.conf 32
32 echo "DISTRO = \"poky-sota-systemd\"" >> conf/local.conf 33 sed "s/##MACHINE##/$MACHINE/g" "${METADIR}/meta-updater/conf/local.conf.sample.append" >> conf/local.conf
33else 34else
34 source "$METADIR/poky/oe-init-build-env" "$BUILDDIR" 35 source "$METADIR/poky/oe-init-build-env" "$BUILDDIR"
35fi 36fi