From 25fa85e0535a4c0ea5d5dea6a7109842da8e1550 Mon Sep 17 00:00:00 2001
From: Robert Danitz <robert@advancedtelematic.com>
Date: Mon, 31 Jul 2017 15:45:10 +0200
Subject: rename back sota-client to rvi-sota-client

---
 .../rvi-sota-client/rvi-sota-client_git.bb         | 58 ++++++++++++++++++++++
 recipes-sota/rvi-sota-client/sota-client_git.bb    | 58 ----------------------
 recipes-sota/rvi-sota-client/sota-installer_git.bb |  2 +-
 3 files changed, 59 insertions(+), 59 deletions(-)
 create mode 100644 recipes-sota/rvi-sota-client/rvi-sota-client_git.bb
 delete mode 100644 recipes-sota/rvi-sota-client/sota-client_git.bb

diff --git a/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb b/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb
new file mode 100644
index 0000000..21378ce
--- /dev/null
+++ b/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb
@@ -0,0 +1,58 @@
+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 \
+"
+
+export SOTA_PACKED_CREDENTIALS
+export SOTA_AUTOPROVISION_CREDENTIALS
+export SOTA_AUTOPROVISION_URL
+
+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_AUTOPROVISION_CREDENTIALS" -o -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-client_git.bb b/recipes-sota/rvi-sota-client/sota-client_git.bb
deleted file mode 100644
index 21378ce..0000000
--- a/recipes-sota/rvi-sota-client/sota-client_git.bb
+++ /dev/null
@@ -1,58 +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 \
-"
-
-export SOTA_PACKED_CREDENTIALS
-export SOTA_AUTOPROVISION_CREDENTIALS
-export SOTA_AUTOPROVISION_URL
-
-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_AUTOPROVISION_CREDENTIALS" -o -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
index 338e678..09f6e5d 100644
--- a/recipes-sota/rvi-sota-client/sota-installer_git.bb
+++ b/recipes-sota/rvi-sota-client/sota-installer_git.bb
@@ -3,7 +3,7 @@ require rvi-sota-client.inc
 
 SYSTEMD_SERVICE_${PN} = "sota-installer.service"
 
-DEPENDS += " sota-client "
+DEPENDS += " rvi-sota-client "
 
 FILES_${PN} = " \
 ${bindir}/sota-installer \
-- 
cgit v1.2.3-54-g00ecf