From b20eb4aa872f00827d0c079d30a61bd86f68866e Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Wed, 2 Aug 2017 12:26:51 +0200 Subject: Prepare credentials correctly for rvi-sota-client. Unzip credentials archive and create files as appropriate, since none of that is necessary for aktualizr anymore. This is now done in the sota_provision script. It apparently does not work in the rvi-sota-client recipe, but this solution is perhaps even cleaner anyway. --- recipes-sota/rvi-sota-client/files/sota-client-autoprovision.service | 1 - recipes-sota/rvi-sota-client/rvi-sota-client.inc | 5 +++-- recipes-sota/rvi-sota-client/rvi-sota-client_git.bb | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/recipes-sota/rvi-sota-client/files/sota-client-autoprovision.service b/recipes-sota/rvi-sota-client/files/sota-client-autoprovision.service index 0431455..11b1354 100644 --- a/recipes-sota/rvi-sota-client/files/sota-client-autoprovision.service +++ b/recipes-sota/rvi-sota-client/files/sota-client-autoprovision.service @@ -6,7 +6,6 @@ After=network-online.target [Service] Type=oneshot WorkingDirectory=/var/sota -EnvironmentFile=/var/sota/sota_provisioning_url.env Environment=SOTA_CERT_DIR=/var/sota ExecStart=/usr/bin/sota_provision.sh sota_provisioning_credentials RemainAfterExit=true diff --git a/recipes-sota/rvi-sota-client/rvi-sota-client.inc b/recipes-sota/rvi-sota-client/rvi-sota-client.inc index 2a27c9a..00709af 100644 --- a/recipes-sota/rvi-sota-client/rvi-sota-client.inc +++ b/recipes-sota/rvi-sota-client/rvi-sota-client.inc @@ -13,10 +13,11 @@ SRC_URI[index.md5sum] = "6a635e8a081b4d4ba4cebffd721c2d7d" SRC_URI[index.sha256sum] = "1913c41d4b8de89a931b6f9e418f83e70a083e12e6c247e8510ee932571ebae2" # also update PV and SRC_URI crates when updating SRCREV -SRCREV = "b9170dfd92981505c77f8f6e51d477eb1ec57071" +SRCREV = "5b335cd46c5848d8012ef03f06b50a63fdac4f7c" +PR = "1" # generate with: `make package-version` -PV = "0.2.33-61-gb9170df" +PV = "0.2.33-66-g5b335cd" # generate with: `make yocto-version` SRC_URI = " \ diff --git a/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb b/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb index 7ce3ab5..e286598 100644 --- a/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb +++ b/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb @@ -24,11 +24,10 @@ lshw \ jq \ python-petname \ sota-launcher \ +zip \ " export SOTA_PACKED_CREDENTIALS -export SOTA_AUTOPROVISION_CREDENTIALS -export SOTA_AUTOPROVISION_URL do_compile_prepend() { export SOTA_VERSION=$(make sota-version) @@ -50,7 +49,7 @@ do_install() { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}/${systemd_unitdir}/system - if [ -n "$SOTA_AUTOPROVISION_CREDENTIALS" -o -n "$SOTA_PACKED_CREDENTIALS" ]; then + if [ -n "$SOTA_PACKED_CREDENTIALS" ]; then install -m 0644 ${WORKDIR}/sota-client-uptane.service ${D}/${systemd_unitdir}/system/sota-client.service else install -m 0644 ${WORKDIR}/sota-client-ostree.service ${D}/${systemd_unitdir}/system/sota-client.service -- cgit v1.2.3-54-g00ecf