From: Jackie Huang <jackie.huang@windriver.com>
Date: Sun, 26 Apr 2020 08:25:22 +0000 (+0800)
Subject: stx-utilities: fix service name and binary paths
X-Git-Tag: bronze-rc0~71
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F60%2F3460%2F1;p=pti%2Frtp.git

stx-utilities: fix service name and binary paths

* fix the service name: network -> networking
* fix the binary paths:
  - /usr/local/bin -> /usr/bin
  - /usr/local/sbin -> /usr/sbin

Issue-ID: INF-43
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: I503103fb42bd116da4c71fd411127b6e2fe828ad
---

diff --git a/meta-stx/recipes-core/stx-utilities/tools/collect-engtools.inc b/meta-stx/recipes-core/stx-utilities/tools/collect-engtools.inc
index 8a8f155..002ad36 100644
--- a/meta-stx/recipes-core/stx-utilities/tools/collect-engtools.inc
+++ b/meta-stx/recipes-core/stx-utilities/tools/collect-engtools.inc
@@ -74,6 +74,12 @@ do_install_append() {
 	install -d -m0755 ${D}/${systemd_system_unitdir}
 	install -m0644 -p -D collect-engtools.service ${D}/${systemd_system_unitdir}
 
+	sed -i -e 's/network.service/networking.service/' \
+		${D}/${systemd_system_unitdir}/collect-engtools.service
+
+	sed -i -e 's|/usr/local/bin/|${bindir}/|' \
+		${D}/${sysconfdir}/init.d/collect-engtools.sh \
+	        ${D}/${bindir}/cleanup-engtools.sh
 }
 
 FILES_collect-engtools = "  \
diff --git a/meta-stx/recipes-core/stx-utilities/tools/collector.inc b/meta-stx/recipes-core/stx-utilities/tools/collector.inc
index 4aa163d..cd837ca 100644
--- a/meta-stx/recipes-core/stx-utilities/tools/collector.inc
+++ b/meta-stx/recipes-core/stx-utilities/tools/collector.inc
@@ -65,6 +65,11 @@ do_install_append() {
 	install -m 755 etc.exclude ${D}/${sysconfdir}/collect/etc.exclude
 	install -m 755 run.exclude ${D}/${sysconfdir}/collect/run.exclude
 
+	sed -i -e 's|/usr/local/bin/|${bindir}/|' \
+	       -e 's|/usr/local/sbin/|${sbindir}/|' \
+		${D}/${sysconfdir}/collect.d/collect* \
+	        ${D}/${sbindir}/collect*
+
 	ln -sf ${sbindir}/collect ${D}/${bindir}/collect
 }