From 197301a7c39f3f21679c246febc9d43c191221c9 Mon Sep 17 00:00:00 2001 From: Mike Sul Date: Mon, 1 Jul 2019 15:07:47 +0300 Subject: OTA-2488: Remove SOTA_SECONDARY_CONFIG_DIR configuration variable (old way to configure secondaries). Bump corresponding version of aktualizr. Signed-off-by: Mike Sul --- recipes-sota/aktualizr/aktualizr_git.bb | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'recipes-sota/aktualizr') diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index 28c51d9..8c59f57 100644 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb @@ -31,7 +31,7 @@ SRC_URI = " \ SRC_URI[md5sum] = "e104ccd4f32e52571a5fc0e5042db050" SRC_URI[sha256sum] = "c590be1a57523bfe097af82279eda5c97cf40ae47fb27162cf33c469702c8a9b" -SRCREV = "fce5854ff10e7efd52d69bbaf68dc2af990d5746" +SRCREV = "9c592cf9d8dfcd995d47753f2be7bd1a2b56c7da" BRANCH ?= "master" S = "${WORKDIR}/git" @@ -106,16 +106,6 @@ do_install_append () { printf "[provision]\nprimary_ecu_hardware_id = ${SOTA_HARDWARE_ID}\n" > ${D}${libdir}/sota/conf.d/40-hardware-id.toml fi - if [ -n "${SOTA_SECONDARY_CONFIG_DIR}" ]; then - if [ -d "${SOTA_SECONDARY_CONFIG_DIR}" ]; then - install -m 0700 -d ${D}${sysconfdir}/sota/ecus - install -m 0644 "${SOTA_SECONDARY_CONFIG_DIR}"/* ${D}${sysconfdir}/sota/ecus/ - printf "[uptane]\nsecondary_configs_dir = /etc/sota/ecus/\n" > ${D}${libdir}/sota/conf.d/30-secondary-configs-dir.toml - else - bbwarn "SOTA_SECONDARY_CONFIG_DIR is set to an invalid directory (${SOTA_SECONDARY_CONFIG_DIR})" - fi - fi - 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 -- cgit v1.2.3-54-g00ecf