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_git.bb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'recipes-sota/aktualizr/aktualizr_git.bb') 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 = " \ -- cgit v1.2.3-54-g00ecf