From fa15c07c5fb66b819ed13cd2960caddd22030908 Mon Sep 17 00:00:00 2001 From: Marc Mattmueller Date: Thu, 25 Nov 2021 09:10:18 +0100 Subject: [PATCH] ssf-mgr/sys-mon: adaption due to move of config and systemd files the config and systemd files are moved to their repositories, thus the recipes needed to be adapted. Additionally, the binary permissions are changed from 555 to 755 as all others have. BugzID: 75350 Signed-off-by: Marc Mattmueller --- recipes-tools/ssf-mgr/ssf-mgr/ssf-mgr.conf | 6 ------ recipes-tools/ssf-mgr/ssf-mgr/ssf-mgr.service | 10 ---------- recipes-tools/ssf-mgr/ssf-mgr_git.bb | 16 +++++----------- recipes-tools/sys-mon/sys-mon/sys-mon.conf | 6 ------ recipes-tools/sys-mon/sys-mon/sys-mon.service | 11 ----------- recipes-tools/sys-mon/sys-mon_git.bb | 16 +++++----------- 6 files changed, 10 insertions(+), 55 deletions(-) delete mode 100644 recipes-tools/ssf-mgr/ssf-mgr/ssf-mgr.conf delete mode 100644 recipes-tools/ssf-mgr/ssf-mgr/ssf-mgr.service delete mode 100644 recipes-tools/sys-mon/sys-mon/sys-mon.conf delete mode 100644 recipes-tools/sys-mon/sys-mon/sys-mon.service diff --git a/recipes-tools/ssf-mgr/ssf-mgr/ssf-mgr.conf b/recipes-tools/ssf-mgr/ssf-mgr/ssf-mgr.conf deleted file mode 100644 index d20aba1..0000000 --- a/recipes-tools/ssf-mgr/ssf-mgr/ssf-mgr.conf +++ /dev/null @@ -1,6 +0,0 @@ -# Default settings for system-state-framework manager -# for details run ssf-mgr --help - -MARK_SYS_STATE="-m" -WATCHDOG_CONFIG="-w" -LOGGER_CONFIG="--loglevel=6,evtloop.5,systemState.6,initSys.6,brokerPinger.6,watchdogMgr.6" diff --git a/recipes-tools/ssf-mgr/ssf-mgr/ssf-mgr.service b/recipes-tools/ssf-mgr/ssf-mgr/ssf-mgr.service deleted file mode 100644 index 450ca0c..0000000 --- a/recipes-tools/ssf-mgr/ssf-mgr/ssf-mgr.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=SystemStateFramework Manager daemon - -[Service] -Type=forking -EnvironmentFile=-/etc/default/ssf-mgr.conf -ExecStart=/usr/bin/ssf-mgr $MARK_SYS_STATE $WATCHDOG_CONFIG -d -p /run/ssf-mgr.pid $LOGGER_CONFIG - -[Install] -WantedBy=multi-user.target diff --git a/recipes-tools/ssf-mgr/ssf-mgr_git.bb b/recipes-tools/ssf-mgr/ssf-mgr_git.bb index 705132b..05d6cf0 100644 --- a/recipes-tools/ssf-mgr/ssf-mgr_git.bb +++ b/recipes-tools/ssf-mgr/ssf-mgr_git.bb @@ -5,10 +5,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=6f1c528c9a0010ef398e26c661ff286e" SRC_URI = "git://gitlab.com/netmodule/tools/ssf-mgr.git;protocol=ssh;user=git;branch=develop" SRCREV = "${AUTOREV}" -SRC_URI_append = " \ - file://ssf-mgr.conf \ - file://ssf-mgr.service \ - " PV = "0.0.1+git${SRCPV}" @@ -26,20 +22,18 @@ SYSTEMD_SERVICE_${PN} = "ssf-mgr.service" FILES_${PN} += " \ ${bindir}/ssf-mgr \ ${systemd_system_unitdir}/ssf-mgr.service \ - ${sysconfdir}/default/ssf-mgr.conf \ + ${sysconfdir}/ssf-mgr/ssf-mgr.conf \ " # build variables for the target (rest is default) EXTRA_OEMAKE_append = " 'BUILD_TARGET=target' 'BUILD_CONFIG=rls' 'SYSROOT=${STAGING_DIR_TARGET}'" do_install() { - bbplain "Installing ${BPN} to ${bindir}..." install -d ${D}${bindir} - install -m 555 ${B}/rls/target/${BPN} ${D}${bindir} - bbplain "Installing ${BPN} as systemd service..." - install -d ${D}${sysconfdir}/default - install -m 644 ${WORKDIR}/${BPN}.conf ${D}${sysconfdir}/default/ + install -m 755 ${B}/rls/target/${BPN} ${D}${bindir} + install -d ${D}${sysconfdir}/ssf-mgr + install -m 644 ${S}/config/${BPN}.conf ${D}${sysconfdir}/ssf-mgr/ 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-tools/sys-mon/sys-mon/sys-mon.conf b/recipes-tools/sys-mon/sys-mon/sys-mon.conf deleted file mode 100644 index a8ccb24..0000000 --- a/recipes-tools/sys-mon/sys-mon/sys-mon.conf +++ /dev/null @@ -1,6 +0,0 @@ -# Default settings for system monitor application -# for details run sys-mon --help - -MON_INTERVAL_MS="-m 60000" -LOG_INTERVAL_MS="-l 600000" -LOGGER_CONFIG="--loglevel=6,evtloop.5,fileOp.5,tempSensor.5" diff --git a/recipes-tools/sys-mon/sys-mon/sys-mon.service b/recipes-tools/sys-mon/sys-mon/sys-mon.service deleted file mode 100644 index 3b02194..0000000 --- a/recipes-tools/sys-mon/sys-mon/sys-mon.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=System monitoring daemon -Requires=syslog.service - -[Service] -Type=forking -EnvironmentFile=-/etc/default/sys-mon.conf -ExecStart=/usr/bin/sys-mon -d -p /run/sys-mon.pid $MON_INTERVAL_MS $LOG_INTERVAL_MS $LOGGER_CONFIG - -[Install] -WantedBy=multi-user.target \ No newline at end of file diff --git a/recipes-tools/sys-mon/sys-mon_git.bb b/recipes-tools/sys-mon/sys-mon_git.bb index b0ff16e..daf5711 100644 --- a/recipes-tools/sys-mon/sys-mon_git.bb +++ b/recipes-tools/sys-mon/sys-mon_git.bb @@ -5,10 +5,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=bde2a6343527f4ace81c3fb4ca0d2742" SRC_URI = "git://gitlab.netmodule.intranet/oem-linux/tools/sys-mon.git;protocol=ssh;user=git;branch=develop" SRCREV = "${AUTOREV}" -SRC_URI_append = " \ - file://sys-mon.conf \ - file://sys-mon.service \ - " PV = "0.0.1+git${SRCPV}" @@ -25,20 +21,18 @@ SYSTEMD_SERVICE_${PN} = "sys-mon.service" FILES_${PN} += " \ ${bindir}/sys-mon \ ${systemd_system_unitdir}/sys-mon.service \ - ${sysconfdir}/default/sys-mon.conf \ + ${sysconfdir}/sys-mon/sys-mon.conf \ " # build variables for the target (rest is default) EXTRA_OEMAKE_append = " 'BUILD_TARGET=target' 'BUILD_CONFIG=rls' 'SYSROOT=${STAGING_DIR_TARGET}'" do_install() { - bbplain "Installing ${BPN} to ${bindir}..." install -d ${D}${bindir} - install -m 555 ${B}/rls/target/${BPN} ${D}${bindir} - bbplain "Installing ${BPN} as systemd service..." - install -d ${D}${sysconfdir}/default - install -m 644 ${WORKDIR}/${BPN}.conf ${D}${sysconfdir}/default/ + install -m 755 ${B}/rls/target/${BPN} ${D}${bindir} + install -d ${D}${sysconfdir}/sys-mon + install -m 644 ${S}/config/${BPN}.conf ${D}${sysconfdir}/sys-mon/ 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} }