[meta-ti] [master][PATCH] ti-ipc: install both tiipclad sysvinit initscript and systemd unit files

Denys Dmytriyenko denis at denix.org
Wed Jan 23 11:38:56 PST 2019


From: Denys Dmytriyenko <denys at ti.com>

Since both systemd and update-rc.d classes are inherited, not having a
corresponding file results in postinst function to fail, which is a hard
error now. Having both init files installed does not affect functionality.

Signed-off-by: Denys Dmytriyenko <denys at ti.com>
---
 recipes-ti/ipc/ti-ipc_git.bb | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/recipes-ti/ipc/ti-ipc_git.bb b/recipes-ti/ipc/ti-ipc_git.bb
index 8b3ac91..2ebd03f 100644
--- a/recipes-ti/ipc/ti-ipc_git.bb
+++ b/recipes-ti/ipc/ti-ipc_git.bb
@@ -48,15 +48,10 @@ do_install_append() {
     sed -i -e "s/__LAD_DAEMON__/${DAEMON}/" ${WORKDIR}/tiipclad-daemon.sh
     sed -i -e "s/__LAD_DAEMON__/${DAEMON}/" ${WORKDIR}/tiipclad-daemon.service
 
-    systemd_enabled=${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '1', '0', d)}
-    if [ ${systemd_enabled} -eq 1 ]
-    then
-        install -d ${D}${systemd_system_unitdir}
-        install -m 0644 ${WORKDIR}/tiipclad-daemon.service ${D}${systemd_system_unitdir}
-    else
-        install -d ${D}${sysconfdir}/init.d/
-        install -c -m 755 ${S}/scripts/tiipclad-daemon.sh ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
-    fi
+    install -d ${D}${systemd_system_unitdir}
+    install -m 0644 ${WORKDIR}/tiipclad-daemon.service ${D}${systemd_system_unitdir}
+    install -d ${D}${sysconfdir}/init.d/
+    install -c -m 755 ${WORKDIR}/tiipclad-daemon.sh ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
 }
 
 do_install_append_dra7xx() {
-- 
2.7.4



More information about the meta-ti mailing list