[sensorfw] set primaryuse.conf for hybris based sensors

bump version to 0.7.3.4
sailfishos · Sep 2, 2013 · f6c1927 · f6c1927
1 parent 5b7a6c5
commit f6c1927
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 14 deletions.
diff --git a/rpm/sensord-daemon-conf-setup b/rpm/sensord-daemon-conf-setup
@@ -2,19 +2,23 @@
 
 if [ -x "/usr/sbin/sensord" ] ; then
 	if [ ! -f "/etc/sensorfw/primaryuse.conf" ] ; then 
+               # If hybrissensorfw lib is found, use that
+        if [ -f /usr/lib/libhybrissensorfw*.so ]; then
+            ln -s sensord-hybris.conf /etc/sensorfw/primaryuse.conf
+        else
           		# Determine the correct "primary" config file: the first conf file
                 # whose basename is a substring of boardname, if any (i.e. 'foo.conf'
                 # matches all devices which have 'foo' in their /etc/boardname)
-        if [ -f /etc/boardname ]; then
-            for f in /etc/sensorfw/*conf; do
-                fbase=`basename $f '.conf' | sed s/sensord-//`
-                grep -q $fbase /etc/boardname
-                if [ $? -eq 0 ]; then
-                    ln -s $f /etc/sensorfw/primaryuse.conf
-                    break
-                fi
-            done
+            if [ -f /etc/boardname ]; then
+                for f in /etc/sensorfw/*conf; do
+                    fbase=`basename $f '.conf' | sed s/sensord-//`
+                    grep -q $fbase /etc/boardname
+                    if [ $? -eq 0 ]; then
+                        ln -s $f /etc/sensorfw/primaryuse.conf
+                        break
+                    fi
+                done
+            fi
         fi
-
     fi
 fi
diff --git a/rpm/sensorfw-qt5-hybris.spec b/rpm/sensorfw-qt5-hybris.spec
@@ -9,7 +9,7 @@ Name:       hybris-libsensorfw-qt5
 # << macros
 
 Summary:    Sensor Framework Qt5
-Version:    0.7.3.3
+Version:    0.7.3.4
 Release:    0
 Group:      System/Sensor Framework
 License:    LGPLv2+

diff --git a/rpm/sensorfw-qt5-hybris.yaml b/rpm/sensorfw-qt5-hybris.yaml
@@ -1,6 +1,6 @@
 Name: sensorfw-qt5
 Summary: Sensor Framework Qt5
-Version: 0.7.3.3
+Version: 0.7.3.4
 Release: 0
 Group: "System/Sensor Framework"
 License: LGPLv2+

diff --git a/rpm/sensorfw-qt5.spec b/rpm/sensorfw-qt5.spec
@@ -9,7 +9,7 @@ Name:       sensorfw-qt5
 # << macros
 
 Summary:    Sensor Framework Qt5
-Version:    0.7.3.3
+Version:    0.7.3.4
 Release:    0
 Group:      System/Sensor Framework
 License:    LGPLv2+

diff --git a/rpm/sensorfw-qt5.yaml b/rpm/sensorfw-qt5.yaml
@@ -1,6 +1,6 @@
 Name: sensorfw-qt5
 Summary: Sensor Framework Qt5
-Version: 0.7.3.3
+Version: 0.7.3.4
 Release: 0
 Group: "System/Sensor Framework"
 License: LGPLv2+