[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, debian, updated. upstream/0.9.5.5-717-g0f98819

[Felix Huber]

The following commit has been merged in the debian branch:
commit f74e938351b43d57c9bb15c13bd4f89560389a23
Author: Felix Huber <felix.huber at schyf.de>
Date:   Sun Sep 12 11:38:13 2010 +0200

    ogpsd: automatic adjust sysfs node to kernel version

diff --git a/framework/subsystems/ogpsd/om.py b/framework/subsystems/ogpsd/om.py
index 19ceb5c..24bb287 100644
--- a/framework/subsystems/ogpsd/om.py
+++ b/framework/subsystems/ogpsd/om.py
@@ -13,7 +13,7 @@ __version__ = "0.9.9.4"
 MODULE_NAME = "ogpsd"
 
 DEVICE_POWER_PATH_OLD = "/sys/bus/platform/devices/neo1973-pm-gps.0/pwron"
-DEVICE_POWER_PATH_NEW = "/sys/bus/platform/devices/gta02-pm-gps.0/power_on"
+DEVICE_POWER_PATH_NEW = "/sys/bus/platform/devices/neo1973-pm-gps.0/power_on"
 
 from ubx import UBXDevice
 from ubx import CLIDPAIR
@@ -33,6 +33,12 @@ class GTA02Device( UBXDevice ):
 
     def __init__( self, bus, channel ):
 
+        # Kernel specific paths
+        kernel_release = os.uname()[2]
+        if kernel_release >= "2.6.32":
+           DEVICE_POWER_PATH_NEW = "/sys/bus/platform/devices/gta02-pm-gps.0/power_on"
+           logger.info( "Kernel >= 2.6.32, gps sysfs updated" )
+
         # Make sure the GPS is off
         helpers.writeToFile( DEVICE_POWER_PATH_OLD, "1" )
         helpers.writeToFile( DEVICE_POWER_PATH_NEW, "1" )

-- 
FSO frameworkd Debian packaging