From 1c9be561215ac5e240692ea3b44ea9eec4fbe38e Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 5 Aug 2013 18:44:11 +0200
Subject: [PATCH] bcm2835-driver: port to systemd

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/graphics/bcm2835-driver/package.mk   |  8 +++++
 .../bcm2835-driver/profile.d/display.conf     | 32 -------------------
 .../81_vllinit => scripts/setup-framebuffer}  | 11 ++-----
 .../system.d/framebuffer.service              | 11 +++++++
 .../bcm2835-driver/system.d/vcfiled.service   | 11 +++++++
 5 files changed, 33 insertions(+), 40 deletions(-)
 delete mode 100644 packages/graphics/bcm2835-driver/profile.d/display.conf
 rename packages/graphics/bcm2835-driver/{init.d/81_vllinit => scripts/setup-framebuffer} (89%)
 mode change 100644 => 100755
 create mode 100644 packages/graphics/bcm2835-driver/system.d/framebuffer.service
 create mode 100644 packages/graphics/bcm2835-driver/system.d/vcfiled.service

diff --git a/packages/graphics/bcm2835-driver/package.mk b/packages/graphics/bcm2835-driver/package.mk
index b8d37792d5..59c0513c8b 100644
--- a/packages/graphics/bcm2835-driver/package.mk
+++ b/packages/graphics/bcm2835-driver/package.mk
@@ -65,6 +65,9 @@ makeinstall_target() {
     cp -PRv $FLOAT/opt/vc/lib/libvchiq_arm.so $INSTALL/usr/lib
     cp -PRv $FLOAT/opt/vc/lib/libvcos.so $INSTALL/usr/lib
 
+  mkdir -p $INSTALL/usr/lib/bcm2835
+    cp -P $PKG_DIR/scripts/setup-framebuffer $INSTALL/usr/lib/bcm2835
+
 # some usefull debug tools
   mkdir -p $INSTALL/usr/bin
     cp -PRv $FLOAT/opt/vc/bin/vcdbg $INSTALL/usr/bin
@@ -76,3 +79,8 @@ makeinstall_target() {
   mkdir -p $INSTALL/opt/vc
     ln -sf /usr/lib $INSTALL/opt/vc/lib
 }
+
+post_install() {
+  enable_service framebuffer.service
+  enable_service vcfiled.service
+}
\ No newline at end of file
diff --git a/packages/graphics/bcm2835-driver/profile.d/display.conf b/packages/graphics/bcm2835-driver/profile.d/display.conf
deleted file mode 100644
index 76c8265d67..0000000000
--- a/packages/graphics/bcm2835-driver/profile.d/display.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-# This file contains non-OpenELEC evironment variables as well as OpenELEC
-# evironment variables that are not user defined.
-################################################################################
-
-################################################################################
-# setup functions
-################################################################################
-
-# stub function
-  wait_for_xorg () {
-    echo 0 >  /sys/class/vtconsole/vtcon1/bind
-    fbset -g 1 1 1 1 32
-  }
diff --git a/packages/graphics/bcm2835-driver/init.d/81_vllinit b/packages/graphics/bcm2835-driver/scripts/setup-framebuffer
old mode 100644
new mode 100755
similarity index 89%
rename from packages/graphics/bcm2835-driver/init.d/81_vllinit
rename to packages/graphics/bcm2835-driver/scripts/setup-framebuffer
index 9214da8a0c..7be9ce07f4
--- a/packages/graphics/bcm2835-driver/init.d/81_vllinit
+++ b/packages/graphics/bcm2835-driver/scripts/setup-framebuffer
@@ -1,3 +1,4 @@
+#!/bin/sh
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
 #      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
@@ -17,12 +18,6 @@
 #  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
-#
-# set vll dir and run vcfiled service
-#
-# runlevels: openelec
-
-progress "run vcfiled service"
-
-  /usr/sbin/vcfiled
 
+echo 0 >  /sys/class/vtconsole/vtcon1/bind
+fbset -g 1 1 1 1 32
\ No newline at end of file
diff --git a/packages/graphics/bcm2835-driver/system.d/framebuffer.service b/packages/graphics/bcm2835-driver/system.d/framebuffer.service
new file mode 100644
index 0000000000..ebd7232f2b
--- /dev/null
+++ b/packages/graphics/bcm2835-driver/system.d/framebuffer.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Framebuffer setup
+After=multi-user.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/lib/bcm2835/setup-framebuffer
+RemainAfterExit=yes
+
+[Install]
+WantedBy=graphical.target
diff --git a/packages/graphics/bcm2835-driver/system.d/vcfiled.service b/packages/graphics/bcm2835-driver/system.d/vcfiled.service
new file mode 100644
index 0000000000..5e37661151
--- /dev/null
+++ b/packages/graphics/bcm2835-driver/system.d/vcfiled.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=vcfiled
+After=syslog.target
+
+[Service]
+ExecStart=/usr/sbin/vcfiled -f
+KillMode=process
+
+[Install]
+WantedBy=multi-user.target
+