mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-16 04:17:25 +00:00
monkey: Keep /var/volatile empty
/var/volatile is populated at runtime as it can be mounted from a different partition, therefore its better to keep it empty and only populate it during runtime. Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@@ -17,7 +17,7 @@ UPSTREAM_CHECK_URI = "https://github.com/monkey/monkey/releases"
|
|||||||
UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+).tar.gz"
|
UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+).tar.gz"
|
||||||
|
|
||||||
EXTRA_OECMAKE = "-DINSTALL_LOGDIR=${localstatedir}/log/monkey/ \
|
EXTRA_OECMAKE = "-DINSTALL_LOGDIR=${localstatedir}/log/monkey/ \
|
||||||
-DPID_FILE=${localstatedir}/run/monkey.pid \
|
-DPID_FILE=/run/monkey.pid \
|
||||||
-DINSTALL_SYSCONFDIR=${sysconfdir}/monkey/ \
|
-DINSTALL_SYSCONFDIR=${sysconfdir}/monkey/ \
|
||||||
-DWITH_PLUGINS=* \
|
-DWITH_PLUGINS=* \
|
||||||
-DWITHOUT_PLUGINS=mbedtls \
|
-DWITHOUT_PLUGINS=mbedtls \
|
||||||
@@ -38,10 +38,18 @@ inherit cmake pkgconfig update-rc.d systemd
|
|||||||
OECMAKE_GENERATOR = "Unix Makefiles"
|
OECMAKE_GENERATOR = "Unix Makefiles"
|
||||||
|
|
||||||
do_install:append() {
|
do_install:append() {
|
||||||
rm -rf ${D}/run
|
rmdir ${D}${localstatedir}/log/${BPN} ${D}${localstatedir}/run ${D}${localstatedir}/log
|
||||||
rm -rf ${D}${localstatedir}/run
|
rmdir --ignore-fail-on-non-empty ${D}${localstatedir}
|
||||||
install -Dm 0755 ${WORKDIR}/monkey.init ${D}${sysconfdir}/init.d/monkey
|
install -Dm 0755 ${WORKDIR}/monkey.init ${D}${sysconfdir}/init.d/monkey
|
||||||
|
# Create /var/log/monkey in runtime.
|
||||||
|
if [ "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" ]; then
|
||||||
|
install -d ${D}${nonarch_libdir}/tmpfiles.d
|
||||||
|
echo "d ${localstatedir}/log/${BPN} 0755 ${BPN} ${BPN} -" > ${D}${nonarch_libdir}/tmpfiles.d/${BPN}.conf
|
||||||
|
fi
|
||||||
|
if [ "${@bb.utils.filter('DISTRO_FEATURES', 'sysvinit', d)}" ]; then
|
||||||
|
install -d ${D}${sysconfdir}/default/volatiles
|
||||||
|
echo "d ${BPN} ${BPN} 0755 ${localstatedir}/log/${BPN} none" > ${D}${sysconfdir}/default/volatiles/99_${BPN}
|
||||||
|
fi
|
||||||
if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
|
if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
|
||||||
install -Dm 644 ${WORKDIR}/monkey.service ${D}/${systemd_unitdir}/system/monkey.service
|
install -Dm 644 ${WORKDIR}/monkey.service ${D}/${systemd_unitdir}/system/monkey.service
|
||||||
fi
|
fi
|
||||||
@@ -56,8 +64,7 @@ PACKAGES += "${PN}-plugins"
|
|||||||
|
|
||||||
FILES:${PN}-plugins = "${libdir}/monkey-*.so"
|
FILES:${PN}-plugins = "${libdir}/monkey-*.so"
|
||||||
|
|
||||||
FILES:${PN} += "${localstatedir}/www/monkey/ /run"
|
FILES:${PN} += "${nonarch_libdir}/tmpfiles.d"
|
||||||
|
|
||||||
|
|
||||||
CONFFILES:${PN} = "${sysconfdir}/monkey/monkey.conf \
|
CONFFILES:${PN} = "${sysconfdir}/monkey/monkey.conf \
|
||||||
${sysconfdir}/monkey/sites/default \
|
${sysconfdir}/monkey/sites/default \
|
||||||
|
|||||||
Reference in New Issue
Block a user