From 6003adf0ac800931282115323fa3d0de0cd6919f Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@dv9000.openelec.tv>
Date: Mon, 4 May 2009 22:59:33 +0200
Subject: [PATCH] update to flashrom-0.9.0

---
 .../elisa/scripts/xinitrc.d/99_elisa           |  6 +++---
 .../sysutils/busybox/scripts/acpi_powerbtn     |  1 +
 .../sysutils/busybox/scripts/init.initramfs    |  5 +++--
 .../flashrom/patches/flashrom_disable_svn.diff | 18 ------------------
 packages/tools/flashrom/url                    |  2 +-
 packages/virtual/Xorg/init.d/65_xorg           |  6 +++---
 6 files changed, 11 insertions(+), 27 deletions(-)
 delete mode 100644 packages/tools/flashrom/patches/flashrom_disable_svn.diff

diff --git a/packages/python/multimedia/elisa/scripts/xinitrc.d/99_elisa b/packages/python/multimedia/elisa/scripts/xinitrc.d/99_elisa
index 91d1c61737..d225050d4f 100644
--- a/packages/python/multimedia/elisa/scripts/xinitrc.d/99_elisa
+++ b/packages/python/multimedia/elisa/scripts/xinitrc.d/99_elisa
@@ -13,10 +13,10 @@ args=""
 if /usr/bin/test "${ELISA_DEBUG}" = "yes" ; then
     args="${args} ELISA_DEBUG=*:5"
     args="${args} GST_DEBUG_NO_COLOR=1"
-    args="${args} GST_DEBUG="*:5
+    args="${args} GST_DEBUG=GST_ELEMENT_FACTORY:3"
     args="${args} -l"
 fi
-
+#    args="${args} GST_DEBUG=*:5"
 #    args="${args} GST_DEBUG=GST_ELEMENT_FACTORY:3"
 
 if /usr/bin/test "${ELISA_FULLSCREEN}" = "yes" ; then
@@ -28,4 +28,4 @@ if /usr/bin/test "${ELISA_DEBUG}" = "yes" ; then
   /usr/bin/mrxvt
 else
   /usr/bin/elisa ${args} > /dev/null 2>&1
-fi
\ No newline at end of file
+fi
diff --git a/packages/sysutils/busybox/scripts/acpi_powerbtn b/packages/sysutils/busybox/scripts/acpi_powerbtn
index 546378b43d..c40703d3f1 100755
--- a/packages/sysutils/busybox/scripts/acpi_powerbtn
+++ b/packages/sysutils/busybox/scripts/acpi_powerbtn
@@ -1,3 +1,4 @@
 #!/bin/sh
 
+/bin/sync
 /sbin/poweroff
diff --git a/packages/sysutils/busybox/scripts/init.initramfs b/packages/sysutils/busybox/scripts/init.initramfs
index 75afba9ee6..fd268ed627 100755
--- a/packages/sysutils/busybox/scripts/init.initramfs
+++ b/packages/sysutils/busybox/scripts/init.initramfs
@@ -18,16 +18,17 @@
     /bin/busybox mount -o remount,ro /flash
     /bin/busybox sync
     echo "... done"
-    echo "System reboots in 5 seconds"
-    /bin/busybox sleep 5
+    echo "System reboots now"
     /bin/busybox reboot
   fi
+#    /bin/busybox sleep 5
 
   if [ -f "/storage/.update/openelec.system" ]; then
     echo "updating System..."
     /bin/busybox mount -o remount,rw /flash
     /bin/busybox mv /storage/.update/openelec.system /flash/openelec.system
     /bin/busybox mount -o remount,ro /flash
+    /bin/busybox sync
     echo "... done"
   fi
 
diff --git a/packages/tools/flashrom/patches/flashrom_disable_svn.diff b/packages/tools/flashrom/patches/flashrom_disable_svn.diff
deleted file mode 100644
index 75d04dc54f..0000000000
--- a/packages/tools/flashrom/patches/flashrom_disable_svn.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naur flashrom/Makefile flashrom.patch/Makefile
---- flashrom/Makefile	2009-04-14 03:43:10.000000000 +0200
-+++ flashrom.patch/Makefile	2009-04-17 00:00:43.238159402 +0200
-@@ -40,8 +40,7 @@
- 
- # Set the flashrom version string from the highest revision number
- # of the checked out flashrom files.
--SVNDEF := -D'FLASHROM_VERSION="$(shell svnversion -cn . \
--          | sed -e "s/.*://" -e "s/\([0-9]*\).*/\1/")"'
-+ SVNDEF := -D'FLASHROM_VERSION="$(shell cat version)"'
- 
- $(PROGRAM): $(OBJS)
- 	$(CC) -o $(PROGRAM) $(OBJS) $(LDFLAGS)
-diff -Naur flashrom/version flashrom.patch/version
---- flashrom/version	1970-01-01 01:00:00.000000000 +0100
-+++ flashrom.patch/version	2009-04-16 23:59:52.958410419 +0200
-@@ -0,0 +1 @@
-+4107
diff --git a/packages/tools/flashrom/url b/packages/tools/flashrom/url
index 0646aafb05..78d3973ea5 100644
--- a/packages/tools/flashrom/url
+++ b/packages/tools/flashrom/url
@@ -1 +1 @@
-http://sources.openelec.tv/svn/flashrom-svn-4115.tar.bz2
\ No newline at end of file
+http://qa.coreboot.org/releases/flashrom-0.9.0.tar.bz2
\ No newline at end of file
diff --git a/packages/virtual/Xorg/init.d/65_xorg b/packages/virtual/Xorg/init.d/65_xorg
index 413d3d6e26..a5ae3c6ca1 100755
--- a/packages/virtual/Xorg/init.d/65_xorg
+++ b/packages/virtual/Xorg/init.d/65_xorg
@@ -11,8 +11,8 @@ progress "starting Xorg"
 #  modprobe drm
 mkdir -p /var/lib/xkb/
 
-if /usr/bin/test "${ELISA_DEBUG}" = "yes" ; then
-  mount -o bind /storage /var/log
-fi
+#if /usr/bin/test "${ELISA_DEBUG}" = "yes" ; then
+#  mount -o bind /storage /var/log
+#fi
 
 xinit $XINITRC -- $XSERVERRC > /dev/null 2>&1