stx-utilities: inherit systemd to enable services

- inherit systemd bbclass and set correct variables to
  enable services.

- remove sysvinit from DISTRO_FEATURES_BACKFILL_CONSIDERED
  to avoid init scripts being removed.

- remove the useless pkg_postinst functions

- remove duplicated collect-engtools.inc

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

diff --git a/meta-stx/recipes-core/stx-utilities/stx-utilities_git.bb b/meta-stx/recipes-core/stx-utilities/stx-utilities_git.bb
index cc301fc..50c3ed7 100644 (file)
--- a/meta-stx/recipes-core/stx-utilities/stx-utilities_git.bb
+++ b/meta-stx/recipes-core/stx-utilities/stx-utilities_git.bb
@@ -54,7 +54,7 @@ SRC_URI = " \
        git://opendev.org/starlingx/${SRCNAME}.git;protocol=${PROTOCOL};rev=${SRCREV};branch=${BRANCH} \
        "
 
-inherit setuptools distutils python-dir
+inherit setuptools distutils python-dir systemd
 DEPENDS = " \
        python-pip \
        python-pbr-native \
@@ -90,3 +90,5 @@ do_install() {
 }
 
 FILES_${PN} = " "
+
+DISTRO_FEATURES_BACKFILL_CONSIDERED_remove = "sysvinit"

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 66fd74a..8a8f155 100644 (file)
--- a/meta-stx/recipes-core/stx-utilities/tools/collect-engtools.inc
+++ b/meta-stx/recipes-core/stx-utilities/tools/collect-engtools.inc
@@ -104,3 +104,7 @@ FILES_collect-engtools = "  \
        ${sysconfdir}/init.d/collect-engtools.sh \
        ${systemd_system_unitdir}/collect-engtools.service \
        "
+
+SYSTEMD_PACKAGES += "collect-engtools"
+SYSTEMD_SERVICE_collect-engtools = "collect-engtools.service"
+SYSTEMD_AUTO_ENABLE_collect-engtools = "enable"

diff --git a/meta-stx/recipes-core/stx-utilities/utilities/collect-engtools.inc b/meta-stx/recipes-core/stx-utilities/utilities/collect-engtools.inc
deleted file mode 100644 (file)
index 66fd74a..0000000
--- a/meta-stx/recipes-core/stx-utilities/utilities/collect-engtools.inc
+++ /dev/null
@@ -1,106 +0,0 @@
-#
-## Copyright (C) 2019 Wind River Systems, Inc.
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-
-PACKAGES += " collect-engtools"
-
-RDEPENDS_collect-engtools += " \
-       iperf3 \
-       bash \
-       perl \
-       python \
-       "
-
-SUMMARY_collect-engtools= "Host performance data collection tools package"
-DESCRIPTION_collect-engtools= " \
-This package contains data collection tools to monitor host performance. \
-Tools are general purpose engineering and debugging related. Includes \
-overall memory, cpu occupancy, per-task cpu, per-task scheduling, per-task \
-io. \
-"
-
-
-do_configure_append() {
-       :
-}
-do_compile_append() {
-       :
-}
-
-do_install_append() {
-       cd ${S}/tools/engtools/hostdata-collectors/scripts
-
-       install -d -m0755 ${D}/${bindir}
-       install -m 755 buddyinfo.py ${D}/${bindir}
-       install -m 755 chewmem ${D}/${bindir}
-       install -m 755 ceph.sh ${D}/${bindir}
-       install -m 755 cleanup-engtools.sh ${D}/${bindir}
-       install -m 755 collect-engtools.sh ${D}/${bindir}
-       install -m 755 diskstats.sh ${D}/${bindir}
-       install -m 755 engtools_util.sh ${D}/${bindir}
-       install -m 755 filestats.sh ${D}/${bindir}
-       install -m 755 iostat.sh ${D}/${bindir}
-       install -m 755 linux_benchmark.sh ${D}/${bindir}
-       install -m 755 memstats.sh ${D}/${bindir}
-       install -m 755 netstats.sh ${D}/${bindir}
-       install -m 755 postgres.sh ${D}/${bindir}
-       install -m 755 rabbitmq.sh ${D}/${bindir}
-       install -m 755 remote/rbzip2-engtools.sh ${D}/${bindir}
-       install -m 755 remote/rstart-engtools.sh ${D}/${bindir}
-       install -m 755 remote/rstop-engtools.sh ${D}/${bindir}
-       install -m 755 remote/rsync-engtools-data.sh ${D}/${bindir}
-       install -m 755 slab.sh ${D}/${bindir}
-       install -m 755 ticker.sh ${D}/${bindir}
-       install -m 755 top.sh ${D}/${bindir}
-       install -m 755 vswitch.sh ${D}/${bindir}
-       install -m 755 live_stream.py ${D}/${bindir}
-
-       install -p -d -m0755 ${D}/${sysconfdir}/engtools/
-       install -m0644 -p cfg/engtools.conf ${D}/${sysconfdir}/engtools
-       install -d -m0755 ${D}/${sysconfdir}/init.d
-       install -m0755 init.d/collect-engtools.sh ${D}/${sysconfdir}/init.d
-
-       install -d -m0755 ${D}/${systemd_system_unitdir}
-       install -m0644 -p -D collect-engtools.service ${D}/${systemd_system_unitdir}
-
-}
-
-FILES_collect-engtools = "  \
-       ${bindir}/buddyinfo.py \
-       ${bindir}/chewmem \
-       ${bindir}/ceph.sh \
-       ${bindir}/cleanup-engtools.sh \
-       ${bindir}/collect-engtools.sh \
-       ${bindir}/diskstats.sh \
-       ${bindir}/engtools_util.sh \
-       ${bindir}/filestats.sh \
-       ${bindir}/iostat.sh \
-       ${bindir}/linux_benchmark.sh \
-       ${bindir}/memstats.sh \
-       ${bindir}/netstats.sh \
-       ${bindir}/postgres.sh \
-       ${bindir}/rabbitmq.sh \
-       ${bindir}/rbzip2-engtools.sh \
-       ${bindir}/rstart-engtools.sh \
-       ${bindir}/rstop-engtools.sh \
-       ${bindir}/rsync-engtools-data.sh \
-       ${bindir}/slab.sh \
-       ${bindir}/ticker.sh \
-       ${bindir}/top.sh \
-       ${bindir}/vswitch.sh \
-       ${bindir}/live_stream.py \
-       ${sysconfdir}/engtools/engtools.conf \
-       ${sysconfdir}/init.d/collect-engtools.sh \
-       ${systemd_system_unitdir}/collect-engtools.service \
-       "

diff --git a/meta-stx/recipes-core/stx-utilities/utilities/logmgmt.inc b/meta-stx/recipes-core/stx-utilities/utilities/logmgmt.inc
index fa983b5..5f01fb7 100644 (file)
--- a/meta-stx/recipes-core/stx-utilities/utilities/logmgmt.inc
+++ b/meta-stx/recipes-core/stx-utilities/utilities/logmgmt.inc
@@ -60,3 +60,7 @@ FILES_logmgmt = "  \
        ${PYTHON_SITEPACKAGES_DIR}/logmgmt/ \
        ${PYTHON_SITEPACKAGES_DIR}/logmgmt-${PV}-py${PYTHON_BASEVERSION}.egg-info/ \
        "
+
+SYSTEMD_PACKAGES += "logmgmt"
+SYSTEMD_SERVICE_logmgmt = "logmgmt.service"
+SYSTEMD_AUTO_ENABLE_logmgmt = "enable"

diff --git a/meta-stx/recipes-core/stx-utilities/utilities/nfscheck.inc b/meta-stx/recipes-core/stx-utilities/utilities/nfscheck.inc
index e0ddeb7..944e402 100644 (file)
--- a/meta-stx/recipes-core/stx-utilities/utilities/nfscheck.inc
+++ b/meta-stx/recipes-core/stx-utilities/utilities/nfscheck.inc
@@ -40,3 +40,7 @@ FILES_nfscheck = "  \
        ${bindir}/nfscheck.sh \
        ${systemd_system_unitdir}/nfscheck.service \
        "
+
+SYSTEMD_PACKAGES += "nfscheck"
+SYSTEMD_SERVICE_nfscheck = "nfscheck.service"
+SYSTEMD_AUTO_ENABLE_nfscheck = "enable"

diff --git a/meta-stx/recipes-core/stx-utilities/utilities/pci-irq-affinity.inc b/meta-stx/recipes-core/stx-utilities/utilities/pci-irq-affinity.inc
index aa1bebf..c21f36c 100644 (file)
--- a/meta-stx/recipes-core/stx-utilities/utilities/pci-irq-affinity.inc
+++ b/meta-stx/recipes-core/stx-utilities/utilities/pci-irq-affinity.inc
@@ -58,3 +58,7 @@ FILES_pci-irq-affinity = "  \
        ${PYTHON_SITEPACKAGES_DIR}/pci_irq_affinity/ \
        ${PYTHON_SITEPACKAGES_DIR}/pci_irq_affinity_agent-${PV}-py${PYTHON_BASEVERSION}.egg-info/ \
        "
+
+SYSTEMD_PACKAGES += "pci-irq-affinity"
+SYSTEMD_SERVICE_pci-irq-affinity = "pci-irq-affinity-agent.service"
+SYSTEMD_AUTO_ENABLE_pci-irq-affinity = "enable"

diff --git a/meta-stx/recipes-core/stx-utilities/utilities/worker-utils.inc b/meta-stx/recipes-core/stx-utilities/utilities/worker-utils.inc
index 16e7fb9..8c0c143 100644 (file)
--- a/meta-stx/recipes-core/stx-utilities/utilities/worker-utils.inc
+++ b/meta-stx/recipes-core/stx-utilities/utilities/worker-utils.inc
@@ -56,3 +56,10 @@ FILES_worker-utils = "  \
        ${systemd_system_unitdir}/affine-platform.sh.service \
        ${systemd_system_unitdir}/affine-tasks.service \
        "
+
+SYSTEMD_PACKAGES += "worker-utils"
+SYSTEMD_SERVICE_worker-utils = "\
+       affine-tasks.service \
+       affine-platform.sh.service \
+       "
+SYSTEMD_AUTO_ENABLE_worker-utils = "enable"