matrix-gui 2.0: remove initscript, lighttpd takes care of that now

Also get rid of browser dependency, it's not needed for the server to work

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

2 files changed, 3 insertions, 24 deletions

diff --git a/recipes-ti/matrix/matrix-gui/matrix-gui.service b/recipes-ti/matrix/matrix-gui/matrix-gui.service
deleted file mode 100644
index cc606194..00000000
--- a/recipes-ti/matrix/matrix-gui/matrix-gui.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Texas Instruments Matrix GUI
-ConditionPathExists=|__MATRIX_BASE_DIR__
-
-[Service]
-WorkingDirectory=__MATRIX_BASE_DIR__
-ExecStart=/usr/bin/node -- server.js
-
-[Install]
-WantedBy=multi-user.target
diff --git a/recipes-ti/matrix/matrix-gui_2.0.bb b/recipes-ti/matrix/matrix-gui_2.0.bb
index a0965d57..dde76eef 100644
--- a/recipes-ti/matrix/matrix-gui_2.0.bb
+++ b/recipes-ti/matrix/matrix-gui_2.0.bb
@@ -6,15 +6,14 @@ LIC_FILES_CHKSUM = "file://scripts/jquery-1.6.2.min.js;md5=a1a8cb16a060f6280a767
 
 SECTION = "multimedia"
 
-PR = "r3"
+PR = "r4"
 
 inherit allarch
 
 BRANCH ?= "master"
 SRCREV = "8e2bd5ffdded23bb662476fcd2490fa1526801f8"
 
-SRC_URI = "git://gitorious.org/matrix-gui-v2/matrix-gui-v2.git;protocol=git;branch=${BRANCH} \
-           file://matrix-gui.service"
+SRC_URI = "git://gitorious.org/matrix-gui-v2/matrix-gui-v2.git;protocol=git;branch=${BRANCH}"
 
 require matrix-gui-paths.inc
 
@@ -27,18 +26,8 @@ do_install(){
 
     # Install our php.ini file
     install -m 0644 ${WORKDIR}/php.ini ${D}${MATRIX_BASE_DIR}/
-
-    # Set the proper path in the init script
-    sed -i -e s=__MATRIX_WEB_DIR__=${MATRIX_WEB_DIR}=g ${WORKDIR}/matrix-gui.service
-
-        install -d ${D}${base_libdir}/systemd/system/
-    install -m 0755 ${WORKDIR}/matrix-gui.service ${D}${base_libdir}/systemd/system/
-
-        # activate it on first boot
-        install -d ${D}${base_libdir}/systemd/system/multi-user.target.wants
-        ln -sf ../matrix-gui.service ${D}${base_libdir}/systemd/system/multi-user.target.wants/
 }
 
-RDEPENDS_${PN} += "lighttpd lighttpd-module-cgi lighttpd-module-compress lighttpd-module-expire php php-cgi php-cli matrix-gui-browser"
+RDEPENDS_${PN} += "lighttpd lighttpd-module-cgi lighttpd-module-compress lighttpd-module-expire php php-cgi php-cli"
 
 FILES_${PN} += "${MATRIX_BASE_DIR}/*"