From 2f0150c453dcdab6f8f95066c888e141c628a822 Mon Sep 17 00:00:00 2001
From: Grazvydas Ignotas <notasas@gmail.com>
Date: Fri, 12 Dec 2014 00:33:01 +0200
Subject: [PATCH] libgles-omap3-es23: use correct kernel module for cc/rebirth

also cleanup pre/post-install commands
---
 recipes/powervr-drivers/files/rc.pvr          | 19 ++++++++++++-------
 .../libgles-omap3-es23_4.00.00.01.bb          |  2 +-
 recipes/powervr-drivers/libgles-omap3.inc     | 11 ++++-------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/recipes/powervr-drivers/files/rc.pvr b/recipes/powervr-drivers/files/rc.pvr
index fe4bd4c759..20252c566d 100755
--- a/recipes/powervr-drivers/files/rc.pvr
+++ b/recipes/powervr-drivers/files/rc.pvr
@@ -99,15 +99,20 @@ fbset -vyres $(expr $YRES \* 3)
 		for lib in /usr/lib/ES${ES_REVISION}.0/*.so*; do
 			install_lib $lib
 		done
-		cp -a /usr/bin/ES${ES_REVISION}.0/* /usr/bin	
+		cp -a /usr/bin/ES${ES_REVISION}.0/* /usr/bin/
 		echo "${ES_REVISION}" > /etc/powervr-esrev
-		sync
-		touch /etc/powervr-kmodver
-		oldkmod=`cat /etc/powervr-kmodver`
-		if [ "${sdkver}" != "${oldkmod}" ]; then
-			echo "Switching driver to ${sdkver}"
-			echo "${sdkver}" > /etc/powervr-kmodver
+
+		# if /etc/powervr-kmodver is available, trust it, else figure out something
+		if ! test -e /etc/powervr-kmodver; then
+			touch /etc/powervr-kmodver
+			# for 1.4.14.2616 there are 2 incompatible modules,
+			# assume the default one, which is selected by empty powervr-kmodver
+			if [ "${sdkver}" != "1.4.14.2616" ]; then
+				echo "Switching driver to ${sdkver}"
+				echo "${sdkver}" > /etc/powervr-kmodver
+			fi
 		fi
+		sync
 	fi
 
 	load_driver
diff --git a/recipes/powervr-drivers/libgles-omap3-es23_4.00.00.01.bb b/recipes/powervr-drivers/libgles-omap3-es23_4.00.00.01.bb
index b69e21f6f3..5079634d10 100644
--- a/recipes/powervr-drivers/libgles-omap3-es23_4.00.00.01.bb
+++ b/recipes/powervr-drivers/libgles-omap3-es23_4.00.00.01.bb
@@ -6,7 +6,7 @@ ES5LOCATION = "none"
 
 require libgles-omap3.inc
 
-PR = "r4"
+PR = "r5"
 
 SGXPV = "4_00_00_01"
 IMGPV = "1.4.14.2616"
diff --git a/recipes/powervr-drivers/libgles-omap3.inc b/recipes/powervr-drivers/libgles-omap3.inc
index c9b9135573..74257a7cdf 100644
--- a/recipes/powervr-drivers/libgles-omap3.inc
+++ b/recipes/powervr-drivers/libgles-omap3.inc
@@ -248,16 +248,13 @@ inherit update-rc.d
 INITSCRIPT_NAME = "pvr-init"
 INITSCRIPT_PARAMS = "start 30 5 2 . stop 40 0 1 6 ."
 
-# Append to update-rc.d postinst
-pkg_postinst_${PN}_prepend() {
+pkg_preinst_${PN}_prepend() {
 rm -f /etc/powervr-esrev
 rm -f /etc/powervr-kmodver
+}
 
+# Append to update-rc.d postinst
+pkg_postinst_${PN}_prepend() {
 ln -sf /usr/lib/libXdmcp.so.6.0.0 /usr/lib/libXdmcp.so.0 
 ln -sf /usr/lib/libXau.so.6.0.0 /usr/lib/libXau.so.0
-
-# as postinst_prepend doesn't seem to put this before update-rc.d,
-# we need this lame hack to apply ES lib fixup
-/etc/init.d/pvr-init stop
-/etc/init.d/pvr-init start
 }
-- 
2.39.2