From f01b2b06c6fb76cd5d83f5e23643a399d7f41606 Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Thu, 3 May 2018 12:22:52 +0200 Subject: 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. --- recipes-sota/aktualizr/aktualizr-auto-prov.bb | 8 ++++---- recipes-sota/aktualizr/aktualizr-ca-implicit-prov.bb | 11 +++++------ recipes-sota/aktualizr/aktualizr-hsm-prov.bb | 6 +++--- recipes-sota/aktualizr/aktualizr-implicit-prov.bb | 6 +++--- recipes-sota/aktualizr/aktualizr_git.bb | 10 ++++++---- recipes-sota/aktualizr/environment.inc | 3 +-- recipes-sota/config/aktualizr-disable-send-ip.bb | 5 ++--- recipes-sota/config/aktualizr-example-interface.bb | 5 ++--- recipes-sota/config/aktualizr-log-debug.bb | 5 ++--- 9 files changed, 28 insertions(+), 31 deletions(-) (limited to 'recipes-sota') diff --git a/recipes-sota/aktualizr/aktualizr-auto-prov.bb b/recipes-sota/aktualizr/aktualizr-auto-prov.bb index 6b17114..1a42184 100644 --- a/recipes-sota/aktualizr/aktualizr-auto-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-auto-prov.bb @@ -30,12 +30,12 @@ do_install() { bbwarn "OSTREE_PUSH_CREDENTIALS is ignored. Please use SOTA_PACKED_CREDENTIALS" fi - install -d ${D}${libdir}/sota - install -d ${D}${localstatedir}/sota + install -m 0700 -d ${D}${libdir}/sota/conf.d + install -m 0700 -d ${D}${localstatedir}/sota if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then aktualizr_toml=${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'secondary-network', 'sota_autoprov_primary.toml', 'sota_autoprov.toml', d)} - install -m 0644 ${STAGING_DIR_NATIVE}${libdir}/sota/${aktualizr_toml} ${D}${libdir}/sota/sota.toml + install -m 0644 ${STAGING_DIR_NATIVE}${libdir}/sota/${aktualizr_toml} ${D}${libdir}/sota/conf.d/20-sota.toml # deploy SOTA credentials if [ -e ${SOTA_PACKED_CREDENTIALS} ]; then @@ -47,7 +47,7 @@ do_install() { } FILES_${PN} = " \ - ${libdir}/sota/sota.toml \ + ${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 51e313d..a118dfd 100644 --- a/recipes-sota/aktualizr/aktualizr-ca-implicit-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-ca-implicit-prov.bb @@ -26,7 +26,7 @@ export SOTA_CACERT_PATH export SOTA_CAKEY_PATH do_install() { - install -d ${D}${libdir}/sota + install -m 0700 -d ${D}${libdir}/sota/conf.d if [ -z "${SOTA_PACKED_CREDENTIALS}" ]; then bberror "SOTA_PACKED_CREDENTIALS are required for implicit provisioning" @@ -51,21 +51,20 @@ do_install() { bberror "SOTA_CAKEY_PATH should be set when using implicit provisioning" fi - install -d ${D}${libdir}/sota - install -d ${D}${localstatedir}/sota - install -m 0644 ${STAGING_DIR_NATIVE}${libdir}/sota/sota_implicit_prov_ca.toml ${D}${libdir}/sota/sota.toml + install -m 0700 -d ${D}${localstatedir}/sota + install -m 0644 ${STAGING_DIR_NATIVE}${libdir}/sota/sota_implicit_prov_ca.toml ${D}${libdir}/sota/conf.d/20-sota.toml aktualizr_cert_provider --credentials ${SOTA_PACKED_CREDENTIALS} \ --device-ca ${SOTA_CACERT_PATH} \ --device-ca-key ${SOTA_CAKEY_PATH} \ --root-ca \ --server-url \ --local ${D}${localstatedir}/sota \ - --config ${D}${libdir}/sota/sota.toml + --config ${D}${libdir}/sota/conf.d/20-sota.toml } FILES_${PN} = " \ ${localstatedir}/sota/* \ - ${libdir}/sota/sota.toml \ + ${libdir}/sota/conf.d/20-sota.toml \ ${libdir}/sota/root.crt \ " diff --git a/recipes-sota/aktualizr/aktualizr-hsm-prov.bb b/recipes-sota/aktualizr/aktualizr-hsm-prov.bb index 5f8da3c..290167f 100644 --- a/recipes-sota/aktualizr/aktualizr-hsm-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-hsm-prov.bb @@ -18,15 +18,15 @@ require environment.inc require credentials.inc do_install() { - install -d ${D}${libdir}/sota + install -m 0700 -d ${D}${libdir}/sota/conf.d if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then aktualizr_implicit_writer -c ${SOTA_PACKED_CREDENTIALS} --no-root-ca \ - -i ${STAGING_DIR_NATIVE}${libdir}/sota/sota_hsm_prov.toml -o ${D}${libdir}/sota/sota.toml -p ${D} + -i ${STAGING_DIR_NATIVE}${libdir}/sota/sota_hsm_prov.toml -o ${D}${libdir}/sota/conf.d/20-sota.toml -p ${D} fi } FILES_${PN} = " \ - ${libdir}/sota/sota.toml \ + ${libdir}/sota/conf.d/20-sota.toml \ " # vim:set ts=4 sw=4 sts=4 expandtab: diff --git a/recipes-sota/aktualizr/aktualizr-implicit-prov.bb b/recipes-sota/aktualizr/aktualizr-implicit-prov.bb index cf3d22c..2f9980a 100644 --- a/recipes-sota/aktualizr/aktualizr-implicit-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-implicit-prov.bb @@ -18,15 +18,15 @@ require environment.inc require credentials.inc do_install() { - install -d ${D}${libdir}/sota + install -m 0700 -d ${D}${libdir}/sota/conf.d if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then aktualizr_implicit_writer -c ${SOTA_PACKED_CREDENTIALS} \ - -i ${STAGING_DIR_NATIVE}${libdir}/sota/sota_implicit_prov.toml -o ${D}${libdir}/sota/sota.toml -p ${D} + -i ${STAGING_DIR_NATIVE}${libdir}/sota/sota_implicit_prov.toml -o ${D}${libdir}/sota/conf.d/20-sota.toml -p ${D} fi } FILES_${PN} = " \ - ${libdir}/sota/sota.toml \ + ${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 4c18355..f455013 100644 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb @@ -22,7 +22,7 @@ SRC_URI = " \ file://aktualizr-secondary.socket \ file://aktualizr-serialcan.service \ " -SRCREV = "cbb586efcd5f14a5c6a2c7cf71d75f575bf3d13f" +SRCREV = "5fa9a79f1fb29266c862a9a6cb32082bb77844a5" BRANCH ?= "master" S = "${WORKDIR}/git" @@ -54,21 +54,21 @@ EXTRA_OECMAKE_append_class-native = " -DBUILD_SOTA_TOOLS=ON \ do_install_append () { rm -fr ${D}${libdir}/systemd rm -f ${D}${libdir}/sota/sota.toml # Only needed for the Debian package - install -d ${D}${libdir}/sota + install -m 0700 -d ${D}${libdir}/sota/conf.d install -m 0644 ${S}/config/sota_secondary.toml ${D}/${libdir}/sota/sota_secondary.toml install -d ${D}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/aktualizr-secondary.socket ${D}${systemd_unitdir}/system/aktualizr-secondary.socket install -m 0644 ${WORKDIR}/aktualizr-secondary.service ${D}${systemd_unitdir}/system/aktualizr-secondary.service + install -m 0700 -d ${D}${sysconfdir}/sota/conf.d } do_install_append_class-target () { - install -d ${D}${systemd_unitdir}/system + install -m 0755 -d ${D}${systemd_unitdir}/system aktualizr_service=${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'serialcan', '${WORKDIR}/aktualizr-serialcan.service', '${WORKDIR}/aktualizr.service', d)} install -m 0644 ${aktualizr_service} ${D}${systemd_unitdir}/system/aktualizr.service } do_install_append_class-native () { - install -d ${D}${libdir}/sota install -m 0644 ${S}/config/sota_autoprov.toml ${D}/${libdir}/sota/sota_autoprov.toml install -m 0644 ${S}/config/sota_autoprov_primary.toml ${D}/${libdir}/sota/sota_autoprov_primary.toml install -m 0644 ${S}/config/sota_hsm_prov.toml ${D}/${libdir}/sota/sota_hsm_prov.toml @@ -85,7 +85,9 @@ FILES_${PN} = " \ ${bindir}/aktualizr \ ${bindir}/aktualizr-info \ ${bindir}/aktualizr-check-discovery \ + ${libdir}/sota/conf.d \ ${systemd_unitdir}/system/aktualizr.service \ + ${sysconfdir}/sota/conf.d \ " FILES_${PN}-common = " \ diff --git a/recipes-sota/aktualizr/environment.inc b/recipes-sota/aktualizr/environment.inc index 94806bd..16e789e 100644 --- a/recipes-sota/aktualizr/environment.inc +++ b/recipes-sota/aktualizr/environment.inc @@ -1,12 +1,11 @@ export SOTA_VIRTUAL_SECONDARIES do_install_append() { - AKTUALIZR_PARAMETERS_CONFIGFILE="--config /usr/lib/sota/sota.toml" for sec in ${SOTA_VIRTUAL_SECONDARIES}; do AKTUALIZR_PARAMETERS_VIRTUALSECS="${AKTUALIZR_PARAMETERS_VIRTUALSECS} --secondary-config $sec" done - echo "AKTUALIZR_CMDLINE_PARAMETERS=${AKTUALIZR_PARAMETERS_CONFIGFILE} ${AKTUALIZR_PARAMETERS_VIRTUALSECS}" > ${D}${libdir}/sota/sota.env + echo "AKTUALIZR_CMDLINE_PARAMETERS=${AKTUALIZR_PARAMETERS_VIRTUALSECS}" > ${D}${libdir}/sota/sota.env } FILES_${PN}_append = " ${libdir}/sota/sota.env" 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: -- cgit v1.2.3-54-g00ecf