|
[-]
[+]
|
Changed |
_service:tar_git:sensorfw.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:sensorfw-qt5-hybris.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://git.sailfishos.org/mer-core/sensorfw.git</param>
<param name="branch">master</param>
- <param name="revision">e4fd05e4d0dd4387f8edf8224a9ab669aab3bf12</param>
+ <param name="revision">89ed1ef63e080b1097477f4a687201ce3683c222</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Deleted |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.7.tar.bz2/sensord-qt5.pc
^
|
| @@ -1,10 +0,0 @@
-prefix=/usr
-includedir=${prefix}/include/sensord-qt5
-libdir=${prefix}/lib/
-
-Name: Sensorfw-qt5
-Description: Sensord for Qt 5
-Version: 0.11.6
-Requires:
-Libs: -L${libdir} -lsensorclient-qt5 -lsensordatatypes-qt5
-Cflags: -I${includedir} -I${includedir}/datatypes -I${includedir}/filters
|
|
[-]
[+]
|
Deleted |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.7.tar.bz2/tests/tests.xml
^
|
| @@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<testdefinition version="0.1">
- <!-- Test suite, sensorfw-tests for automated testing of sensord -->
- <suite name="Sensorfw-tests" domain="System Software">
- <!-- At least one set per suite, name and description mandatory -->
- <set name="Sensord-automated-tests" description="Unit test cases for sensord" feature="Sensor Framework" requirement="88917">
- <case name="Sensord_Filters" level="Component" type="Functional" description="Unit test cases for sensor filters" timeout="15" subfeature="Sensor Framework">
- <step expected_result="0">/usr/bin/sensorfilters-test</step>
- </case>
- <case name="Sensord_Dataflow" level="Component" type="Functional" description="Sensord dataflow test" timeout="15" subfeature="Sensor Framework">
- <step expected_result="0">/usr/bin/sensordataflow-test</step>
- </case>
- <case name="Sensord_Adaptors" level="Component" type="Functional" description="Unit test cases for sensor adaptors" timeout="15" subfeature="Sensor Framework">
- <step expected_result="0">/usr/bin/sensoradaptors-test</step>
- </case>
- <case name="Sensord_Chains" level="Component" type="Functional" description="Unit test cases for sensor chains" timeout="15" subfeature="Sensor Framework">
- <step>stop sensord</step>
- <step expected_result="0">/usr/bin/sensorchains-test</step>
- <step>start sensord</step>
- <step>sleep 2</step>
- </case>
- <case name="Sensor_Client_API" level="Component" type="Functional" description="Client API tests for sensord" timeout="90" subfeature="Sensor Framework">
- <step expected_result="0">/usr/bin/sensorapi-test</step>
- </case>
- <case name="Sensor_MetaData" level="Component" type="Functional" description="Sensor metadata tests for sensord" timeout="15" subfeature="Sensor Framework">
- <step expected_result="0">/usr/bin/sensormetadata-test</step>
- </case>
- <case name="Dead_Client" type="Functional" level="Component" description="Unit test for properly detecting dead clients." timeout="60" subfeature="Sensor Framework">
- <step expected_result="0">/usr/share/sensorfw-tests/sensord-deadclienttest.py</step>
- </case>
-
- <!-- Environments optional - tells where the tests are run -->
- <environments>
- <scratchbox>false</scratchbox>
- <hardware>true</hardware>
- </environments>
- </set>
-
- <set name="Sensord-memory-tests" description="Memory leak tests for sensord" feature="Sensor Framework" requirement="SensorFw Testing and automation">
- <case name="Sensord_Memory_OpenClose" level="Component" type="Benchmark" description="Memory leak check for session open/close" timeout="200" subfeature="Sensor Framework">
- <step>/usr/bin/sensorbenchmark-test testSessionLeaks</step>
- </case>
- <case name="Sensord_Memory_OpenKill" level="Component" type="Benchmark" description="Memory leak check for session open/kill" timeout="200" subfeature="Sensor Framework">
- <step>/usr/bin/sensorbenchmark-test testLostSessionLeaks</step>
- </case>
-
- <!-- Environments optional - tells where the tests are run -->
- <environments>
- <scratchbox>false</scratchbox>
- <hardware>true</hardware>
- </environments>
- </set>
-
- <set name="Sensord-pm-tests" description="Sensord power management tests" feature="Sensor Framework" requirement="SensorFw Testing and automation">
- <pre_steps>
- <step expected_result="0">/usr/bin/sensordiverter.sh start</step>
- <step>sleep 5</step>
- </pre_steps>
-
- <case name="Sensord_Power_Management" type="Functional" level="Component" description="Sensord power management handling test" timeout="100" subfeature="Sensor Framework">
- <step expected_result="0">/usr/bin/sensorpowermanagement-test</step>
- </case>
-
- <case name="Sensord_Standby_Override" type="Functional" level="Component" description="Sensord standby override test" timeout="100" subfeature="Sensor Framework">
- <step expected_result="0">/usr/bin/sensorstandbyoverride-test</step>
- </case>
-
- <environments>
- <scratchbox>false</scratchbox>
- <hardware>true</hardware>
- </environments>
-
- <post_steps>
- <step expected_result="0">/usr/bin/sensordiverter.sh stop</step>
- </post_steps>
- </set>
-
-
- <set name="Sensord-benchmark-tests" description="Benchmark test cases for sensord" feature="Sensor Framework" requirement="SensorFw Testing and automation">
-
- <pre_steps>
- <!-- Stop sensord, kill to make sure -->
- <step>stop sensord</step>
- <step>killall sensord</step>
- <step>rm -f /tmp/sensorTestSampleRate</step>
- <step>mv /usr/lib/sensord/libalsadaptor.so /usr/lib/sensord/libalsadaptor.so.orig</step>
- <step>ln -s /usr/lib/sensord/testing/libalsadaptor.so /usr/lib/sensord/libalsadaptor.so</step>
- </pre_steps>
-
- <case name="Sensord_Benchmark_50hz" level="Component" type="Benchmark" description="Sensord Benchmark @ 50hz" timeout="45" subfeature="Sensor Framework">
- <step>echo 20 > /tmp/sensorTestSampleRate</step>
- <step>start sensord</step>
- <step>sleep 2</step>
- <step>/usr/bin/sensorbenchmark-test testThroughput</step>
- </case>
- <case name="Sensord_Benchmark_200hz" level="Component" type="Benchmark" description="Sensord Benchmark @ 200hz" timeout="45" subfeature="Sensor Framework">
- <step>stop sensord</step>
- <step>echo 5 > /tmp/sensorTestSampleRate</step>
- <step>start sensord</step>
- <step>sleep 2</step>
- <step>/usr/bin/sensorbenchmark-test testThroughput</step>
- </case>
- <case name="Sensord_Benchmark_500hz" level="Component" type="Benchmark" description="Sensord Benchmark @ 500hz" timeout="45" subfeature="Sensor Framework">
- <step>stop sensord</step>
- <step>echo 2 > /tmp/sensorTestSampleRate</step>
- <step>start sensord</step>
- <step>sleep 2</step>
- <step>/usr/bin/sensorbenchmark-test testThroughput</step>
- </case>
-
- <post_steps>
- <!-- Clean up and restore normal behavior-->
- <step>stop sensord</step>
- <step>rm -f /tmp/sensorTestSampleRate</step>
- <step>rm -f /usr/lib/sensord/libalsadaptor.so</step>
- <step>mv /usr/lib/sensord/libalsadaptor.so.orig /usr/lib/sensord/libalsadaptor.so</step>
- <step>start sensord</step>
- </post_steps>
-
- <!-- Environments optional - tells where the tests are run -->
- <environments>
- <scratchbox>false</scratchbox>
- <hardware>true</hardware>
- </environments>
- </set>
-
- <set name="Sensord-external-tests" description="External issue tests for sensord" feature="Sensor Framework" requirement="SensorFw Testing and automation">
- <case name="Sensord_External" level="Component" type="Functional" description="Check external required API, values etc." timeout="15" subfeature="Sensor Framework" insignificant="true">
- <step>/usr/bin/sensorexternal-test</step>
- </case>
-
- <!-- Environments optional - tells where the tests are run -->
- <environments>
- <scratchbox>false</scratchbox>
- <hardware>true</hardware>
- </environments>
- </set>
-
- </suite>
- </testdefinition>
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.9.tar.bz2/common-install.pri
^
|
| @@ -9,9 +9,9 @@
# Path for headers - remember to add files if they should be installed
publicheaders.path = /usr/include/sensord-qt5
-PLUGINPATH = /usr/lib/sensord-qt5
+PLUGINPATH = $$[QT_INSTALL_LIBS]/sensord-qt5
# Path for shared libraries
-SHAREDLIBPATH = /usr/lib
+SHAREDLIBPATH = $$[QT_INSTALL_LIBS]
INSTALLS += publicheaders
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.9.tar.bz2/core/core.pro
^
|
| @@ -15,6 +15,8 @@
DEPENDPATH += $$SENSORFW_INCLUDEPATHS
INCLUDEPATH += $$SENSORFW_INCLUDEPATHS
+DEFINES += PLUGIN_DIRECTORY=\"\\\"$$[QT_INSTALL_LIBS]/sensord-qt5\\\"\"
+
QMAKE_LIBDIR_FLAGS += -L../datatypes\
-lsensordatatypes-qt5
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.9.tar.bz2/core/hybris.pro
^
|
| @@ -17,7 +17,7 @@
SOURCES += hybrisadaptor.cpp
HEADERS += hybrisadaptor.h
-LIBS += -L/usr/lib -L../datatypes
+LIBS += -L$$[QT_INSTALL_LIBS] -L../datatypes
!contains(CONFIG,binder) {
LIBS += -lhybris-common -lhardware
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.9.tar.bz2/core/loader.cpp
^
|
| @@ -54,7 +54,6 @@
}
#define PLUGIN_PREFIX_ENV "SENSORFW_LIBRARY_PATH"
-#define PLUGIN_DIRECTORY "/usr/lib/sensord-qt5"
#define PLUGIN_PREFIX "lib"
#define PLUGIN_SUFFIX "-qt5.so"
#define SENSOR_SUFFIX "sensor"
|
|
[-]
[+]
|
Added |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.9.tar.bz2/sensord-qt5.pc.in
^
|
| @@ -0,0 +1,10 @@
+prefix=/usr
+includedir=${prefix}/include/sensord-qt5
+libdir=${prefix}/@LIB@
+
+Name: Sensorfw-qt5
+Description: Sensord for Qt 5
+Version: 0.11.6
+Requires:
+Libs: -L${libdir} -lsensorclient-qt5 -lsensordatatypes-qt5
+Cflags: -I${includedir} -I${includedir}/datatypes -I${includedir}/filters
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.9.tar.bz2/sensord.prf
^
|
| @@ -1,5 +1,5 @@
-LIBS += -L/usr/lib/ -lsensorclient-qt5 -lsensordatatypes-qt5
+LIBS += -L$$[QT_INSTALL_LIBS] -lsensorclient-qt5 -lsensordatatypes-qt5
DEPENDPATH += /usr/include/sensord-qt5
INCLUDEPATH += /usr/include/sensord-qt5 /usr/include/sensord-qt5/datatypes /usr/include/sensord-qt5/filters
|
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.9.tar.bz2/sensorfw.pro
^
|
| @@ -65,7 +65,7 @@
publicheaders.files += include/*.h
INSTALLS += PKGCONFIGFILES QTCONFIGFILES
- PKGCONFIGFILES.path = /usr/lib/pkgconfig
+ PKGCONFIGFILES.path = $$[QT_INSTALL_LIBS]/pkgconfig
QTCONFIGFILES.files = sensord.prf
qt-api.depends = datatypes
|
|
[-]
[+]
|
Added |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.9.tar.bz2/tests/tests.xml.in
^
|
| @@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<testdefinition version="0.1">
+ <!-- Test suite, sensorfw-tests for automated testing of sensord -->
+ <suite name="Sensorfw-tests" domain="System Software">
+ <!-- At least one set per suite, name and description mandatory -->
+ <set name="Sensord-automated-tests" description="Unit test cases for sensord" feature="Sensor Framework" requirement="88917">
+ <case name="Sensord_Filters" level="Component" type="Functional" description="Unit test cases for sensor filters" timeout="15" subfeature="Sensor Framework">
+ <step expected_result="0">/usr/bin/sensorfilters-test</step>
+ </case>
+ <case name="Sensord_Dataflow" level="Component" type="Functional" description="Sensord dataflow test" timeout="15" subfeature="Sensor Framework">
+ <step expected_result="0">/usr/bin/sensordataflow-test</step>
+ </case>
+ <case name="Sensord_Adaptors" level="Component" type="Functional" description="Unit test cases for sensor adaptors" timeout="15" subfeature="Sensor Framework">
+ <step expected_result="0">/usr/bin/sensoradaptors-test</step>
+ </case>
+ <case name="Sensord_Chains" level="Component" type="Functional" description="Unit test cases for sensor chains" timeout="15" subfeature="Sensor Framework">
+ <step>stop sensord</step>
+ <step expected_result="0">/usr/bin/sensorchains-test</step>
+ <step>start sensord</step>
+ <step>sleep 2</step>
+ </case>
+ <case name="Sensor_Client_API" level="Component" type="Functional" description="Client API tests for sensord" timeout="90" subfeature="Sensor Framework">
+ <step expected_result="0">/usr/bin/sensorapi-test</step>
+ </case>
+ <case name="Sensor_MetaData" level="Component" type="Functional" description="Sensor metadata tests for sensord" timeout="15" subfeature="Sensor Framework">
+ <step expected_result="0">/usr/bin/sensormetadata-test</step>
+ </case>
+ <case name="Dead_Client" type="Functional" level="Component" description="Unit test for properly detecting dead clients." timeout="60" subfeature="Sensor Framework">
+ <step expected_result="0">/usr/share/sensorfw-tests/sensord-deadclienttest.py</step>
+ </case>
+
+ <!-- Environments optional - tells where the tests are run -->
+ <environments>
+ <scratchbox>false</scratchbox>
+ <hardware>true</hardware>
+ </environments>
+ </set>
+
+ <set name="Sensord-memory-tests" description="Memory leak tests for sensord" feature="Sensor Framework" requirement="SensorFw Testing and automation">
+ <case name="Sensord_Memory_OpenClose" level="Component" type="Benchmark" description="Memory leak check for session open/close" timeout="200" subfeature="Sensor Framework">
+ <step>/usr/bin/sensorbenchmark-test testSessionLeaks</step>
+ </case>
+ <case name="Sensord_Memory_OpenKill" level="Component" type="Benchmark" description="Memory leak check for session open/kill" timeout="200" subfeature="Sensor Framework">
+ <step>/usr/bin/sensorbenchmark-test testLostSessionLeaks</step>
+ </case>
+
+ <!-- Environments optional - tells where the tests are run -->
+ <environments>
+ <scratchbox>false</scratchbox>
+ <hardware>true</hardware>
+ </environments>
+ </set>
+
+ <set name="Sensord-pm-tests" description="Sensord power management tests" feature="Sensor Framework" requirement="SensorFw Testing and automation">
+ <pre_steps>
+ <step expected_result="0">/usr/bin/sensordiverter.sh start</step>
+ <step>sleep 5</step>
+ </pre_steps>
+
+ <case name="Sensord_Power_Management" type="Functional" level="Component" description="Sensord power management handling test" timeout="100" subfeature="Sensor Framework">
+ <step expected_result="0">/usr/bin/sensorpowermanagement-test</step>
+ </case>
+
+ <case name="Sensord_Standby_Override" type="Functional" level="Component" description="Sensord standby override test" timeout="100" subfeature="Sensor Framework">
+ <step expected_result="0">/usr/bin/sensorstandbyoverride-test</step>
+ </case>
+
+ <environments>
+ <scratchbox>false</scratchbox>
+ <hardware>true</hardware>
+ </environments>
+
+ <post_steps>
+ <step expected_result="0">/usr/bin/sensordiverter.sh stop</step>
+ </post_steps>
+ </set>
+
+
+ <set name="Sensord-benchmark-tests" description="Benchmark test cases for sensord" feature="Sensor Framework" requirement="SensorFw Testing and automation">
+
+ <pre_steps>
+ <!-- Stop sensord, kill to make sure -->
+ <step>stop sensord</step>
+ <step>killall sensord</step>
+ <step>rm -f /tmp/sensorTestSampleRate</step>
+ <step>mv @LIBDIR@/sensord/libalsadaptor.so @LIBDIR@/sensord/libalsadaptor.so.orig</step>
+ <step>ln -s @LIBDIR@/sensord/testing/libalsadaptor.so @LIBDIR@/sensord/libalsadaptor.so</step>
+ </pre_steps>
+
+ <case name="Sensord_Benchmark_50hz" level="Component" type="Benchmark" description="Sensord Benchmark @ 50hz" timeout="45" subfeature="Sensor Framework">
+ <step>echo 20 > /tmp/sensorTestSampleRate</step>
+ <step>start sensord</step>
+ <step>sleep 2</step>
+ <step>/usr/bin/sensorbenchmark-test testThroughput</step>
+ </case>
+ <case name="Sensord_Benchmark_200hz" level="Component" type="Benchmark" description="Sensord Benchmark @ 200hz" timeout="45" subfeature="Sensor Framework">
+ <step>stop sensord</step>
+ <step>echo 5 > /tmp/sensorTestSampleRate</step>
+ <step>start sensord</step>
+ <step>sleep 2</step>
+ <step>/usr/bin/sensorbenchmark-test testThroughput</step>
+ </case>
+ <case name="Sensord_Benchmark_500hz" level="Component" type="Benchmark" description="Sensord Benchmark @ 500hz" timeout="45" subfeature="Sensor Framework">
+ <step>stop sensord</step>
+ <step>echo 2 > /tmp/sensorTestSampleRate</step>
+ <step>start sensord</step>
+ <step>sleep 2</step>
+ <step>/usr/bin/sensorbenchmark-test testThroughput</step>
+ </case>
+
+ <post_steps>
+ <!-- Clean up and restore normal behavior-->
+ <step>stop sensord</step>
+ <step>rm -f /tmp/sensorTestSampleRate</step>
+ <step>rm -f @LIBDIR@/sensord/libalsadaptor.so</step>
+ <step>mv @LIBDIR@/sensord/libalsadaptor.so.orig @LIBDIR@/sensord/libalsadaptor.so</step>
+ <step>start sensord</step>
+ </post_steps>
+
+ <!-- Environments optional - tells where the tests are run -->
+ <environments>
+ <scratchbox>false</scratchbox>
+ <hardware>true</hardware>
+ </environments>
+ </set>
+
+ <set name="Sensord-external-tests" description="External issue tests for sensord" feature="Sensor Framework" requirement="SensorFw Testing and automation">
+ <case name="Sensord_External" level="Component" type="Functional" description="Check external required API, values etc." timeout="15" subfeature="Sensor Framework" insignificant="true">
+ <step>/usr/bin/sensorexternal-test</step>
+ </case>
+
+ <!-- Environments optional - tells where the tests are run -->
+ <environments>
+ <scratchbox>false</scratchbox>
+ <hardware>true</hardware>
+ </environments>
+ </set>
+
+ </suite>
+ </testdefinition>
|
|
[-]
[+]
|
Changed |
_service:tar_git:sensorfw-qt5-hybris.inc
^
|
| @@ -37,7 +37,7 @@
%build
unset LD_AS_NEEDED
-export LD_RUN_PATH=/usr/lib/sensord-qt5/
+export LD_RUN_PATH=%{_libdir}/sensord-qt5/
export QT_SELECT=5
%qmake5 CONFIG+=hybris %{qmake_extra_parameters} PC_VERSION=`echo %{version} | sed 's/+.*//'`
|
|
[-]
[+]
|
Changed |
_service:tar_git:sensorfwd.service
^
|
| @@ -12,8 +12,7 @@
Restart=always
RestartSec=1
# Sandboxing
-CapabilityBoundingSet=CAP_DAC_OVERRIDE CAP_FOWNER
-PrivateNetwork=true
+CapabilityBoundingSet=CAP_BLOCK_SUSPEND CAP_DAC_OVERRIDE CAP_FOWNER
PrivateTmp=yes
ProtectHome=yes
ProtectSystem=full
|
