From c0c098bbd944c314bca4ad0ec98fe9aca39e3f64 Mon Sep 17 00:00:00 2001 From: Laurent Bonnans Date: Tue, 21 May 2019 14:33:29 +0200 Subject: Remove some ancient recipes Signed-off-by: Laurent Bonnans --- .../python-canonicaljson/python-canonicaljson.bb | 18 ------------------ recipes-support/python-frozendict/python-frozendict.bb | 12 ------------ recipes-support/python-petname/python-petname.bb | 16 ---------------- 3 files changed, 46 deletions(-) delete mode 100644 recipes-support/python-canonicaljson/python-canonicaljson.bb delete mode 100644 recipes-support/python-frozendict/python-frozendict.bb delete mode 100644 recipes-support/python-petname/python-petname.bb diff --git a/recipes-support/python-canonicaljson/python-canonicaljson.bb b/recipes-support/python-canonicaljson/python-canonicaljson.bb deleted file mode 100644 index d8a0728..0000000 --- a/recipes-support/python-canonicaljson/python-canonicaljson.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "python-canonicaljson recipe" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" - -SRCREV = "92e2c06871cc275c2a8b8e3e899141a212aae0e8" -SRC_URI = "git://github.com/matrix-org/python-canonicaljson.git" -S = "${WORKDIR}/git" - -# Generate with: -# git describe --tags | cut -b2- -PV = "1.0.0" -inherit setuptools - -RDEPENDS_${PN} = "\ - python-simplejson \ - python-frozendict \ - " diff --git a/recipes-support/python-frozendict/python-frozendict.bb b/recipes-support/python-frozendict/python-frozendict.bb deleted file mode 100644 index 79fe5c8..0000000 --- a/recipes-support/python-frozendict/python-frozendict.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "python-frozendict recipe" - -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://${S}/LICENSE.txt;md5=f4da037a49c09b456fdbbc7a5bd36132" - -SRCREV = "c5d16bafcca7b72ff3e8f40d3a9081e4c9233f1b" -SRC_URI = "git://github.com/slezica/python-frozendict.git" -S = "${WORKDIR}/git" - -PV = "1.2" -inherit setuptools - diff --git a/recipes-support/python-petname/python-petname.bb b/recipes-support/python-petname/python-petname.bb deleted file mode 100644 index 9abd5d9..0000000 --- a/recipes-support/python-petname/python-petname.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "python-petname recipe" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRCREV = "d0b767cdb1567defb104f29c3fd022239a7f231e" -SRC_URI = "git://github.com/dustinkirkland/python-petname.git" -S = "${WORKDIR}/git" - -PV = "2.2" -inherit setuptools -RDEPENDS_${PN} = " python-setuptools \ - python-argparse \ - " - -FILES_${PN} = "${libdir} ${bindir}/petname" -- cgit v1.2.3-54-g00ecf From dee37f753ab376ead12f2444cc049952c38c6983 Mon Sep 17 00:00:00 2001 From: Laurent Bonnans Date: Tue, 21 May 2019 16:59:59 +0200 Subject: Add example recipe for systemd-journald configuration Signed-off-by: Laurent Bonnans --- .../files/10-persistent-journal.conf | 3 +++ .../systemd-journald-persistent.bb | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 recipes-support/systemd-journald-persistent/files/10-persistent-journal.conf create mode 100644 recipes-support/systemd-journald-persistent/systemd-journald-persistent.bb diff --git a/recipes-support/systemd-journald-persistent/files/10-persistent-journal.conf b/recipes-support/systemd-journald-persistent/files/10-persistent-journal.conf new file mode 100644 index 0000000..a56527c --- /dev/null +++ b/recipes-support/systemd-journald-persistent/files/10-persistent-journal.conf @@ -0,0 +1,3 @@ +[Journal] +Storage=persistent +SystemMaxUse=64M diff --git a/recipes-support/systemd-journald-persistent/systemd-journald-persistent.bb b/recipes-support/systemd-journald-persistent/systemd-journald-persistent.bb new file mode 100644 index 0000000..1715fe1 --- /dev/null +++ b/recipes-support/systemd-journald-persistent/systemd-journald-persistent.bb @@ -0,0 +1,20 @@ +SUMMARY = "Configuration for systemd-journald" +DESCRIPTION = "Provides configuration for systemd-journald, so that logs are \ +stored on persistent storage" +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +SRC_URI_append = " file://10-persistent-journal.conf" +PR = "r1" + +S = "${WORKDIR}" + +FILES_${PN} = "${systemd_unitdir}/journald.conf.d/*" + +do_install() { + install -d ${D}/${systemd_unitdir}/journald.conf.d + install -m 0644 ${WORKDIR}/10-persistent-journal.conf ${D}/${systemd_unitdir}/journald.conf.d +} + -- cgit v1.2.3-54-g00ecf From 9616f2c908adfb94f4455b219856daf147a41748 Mon Sep 17 00:00:00 2001 From: Laurent Bonnans Date: Mon, 27 May 2019 14:25:03 +0200 Subject: Add some sample configuration in default local.conf Signed-off-by: Laurent Bonnans --- conf/local.conf.sample.append | 35 +++++++++++++++++++++++++++++++++++ scripts/envsetup.sh | 5 +++-- 2 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 conf/local.conf.sample.append 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 @@ + +# +# meta-updater configuration, see README.adoc and aktualizr's +# documentation for more options and detailed documentation +# + +MACHINE = "##MACHINE##" +DISTRO = "poky-sota-systemd" + +# General SOTA setup +#SOTA_CLIENT_PROV = "aktualizr-auto-prov" +#SOTA_PACKED_CREDENTIALS = "/path/to/credentials.zip" + +# Uncomment this line to start an ssh server at boot automatically +#IMAGE_FEATURES += "ssh-server-dropbear" + +# Uncomment this line to set the log level of aktualizr to 'debug' (from 'info' +# by default) +#IMAGE_INSTALL_append += " aktualizr-log-debug" + +# Store systemd logs in persistent storage +# +# It greatly helps diagnosing issues on testing devices but should be +# carefully weighted against file system usage and flash device wear for +# production systems. Please refer to systemd's docs for more details +IMAGE_INSTALL_append += " systemd-journald-persistent" + +# Set resource limits for aktualizr service +# +# Uncomment these lines to change the default parameters. +# +#RESOURCE_CPU_WEIGHT_pn-aktualizr = "100" +#RESOURCE_MEMORY_HIGH_pn-aktualizr = "100M" +#RESOURCE_MEMORY_MAX_pn-aktualizr = "80%" +IMAGE_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}/../.." if [[ ! -f "${BUILDDIR}/conf/local.conf" ]]; then source "$METADIR/poky/oe-init-build-env" "$BUILDDIR" + echo "METADIR := \"\${@os.path.abspath('${METADIR}')}\"" >> conf/bblayers.conf cat "${METADIR}/meta-updater/conf/include/bblayers/sota.inc" >> conf/bblayers.conf cat "${METADIR}/meta-updater/conf/include/bblayers/sota_${MACHINE}.inc" >> conf/bblayers.conf - echo "MACHINE = \"${MACHINE}\"" >> conf/local.conf - echo "DISTRO = \"poky-sota-systemd\"" >> conf/local.conf + + sed "s/##MACHINE##/$MACHINE/g" "${METADIR}/meta-updater/conf/local.conf.sample.append" >> conf/local.conf else source "$METADIR/poky/oe-init-build-env" "$BUILDDIR" fi -- cgit v1.2.3-54-g00ecf