diff options
| -rw-r--r-- | meta-arago-demos/recipes-core/matrix/matrix-gui/matrix-gui-2.0.service | 4 | ||||
| -rw-r--r-- | meta-arago-demos/recipes-core/matrix/matrix-gui_2.0.bb | 15 |
2 files changed, 11 insertions, 8 deletions
diff --git a/meta-arago-demos/recipes-core/matrix/matrix-gui/matrix-gui-2.0.service b/meta-arago-demos/recipes-core/matrix/matrix-gui/matrix-gui-2.0.service index 40a8f0f9..462803f3 100644 --- a/meta-arago-demos/recipes-core/matrix/matrix-gui/matrix-gui-2.0.service +++ b/meta-arago-demos/recipes-core/matrix/matrix-gui/matrix-gui-2.0.service @@ -1,6 +1,6 @@ [Unit] Description=Matrix GUI -After=weston.service +After=weston.service lighttpd.service Requires=weston.service Before=graphical.target @@ -12,7 +12,7 @@ IgnoreSIGPIPE=no KillMode=process GuessMainPID=no RemainAfterExit=yes -ExecStart=/etc/init.d/matrix-gui-2.0 start +ExecStart=/usr/share/matrix-gui-2.0/matrix-gui-2.0 start [Install] WantedBy=multi-user.target diff --git a/meta-arago-demos/recipes-core/matrix/matrix-gui_2.0.bb b/meta-arago-demos/recipes-core/matrix/matrix-gui_2.0.bb index d983bfaf..fbff1671 100644 --- a/meta-arago-demos/recipes-core/matrix/matrix-gui_2.0.bb +++ b/meta-arago-demos/recipes-core/matrix/matrix-gui_2.0.bb @@ -50,12 +50,15 @@ do_install(){ sed -i -e "s/__SWITCH_FOREGROUND_VT__/${SWITCH_FOREGROUND_VT}/" ${WORKDIR}/${MATRIX_INITSCRIPT} # Install the script - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/${MATRIX_INITSCRIPT} ${D}${sysconfdir}/init.d/matrix-gui-2.0 - - # Install the systemd unit file - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/matrix-gui-2.0.service ${D}${systemd_system_unitdir} + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/${MATRIX_INITSCRIPT} ${D}${sysconfdir}/init.d/matrix-gui-2.0 + fi + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/matrix-gui-2.0.service ${D}${systemd_system_unitdir} + install -m 0755 ${WORKDIR}/${MATRIX_INITSCRIPT} ${D}${MATRIX_BASE_DIR}/matrix-gui-2.0 + fi } GUIDEPS = "${@bb.utils.contains('DISTRO_FEATURES','opengl',"matrix-gui-browser refresh-screen",'',d)}" |