From 62b32e9cc348758e8569040f4d5f4d337234d3ad Mon Sep 17 00:00:00 2001
From: Leon Anavi <leon.anavi@konsulko.com>
Date: Mon, 22 Jan 2018 19:15:40 +0200
Subject: Drop rvi-sota-client and remove meta-rust dependency

Remove the old RVI SOTA Client and the dependecy
from Yocto/OE layer meta-rust.

Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
---
 conf/include/bblayers/sota.inc                     |   1 -
 .../files/sota-client-autoprovision.service        |  15 --
 .../files/sota-client-ostree.service               |  13 --
 .../files/sota-client-uptane.service               |  15 --
 .../rvi-sota-client/files/sota-installer.service   |  12 --
 recipes-sota/rvi-sota-client/rvi-sota-client.inc   | 173 ---------------------
 .../rvi-sota-client/rvi-sota-client_git.bb         |  59 -------
 recipes-sota/rvi-sota-client/sota-installer_git.bb |  25 ---
 recipes-sota/rvi-sota-client/sota-launcher_git.bb  |  15 --
 9 files changed, 328 deletions(-)
 delete mode 100644 recipes-sota/rvi-sota-client/files/sota-client-autoprovision.service
 delete mode 100644 recipes-sota/rvi-sota-client/files/sota-client-ostree.service
 delete mode 100644 recipes-sota/rvi-sota-client/files/sota-client-uptane.service
 delete mode 100644 recipes-sota/rvi-sota-client/files/sota-installer.service
 delete mode 100644 recipes-sota/rvi-sota-client/rvi-sota-client.inc
 delete mode 100644 recipes-sota/rvi-sota-client/rvi-sota-client_git.bb
 delete mode 100644 recipes-sota/rvi-sota-client/sota-installer_git.bb
 delete mode 100644 recipes-sota/rvi-sota-client/sota-launcher_git.bb

diff --git a/conf/include/bblayers/sota.inc b/conf/include/bblayers/sota.inc
index b1fd28a..26eea22 100644
--- a/conf/include/bblayers/sota.inc
+++ b/conf/include/bblayers/sota.inc
@@ -1,4 +1,3 @@
 BBLAYERS += "${METADIR}/meta-updater"
 BBLAYERS += "${METADIR}/meta-openembedded/meta-filesystems"
 BBLAYERS += "${METADIR}/meta-openembedded/meta-oe"
-BBLAYERS += "${METADIR}/meta-rust"
diff --git a/recipes-sota/rvi-sota-client/files/sota-client-autoprovision.service b/recipes-sota/rvi-sota-client/files/sota-client-autoprovision.service
deleted file mode 100644
index 11b1354..0000000
--- a/recipes-sota/rvi-sota-client/files/sota-client-autoprovision.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=SOTA Client Autoprovisioning
-Requires=network-online.target
-After=network-online.target
-
-[Service]
-Type=oneshot
-WorkingDirectory=/var/sota
-Environment=SOTA_CERT_DIR=/var/sota
-ExecStart=/usr/bin/sota_provision.sh sota_provisioning_credentials
-RemainAfterExit=true
-StandardOutput=journal
-
-[Install]
-WantedBy=multi-user.target
diff --git a/recipes-sota/rvi-sota-client/files/sota-client-ostree.service b/recipes-sota/rvi-sota-client/files/sota-client-ostree.service
deleted file mode 100644
index 093a994..0000000
--- a/recipes-sota/rvi-sota-client/files/sota-client-ostree.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=SOTA Client
-Requires=network-online.target
-After=network.target network-online.target
-
-[Service]
-RestartSec=5
-Restart=on-failure
-Environment="RUST_LOG=debug"
-ExecStart=/usr/bin/sota_client --config /sysroot/boot/sota.toml --device-package-manager ostree
-
-[Install]
-WantedBy=multi-user.target
diff --git a/recipes-sota/rvi-sota-client/files/sota-client-uptane.service b/recipes-sota/rvi-sota-client/files/sota-client-uptane.service
deleted file mode 100644
index a2d80ce..0000000
--- a/recipes-sota/rvi-sota-client/files/sota-client-uptane.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=SOTA Client
-Requires=network-online.target
-After=network.target network-online.target
-Requires=sota-client-autoprovision
-After=sota-client-autoprovision
-
-[Service]
-RestartSec=5
-Restart=on-failure
-Environment="RUST_LOG=debug"
-ExecStart=/usr/bin/sota_client --config /var/sota/sota.toml --device-package-manager uptane
-
-[Install]
-WantedBy=multi-user.target
diff --git a/recipes-sota/rvi-sota-client/files/sota-installer.service b/recipes-sota/rvi-sota-client/files/sota-installer.service
deleted file mode 100644
index a4fd99e..0000000
--- a/recipes-sota/rvi-sota-client/files/sota-installer.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=SOTA Secondary ECU Installer
-Requires=network-online.target
-After=network-online.target
-
-[Service]
-RestartSec=10
-Restart=always
-ExecStart=/usr/bin/sota-installer --level debug --oneshot --config /var/sota/installer.toml
-
-[Install]
-WantedBy=multi-user.target
diff --git a/recipes-sota/rvi-sota-client/rvi-sota-client.inc b/recipes-sota/rvi-sota-client/rvi-sota-client.inc
deleted file mode 100644
index 712b9b3..0000000
--- a/recipes-sota/rvi-sota-client/rvi-sota-client.inc
+++ /dev/null
@@ -1,173 +0,0 @@
-inherit cargo systemd
-
-DESCRIPTION = "rvi-sota-client recipe"
-HOMEPAGE = "https://github.com/advancedtelematic/rvi_sota_client"
-LICENSE = "MPL-2.0"
-LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=65d26fcc2f35ea6a181ac777e42db1ea"
-
-BBCLASSEXTEND = "native"
-
-S = "${WORKDIR}/git"
-
-SRC_URI[index.md5sum] = "6a635e8a081b4d4ba4cebffd721c2d7d"
-SRC_URI[index.sha256sum] = "1913c41d4b8de89a931b6f9e418f83e70a083e12e6c247e8510ee932571ebae2"
-
-# also update PV and SRC_URI crates when updating SRCREV
-SRCREV = "be8ec83af2051a2b2499ce8878242771c65f0f1c"
-
-PR = "1"
-
-# generate with: `make package-version`
-PV = "0.2.34-8-gbe8ec83"
-
-# generate with: `make yocto-version`
-SRC_URI = " \
-git://github.com/advancedtelematic/rvi_sota_client \
-file://sota-client-autoprovision.service \
-file://sota-client-ostree.service \
-file://sota-client-uptane.service \
-file://sota-installer.service \
-crate://crates.io/adler32/1.0.2 \
-crate://crates.io/advapi32-sys/0.2.0 \
-crate://crates.io/aho-corasick/0.6.3 \
-crate://crates.io/ansi_term/0.9.0 \
-crate://crates.io/antidote/1.0.0 \
-crate://crates.io/atty/0.2.3 \
-crate://crates.io/backtrace/0.3.3 \
-crate://crates.io/backtrace-sys/0.1.15 \
-crate://crates.io/base64/0.6.0 \
-crate://crates.io/bincode/0.9.0 \
-crate://crates.io/bit-set/0.4.0 \
-crate://crates.io/bit-vec/0.4.4 \
-crate://crates.io/bitflags/0.7.0 \
-crate://crates.io/bitflags/0.9.1 \
-crate://crates.io/block-buffer/0.2.0 \
-crate://crates.io/byte-tools/0.2.0 \
-crate://crates.io/byteorder/1.1.0 \
-crate://crates.io/bytes/0.4.5 \
-crate://crates.io/cc/1.0.1 \
-crate://crates.io/cfg-if/0.1.2 \
-crate://crates.io/chan/0.1.19 \
-crate://crates.io/chan-signal/0.3.1 \
-crate://crates.io/chrono/0.4.0 \
-crate://crates.io/clap/2.26.2 \
-crate://crates.io/coco/0.1.1 \
-crate://crates.io/constant_time_eq/0.1.3 \
-crate://crates.io/core-foundation/0.2.3 \
-crate://crates.io/core-foundation-sys/0.2.3 \
-crate://crates.io/crossbeam/0.3.0 \
-crate://crates.io/crypt32-sys/0.2.0 \
-crate://crates.io/crypto-mac/0.4.0 \
-crate://crates.io/dbghelp-sys/0.2.0 \
-crate://crates.io/dbus/0.5.4 \
-crate://crates.io/digest/0.6.2 \
-crate://crates.io/dtoa/0.4.2 \
-crate://crates.io/either/1.2.0 \
-crate://crates.io/env_logger/0.4.3 \
-crate://crates.io/error-chain/0.10.0 \
-crate://crates.io/fake-simd/0.1.2 \
-crate://crates.io/filetime/0.1.14 \
-crate://crates.io/foreign-types/0.2.0 \
-crate://crates.io/fuchsia-zircon/0.2.1 \
-crate://crates.io/fuchsia-zircon-sys/0.2.0 \
-crate://crates.io/futures/0.1.16 \
-crate://crates.io/gcc/0.3.54 \
-crate://crates.io/generic-array/0.8.3 \
-crate://crates.io/getopts/0.2.15 \
-crate://crates.io/hex/0.2.0 \
-crate://crates.io/hmac/0.4.2 \
-crate://crates.io/httparse/1.2.3 \
-crate://crates.io/hyper/0.10.13 \
-crate://crates.io/hyper-native-tls/0.2.4 \
-crate://crates.io/idna/0.1.4 \
-crate://crates.io/iovec/0.1.1 \
-crate://crates.io/itoa/0.3.4 \
-crate://crates.io/kernel32-sys/0.2.2 \
-crate://crates.io/language-tags/0.2.2 \
-crate://crates.io/lazy_static/0.2.9 \
-crate://crates.io/libc/0.2.32 \
-crate://crates.io/libdbus-sys/0.1.1 \
-crate://crates.io/libflate/0.1.11 \
-crate://crates.io/log/0.3.8 \
-crate://crates.io/maplit/0.1.5 \
-crate://crates.io/matches/0.1.6 \
-crate://crates.io/memchr/1.0.1 \
-crate://crates.io/metadeps/1.1.2 \
-crate://crates.io/mime/0.2.6 \
-crate://crates.io/native-tls/0.1.4 \
-crate://crates.io/net2/0.2.31 \
-crate://crates.io/nodrop/0.1.9 \
-crate://crates.io/num/0.1.40 \
-crate://crates.io/num-integer/0.1.35 \
-crate://crates.io/num-iter/0.1.34 \
-crate://crates.io/num-traits/0.1.40 \
-crate://crates.io/num_cpus/1.7.0 \
-crate://crates.io/odds/0.2.25 \
-crate://crates.io/openssl/0.9.19 \
-crate://crates.io/openssl-sys/0.9.19 \
-crate://crates.io/pem/0.4.1 \
-crate://crates.io/percent-encoding/1.0.0 \
-crate://crates.io/pkg-config/0.3.9 \
-crate://crates.io/quote/0.3.15 \
-crate://crates.io/rand/0.3.17 \
-crate://crates.io/rayon/0.8.2 \
-crate://crates.io/rayon-core/1.2.1 \
-crate://crates.io/redox_syscall/0.1.31 \
-crate://crates.io/redox_termios/0.1.1 \
-crate://crates.io/regex/0.2.2 \
-crate://crates.io/regex-syntax/0.4.1 \
-crate://crates.io/reqwest/0.6.2 \
-crate://crates.io/ring/0.12.1 \
-crate://crates.io/rust-crypto/0.2.36 \
-crate://crates.io/rustc-demangle/0.1.5 \
-crate://crates.io/rustc-serialize/0.3.24 \
-crate://crates.io/safemem/0.2.0 \
-crate://crates.io/schannel/0.1.8 \
-crate://crates.io/scopeguard/0.3.2 \
-crate://crates.io/secur32-sys/0.2.0 \
-crate://crates.io/security-framework/0.1.16 \
-crate://crates.io/security-framework-sys/0.1.16 \
-crate://crates.io/serde/1.0.15 \
-crate://crates.io/serde_derive/1.0.15 \
-crate://crates.io/serde_derive_internals/0.16.0 \
-crate://crates.io/serde_json/1.0.3 \
-crate://crates.io/serde_urlencoded/0.5.1 \
-crate://crates.io/sha1/0.2.0 \
-crate://crates.io/sha2/0.6.0 \
-crate://crates.io/strsim/0.6.0 \
-crate://crates.io/syn/0.11.11 \
-crate://crates.io/synom/0.11.3 \
-crate://crates.io/tar/0.4.13 \
-crate://crates.io/tempdir/0.3.5 \
-crate://crates.io/term_size/0.3.0 \
-crate://crates.io/termion/1.5.1 \
-crate://crates.io/textwrap/0.8.0 \
-crate://crates.io/thread_local/0.3.4 \
-crate://crates.io/time/0.1.38 \
-crate://crates.io/toml/0.2.1 \
-crate://crates.io/toml/0.4.5 \
-crate://crates.io/traitobject/0.1.0 \
-crate://crates.io/tungstenite/0.5.0 \
-crate://crates.io/typeable/0.1.2 \
-crate://crates.io/typenum/1.9.0 \
-crate://crates.io/unicase/1.4.2 \
-crate://crates.io/unicode-bidi/0.3.4 \
-crate://crates.io/unicode-normalization/0.1.5 \
-crate://crates.io/unicode-width/0.1.4 \
-crate://crates.io/unicode-xid/0.0.4 \
-crate://crates.io/unix_socket/0.5.0 \
-crate://crates.io/unreachable/1.0.0 \
-crate://crates.io/untrusted/0.5.1 \
-crate://crates.io/url/1.5.1 \
-crate://crates.io/utf-8/0.7.1 \
-crate://crates.io/utf8-ranges/1.0.0 \
-crate://crates.io/uuid/0.5.1 \
-crate://crates.io/vcpkg/0.2.2 \
-crate://crates.io/vec_map/0.8.0 \
-crate://crates.io/version_check/0.1.3 \
-crate://crates.io/void/1.0.2 \
-crate://crates.io/winapi/0.2.8 \
-crate://crates.io/winapi-build/0.1.1 \
-crate://crates.io/ws2_32-sys/0.2.1 \
-crate://crates.io/xattr/0.1.11 \
-"
diff --git a/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb b/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb
deleted file mode 100644
index e286598..0000000
--- a/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb
+++ /dev/null
@@ -1,59 +0,0 @@
-require rvi-sota-client.inc
-
-
-SYSTEMD_SERVICE_${PN} = "sota-client.service sota-client-autoprovision.service"
-
-FILES_${PN} = " \
-/lib64 \
-${bindir}/sota_client \
-${bindir}/sota_sysinfo.sh \
-${bindir}/sota_provision.sh \
-${sysconfdir}/sota_client.version \
-${sysconfdir}/sota_certificates \
-${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/sota-client.service', '', d)} \
-${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/sota-client-autoprovision.service', '', d)} \
-"
-
-DEPENDS += " openssl openssl-native dbus "
-RDEPENDS_${PN} = " \
-bash \
-curl \
-libcrypto \
-libssl \
-lshw \
-jq \
-python-petname \
-sota-launcher \
-zip \
-"
-
-export SOTA_PACKED_CREDENTIALS
-
-do_compile_prepend() {
-  export SOTA_VERSION=$(make sota-version)
-  cd sota-client
-}
-
-do_install() {
-  ln -fs /lib ${D}/lib64
-
-  install -d ${D}${bindir}
-  install -d ${D}${sysconfdir}
-
-  echo `git log -1 --pretty=format:%H` > ${D}${sysconfdir}/sota_client.version
-  install -c ${S}/sota-client/docker/sota_certificates ${D}${sysconfdir}
-
-  install -m 0755 target/${TARGET_SYS}/release/sota_client ${D}${bindir}
-  install -m 0755 ${S}/sota-client/docker/sota_provision.sh ${D}${bindir}
-  install -m 0755 ${S}/sota-client/docker/sota_sysinfo.sh ${D}${bindir}
-
-  if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
-    install -d ${D}/${systemd_unitdir}/system
-    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
-    fi
-    install -m 0644 ${WORKDIR}/sota-client-autoprovision.service ${D}/${systemd_unitdir}/system/sota-client-autoprovision.service
-  fi
-}
diff --git a/recipes-sota/rvi-sota-client/sota-installer_git.bb b/recipes-sota/rvi-sota-client/sota-installer_git.bb
deleted file mode 100644
index 09f6e5d..0000000
--- a/recipes-sota/rvi-sota-client/sota-installer_git.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-require rvi-sota-client.inc
-
-
-SYSTEMD_SERVICE_${PN} = "sota-installer.service"
-
-DEPENDS += " rvi-sota-client "
-
-FILES_${PN} = " \
-${bindir}/sota-installer \
-${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/sota-installer.service', '', d)} \
-"
-
-do_compile_prepend() {
-  cd sota-installer
-}
-
-do_install() {
-  install -d ${D}${bindir}
-  install -m 0755 target/${TARGET_SYS}/release/sota-installer ${D}${bindir}
-
-  if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
-    install -d ${D}/${systemd_unitdir}/system
-    install -m 0644 ${WORKDIR}/sota-installer.service ${D}/${systemd_unitdir}/system/sota-installer.service
-  fi
-}
diff --git a/recipes-sota/rvi-sota-client/sota-launcher_git.bb b/recipes-sota/rvi-sota-client/sota-launcher_git.bb
deleted file mode 100644
index e9874e7..0000000
--- a/recipes-sota/rvi-sota-client/sota-launcher_git.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require rvi-sota-client.inc
-
-
-DEPENDS += " rvi-sota-client "
-FILES_${PN} = "${bindir}/sota-launcher"
-
-
-do_compile_prepend() {
-  cd sota-launcher
-}
-
-do_install() {
-  install -d ${D}${bindir}
-  install -m 0755 target/${TARGET_SYS}/release/sota-launcher ${D}${bindir}
-}
-- 
cgit v1.2.3-54-g00ecf