Merge "python-django-horizon: install the init script"

diff --git a/meta-stx/recipes-core/stx-metal/mtce-control.inc b/meta-stx/recipes-core/stx-metal/mtce-control.inc
index 3d0f241..dfb67c0 100644 (file)
--- a/meta-stx/recipes-core/stx-metal/mtce-control.inc
+++ b/meta-stx/recipes-core/stx-metal/mtce-control.inc
@@ -35,15 +35,9 @@ do_install_prepend () {
        oe_runmake buildroot=${D} \
                _sysconfdir=${sysconfdir} _unitdir=${systemd_system_unitdir} _datarootdir=${datadir} \
                install
-
+       sed -i -e 's|/usr/local/bin/|${bindir}/|' ${D}/${sysconfdir}/init.d/hbsAgent
 }
 
-#pkg_postinst_ontarget_mtce-control () {
-#      # /usr/bin/systemctl enable lighttpd.service
-#      # /usr/bin/systemctl enable qemu_clean.service
-#      /usr/bin/systemctl enable hbsAgent.service
-#}
-
 FILES_mtce-control = " \
        ${datadir}/licenses/mtce-control-1.0/LICENSE \
        ${systemd_system_unitdir}/hbsAgent.service \

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 (file)
--- 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 (file)
--- 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
 }