From 7a973cbc775e4f384eeba1613eef71c74c687004 Mon Sep 17 00:00:00 2001 From: Anton Gerasimov Date: Thu, 30 Nov 2017 14:39:40 +0100 Subject: Remove aktualizr-manual-provision.service We don't support this scenario any more and it makes testing more complicated. --- recipes-sota/aktualizr/aktualizr-auto-prov.bb | 7 +++---- recipes-sota/aktualizr/aktualizr-hsm-test-prov.bb | 4 ++-- recipes-sota/aktualizr/aktualizr-implicit-prov.bb | 4 ++-- .../aktualizr/files/aktualizr-autoprovision.service | 13 ------------- .../aktualizr/files/aktualizr-manual-provision.service | 13 ------------- recipes-sota/aktualizr/files/aktualizr.service | 13 +++++++++++++ 6 files changed, 20 insertions(+), 34 deletions(-) delete mode 100644 recipes-sota/aktualizr/files/aktualizr-autoprovision.service delete mode 100644 recipes-sota/aktualizr/files/aktualizr-manual-provision.service create mode 100644 recipes-sota/aktualizr/files/aktualizr.service diff --git a/recipes-sota/aktualizr/aktualizr-auto-prov.bb b/recipes-sota/aktualizr/aktualizr-auto-prov.bb index 4f9fe4f..4436d48 100644 --- a/recipes-sota/aktualizr/aktualizr-auto-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-auto-prov.bb @@ -11,8 +11,7 @@ PR = "6" SRC_URI = " \ file://LICENSE \ - file://aktualizr-manual-provision.service \ - file://aktualizr-autoprovision.service \ + file://aktualizr.service \ file://sota_autoprov.toml \ " @@ -38,7 +37,7 @@ do_install_append() { if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then install -d ${D}/${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/aktualizr-autoprovision.service ${D}/${systemd_unitdir}/system/aktualizr.service + install -m 0644 ${WORKDIR}/aktualizr.service ${D}/${systemd_unitdir}/system/aktualizr.service install -d ${D}${libdir}/sota install -m "0644" ${WORKDIR}/sota_autoprov.toml ${D}${libdir}/sota/sota.toml @@ -51,7 +50,7 @@ do_install_append() { fi else install -d ${D}/${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/aktualizr-manual-provision.service ${D}/${systemd_unitdir}/system/aktualizr.service + install -m 0644 ${WORKDIR}/aktualizr.service ${D}/${systemd_unitdir}/system/aktualizr.service fi } diff --git a/recipes-sota/aktualizr/aktualizr-hsm-test-prov.bb b/recipes-sota/aktualizr/aktualizr-hsm-test-prov.bb index c443c56..33e472b 100644 --- a/recipes-sota/aktualizr/aktualizr-hsm-test-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-hsm-test-prov.bb @@ -10,7 +10,7 @@ RDEPENDS_${PN} = "aktualizr softhsm softhsm-testtoken" SRC_URI = " \ file://LICENSE \ - file://aktualizr-autoprovision.service \ + file://aktualizr.service \ file://sota_hsm_test.toml \ " PV = "1.0" @@ -22,7 +22,7 @@ inherit systemd do_install() { install -d ${D}/${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/aktualizr-autoprovision.service ${D}/${systemd_unitdir}/system/aktualizr.service + install -m 0644 ${WORKDIR}/aktualizr.service ${D}/${systemd_unitdir}/system/aktualizr.service install -d ${D}${libdir}/sota aktualizr_implicit_writer -c ${SOTA_PACKED_CREDENTIALS} --no-root-ca \ -i ${WORKDIR}/sota_hsm_test.toml -o ${D}${libdir}/sota/sota.toml -p ${D} diff --git a/recipes-sota/aktualizr/aktualizr-implicit-prov.bb b/recipes-sota/aktualizr/aktualizr-implicit-prov.bb index 21e38c9..a1db87f 100644 --- a/recipes-sota/aktualizr/aktualizr-implicit-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-implicit-prov.bb @@ -11,7 +11,7 @@ PR = "1" SRC_URI = " \ file://LICENSE \ - file://aktualizr-autoprovision.service \ + file://aktualizr.service \ file://sota_implicit_prov.toml \ " @@ -21,7 +21,7 @@ inherit systemd do_install() { install -d ${D}/${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/aktualizr-autoprovision.service ${D}/${systemd_unitdir}/system/aktualizr.service + install -m 0644 ${WORKDIR}/aktualizr.service ${D}/${systemd_unitdir}/system/aktualizr.service install -d ${D}${libdir}/sota aktualizr_implicit_writer -c ${SOTA_PACKED_CREDENTIALS} \ -i ${WORKDIR}/sota_implicit_prov.toml -o ${D}${libdir}/sota/sota.toml -p ${D} diff --git a/recipes-sota/aktualizr/files/aktualizr-autoprovision.service b/recipes-sota/aktualizr/files/aktualizr-autoprovision.service deleted file mode 100644 index 8cb8d78..0000000 --- a/recipes-sota/aktualizr/files/aktualizr-autoprovision.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Aktualizr SOTA Client -Wants=network-online.target -After=network.target network-online.target -Requires=network-online.target - -[Service] -RestartSec=10 -Restart=always -ExecStart=/usr/bin/aktualizr --config /usr/lib/sota/sota.toml - -[Install] -WantedBy=multi-user.target diff --git a/recipes-sota/aktualizr/files/aktualizr-manual-provision.service b/recipes-sota/aktualizr/files/aktualizr-manual-provision.service deleted file mode 100644 index a70f2f9..0000000 --- a/recipes-sota/aktualizr/files/aktualizr-manual-provision.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Aktualizr SOTA Client -Wants=network-online.target -After=network.target network-online.target -Requires=network-online.target - -[Service] -RestartSec=10 -Restart=always -ExecStart=/usr/bin/aktualizr --config /sysroot/boot/sota.toml --loglevel 2 - -[Install] -WantedBy=multi-user.target diff --git a/recipes-sota/aktualizr/files/aktualizr.service b/recipes-sota/aktualizr/files/aktualizr.service new file mode 100644 index 0000000..8cb8d78 --- /dev/null +++ b/recipes-sota/aktualizr/files/aktualizr.service @@ -0,0 +1,13 @@ +[Unit] +Description=Aktualizr SOTA Client +Wants=network-online.target +After=network.target network-online.target +Requires=network-online.target + +[Service] +RestartSec=10 +Restart=always +ExecStart=/usr/bin/aktualizr --config /usr/lib/sota/sota.toml + +[Install] +WantedBy=multi-user.target -- cgit v1.2.3-54-g00ecf