[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7434/8267] watchdog: enable systemd support



commit c14550deb824b3ef8087dede22d664879e85006d
Author: Kai Kang <kai kang windriver com>
Date:   Tue Aug 22 14:35:05 2017 +0800

    watchdog: enable systemd support
    
    Inherit systemd.bbclass to enable systemd support for watchdog.
    
    And fix indentation of do_install_append() as well according to:
    https://www.openembedded.org/wiki/Styleguide#Format_Guidelines
    
    (From OE-Core rev: a30fcb95d527bc2a0981af5c1ed179a122bb055c)
    
    Signed-off-by: Kai Kang <kai kang windriver com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-extended/watchdog/watchdog_5.15.bb |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/meta/recipes-extended/watchdog/watchdog_5.15.bb b/meta/recipes-extended/watchdog/watchdog_5.15.bb
index 9659f27..3d0b72e 100644
--- a/meta/recipes-extended/watchdog/watchdog_5.15.bb
+++ b/meta/recipes-extended/watchdog/watchdog_5.15.bb
@@ -21,8 +21,7 @@ SRC_URI[sha256sum] = "ffdc865137ad5d8e53664bd22bad4de6ca136d1b4636720320cb52af0c
 UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/watchdog/files/watchdog/";
 UPSTREAM_CHECK_REGEX = "/watchdog/(?P<pver>(\d+[\.\-_]*)+)/"
 
-inherit autotools
-inherit update-rc.d
+inherit autotools update-rc.d systemd
 
 DEPENDS_append_libc-musl = " libtirpc "
 CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc "
@@ -37,12 +36,18 @@ INITSCRIPT_PARAMS_${PN} = "start 15 1 2 3 4 5 . stop 85 0 6 ."
 INITSCRIPT_NAME_${PN}-keepalive = "wd_keepalive"
 INITSCRIPT_PARAMS_${PN}-keepalive = "start 15 1 2 3 4 5 . stop 85 0 6 ."
 
+SYSTEMD_SERVICE_${PN} = "watchdog.service wd_keepalive.service"
+
 do_install_append() {
+       install -d ${D}${systemd_system_unitdir}
+       install -m 0644 ${S}/debian/watchdog.service ${D}${systemd_system_unitdir}
+       install -m 0644 ${S}/debian/wd_keepalive.service ${D}${systemd_system_unitdir}
+
        install -D ${S}/redhat/watchdog.init ${D}/${sysconfdir}/init.d/watchdog.sh
-    install -Dm 0755 ${WORKDIR}/wd_keepalive.init ${D}${sysconfdir}/init.d/wd_keepalive
+       install -Dm 0755 ${WORKDIR}/wd_keepalive.init ${D}${sysconfdir}/init.d/wd_keepalive
 
-    # watchdog.conf is provided by the watchdog-config recipe
-    rm ${D}${sysconfdir}/watchdog.conf
+       # watchdog.conf is provided by the watchdog-config recipe
+       rm ${D}${sysconfdir}/watchdog.conf
 }
 
 PACKAGES =+ "${PN}-keepalive"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]