From 66b75c814beed9a79d93accbc16a75db3db3d79b Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Wed, 7 Aug 2013 11:15:38 +0200
Subject: [PATCH] bcm2835-driver: simplyfing framebuffer service script

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/graphics/bcm2835-driver/package.mk   |  3 ---
 .../bcm2835-driver/scripts/setup-framebuffer  | 23 -------------------
 .../system.d/framebuffer.service              |  4 ++--
 3 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100755 packages/graphics/bcm2835-driver/scripts/setup-framebuffer

diff --git a/packages/graphics/bcm2835-driver/package.mk b/packages/graphics/bcm2835-driver/package.mk
index 59c0513c8b..e1db4ab804 100644
--- a/packages/graphics/bcm2835-driver/package.mk
+++ b/packages/graphics/bcm2835-driver/package.mk
@@ -65,9 +65,6 @@ 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
diff --git a/packages/graphics/bcm2835-driver/scripts/setup-framebuffer b/packages/graphics/bcm2835-driver/scripts/setup-framebuffer
deleted file mode 100755
index 7be9ce07f4..0000000000
--- a/packages/graphics/bcm2835-driver/scripts/setup-framebuffer
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-################################################################################
-#      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
-################################################################################
-
-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
index ebd7232f2b..6c3464d3c6 100644
--- a/packages/graphics/bcm2835-driver/system.d/framebuffer.service
+++ b/packages/graphics/bcm2835-driver/system.d/framebuffer.service
@@ -4,8 +4,8 @@ After=multi-user.target
 
 [Service]
 Type=oneshot
-ExecStart=/usr/lib/bcm2835/setup-framebuffer
-RemainAfterExit=yes
+ExecStartPre=/bin/sh -c 'echo 0 >  /sys/class/vtconsole/vtcon1/bind'
+ExecStart=/sbin/fbset -g 1 1 1 1 32
 
 [Install]
 WantedBy=graphical.target