LM
/
meta-netmodule-distro
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <marc.mattmueller@netmodule.com>
This commit is contained in:
Marc Mattmueller 2021-11-25 09:10:18 +01:00
parent 678b1c1198
commit fa15c07c5f
6 changed files with 10 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
recipes-tools/ssf-mgr/ssf-mgr/ssf-mgr.conf
View File

@ -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"

10
recipes-tools/ssf-mgr/ssf-mgr/ssf-mgr.service
View File

@ -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

16
recipes-tools/ssf-mgr/ssf-mgr_git.bb
View File

@ -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" SRC_URI = "git://gitlab.com/netmodule/tools/ssf-mgr.git;protocol=ssh;user=git;branch=develop"
SRCREV = "${AUTOREV}" SRCREV = "${AUTOREV}"
SRC_URI_append = " \
file://ssf-mgr.conf \
file://ssf-mgr.service \
"
PV = "0.0.1+git${SRCPV}" PV = "0.0.1+git${SRCPV}"
@ -26,20 +22,18 @@ SYSTEMD_SERVICE_${PN} = "ssf-mgr.service"
FILES_${PN} += " \ FILES_${PN} += " \
${bindir}/ssf-mgr \ ${bindir}/ssf-mgr \
${systemd_system_unitdir}/ssf-mgr.service \ ${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) # build variables for the target (rest is default)
EXTRA_OEMAKE_append = " 'BUILD_TARGET=target' 'BUILD_CONFIG=rls' 'SYSROOT=${STAGING_DIR_TARGET}'" EXTRA_OEMAKE_append = " 'BUILD_TARGET=target' 'BUILD_CONFIG=rls' 'SYSROOT=${STAGING_DIR_TARGET}'"
do_install() { do_install() {
bbplain "Installing ${BPN} to ${bindir}..."
install -d ${D}${bindir} install -d ${D}${bindir}
install -m 555 ${B}/rls/target/${BPN} ${D}${bindir} install -m 755 ${B}/rls/target/${BPN} ${D}${bindir}
bbplain "Installing ${BPN} as systemd service..." install -d ${D}${sysconfdir}/ssf-mgr
install -d ${D}${sysconfdir}/default install -m 644 ${S}/config/${BPN}.conf ${D}${sysconfdir}/ssf-mgr/
install -m 644 ${WORKDIR}/${BPN}.conf ${D}${sysconfdir}/default/
install -d ${D}${systemd_system_unitdir} 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}
} }

6
recipes-tools/sys-mon/sys-mon/sys-mon.conf
View File

@ -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"

11
recipes-tools/sys-mon/sys-mon/sys-mon.service
View File

@ -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

16
recipes-tools/sys-mon/sys-mon_git.bb
View File

@ -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" SRC_URI = "git://gitlab.netmodule.intranet/oem-linux/tools/sys-mon.git;protocol=ssh;user=git;branch=develop"
SRCREV = "${AUTOREV}" SRCREV = "${AUTOREV}"
SRC_URI_append = " \
file://sys-mon.conf \
file://sys-mon.service \
"
PV = "0.0.1+git${SRCPV}" PV = "0.0.1+git${SRCPV}"
@ -25,20 +21,18 @@ SYSTEMD_SERVICE_${PN} = "sys-mon.service"
FILES_${PN} += " \ FILES_${PN} += " \
${bindir}/sys-mon \ ${bindir}/sys-mon \
${systemd_system_unitdir}/sys-mon.service \ ${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) # build variables for the target (rest is default)
EXTRA_OEMAKE_append = " 'BUILD_TARGET=target' 'BUILD_CONFIG=rls' 'SYSROOT=${STAGING_DIR_TARGET}'" EXTRA_OEMAKE_append = " 'BUILD_TARGET=target' 'BUILD_CONFIG=rls' 'SYSROOT=${STAGING_DIR_TARGET}'"
do_install() { do_install() {
bbplain "Installing ${BPN} to ${bindir}..."
install -d ${D}${bindir} install -d ${D}${bindir}
install -m 555 ${B}/rls/target/${BPN} ${D}${bindir} install -m 755 ${B}/rls/target/${BPN} ${D}${bindir}
bbplain "Installing ${BPN} as systemd service..." install -d ${D}${sysconfdir}/sys-mon
install -d ${D}${sysconfdir}/default install -m 644 ${S}/config/${BPN}.conf ${D}${sysconfdir}/sys-mon/
install -m 644 ${WORKDIR}/${BPN}.conf ${D}${sysconfdir}/default/
install -d ${D}${systemd_system_unitdir} 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}
} }