From 4856b5a3d819f77a792f021e309f3e51099b0efd Mon Sep 17 00:00:00 2001
From: Marc Mattmueller <marc.mattmueller@netmodule.com>
Date: Wed, 24 Nov 2021 15:59:21 +0100
Subject: [PATCH] storage-info: adapted install of config and systemd service
 files

those files reside now in the repository itself, thus the recipe
needed to be adapted

BugzID: 75350
Signed-off-by: Marc Mattmueller <marc.mattmueller@netmodule.com>
---
 recipes-bsp/storage-info/storage-info.bb              |  8 ++------
 .../storage-info/storage-info/storage-info.conf       |  6 ------
 .../storage-info/storage-info/storage-info.service    | 11 -----------
 3 files changed, 2 insertions(+), 23 deletions(-)
 delete mode 100644 recipes-bsp/storage-info/storage-info/storage-info.conf
 delete mode 100644 recipes-bsp/storage-info/storage-info/storage-info.service

diff --git a/recipes-bsp/storage-info/storage-info.bb b/recipes-bsp/storage-info/storage-info.bb
index 5484225..2b66e28 100644
--- a/recipes-bsp/storage-info/storage-info.bb
+++ b/recipes-bsp/storage-info/storage-info.bb
@@ -5,10 +5,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=81438338854bd7a09cb97215f36db46b"
 
 SRC_URI = "git://gitlab.com/netmodule/tools/storage-info.git;protocol=ssh;user=git;branch=develop"
 SRCREV = "${AUTOREV}"
-SRC_URI_append = " \
-                   file://storage-info.conf \
-                   file://storage-info.service \
-                 "
 
 PV = "0.0.1+git${SRCPV}"
 
@@ -35,8 +31,8 @@ do_install() {
     install -d ${D}${bindir}
     install -m 755 ${B}/rls/target/${BPN} ${D}${bindir}
     install -d ${D}${sysconfdir}/storage
-    install -m 644 ${WORKDIR}/${BPN}.conf ${D}${sysconfdir}/storage/
+    install -m 644 ${S}/config/${BPN}.conf ${D}${sysconfdir}/storage/
     install -d ${D}${systemd_system_unitdir}
-    install -m 644 ${WORKDIR}/${BPN}.service ${D}${systemd_system_unitdir}
+    install -m 644 ${S}/systemd/${BPN}.service ${D}${systemd_system_unitdir}
 }
 
diff --git a/recipes-bsp/storage-info/storage-info/storage-info.conf b/recipes-bsp/storage-info/storage-info/storage-info.conf
deleted file mode 100644
index 3318b05..0000000
--- a/recipes-bsp/storage-info/storage-info/storage-info.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# Default settings for storage-info
-#  for details run storage-info --help
-
-INTERVAL="-i 3600000"
-TARGET_FILE="-f /run/storage/storage0.config"
-LOGGER_CONFIG="--loglevel=6,evtloop.5,info-collector.6,info-writer.6"
diff --git a/recipes-bsp/storage-info/storage-info/storage-info.service b/recipes-bsp/storage-info/storage-info/storage-info.service
deleted file mode 100644
index 803eaab..0000000
--- a/recipes-bsp/storage-info/storage-info/storage-info.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Storage Information daemon
-
-[Service]
-Type=forking
-EnvironmentFile=-/etc/default/storage-info.conf
-ExecStart=/usr/bin/storage-info $INTERVAL $TARGET_FILE -d -p /run/storage-info.pid $LOGGER_CONFIG
-PIDFile=/run/storage-info.pid
-
-[Install]
-WantedBy=multi-user.target