Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix up debian build, include config files
  • Loading branch information
Lorn Potter committed Jun 17, 2016
1 parent 5b478b6 commit 85f63d8
Show file tree
Hide file tree
Showing 11 changed files with 40 additions and 25 deletions.
2 changes: 1 addition & 1 deletion config.tests/hybris/main.cpp
@@ -1,5 +1,5 @@

#include <android/hardware/sensors.h>
#include <hardware/sensors.h>

int main()
{
Expand Down
8 changes: 8 additions & 0 deletions debian/control
Expand Up @@ -58,3 +58,11 @@ Architecture: any
Depends: sensorfw-qt5 (= ${binary:Version}), libqt5core5a, android-headers, libhardware2
Description: Sensor framework hybris support
Provides support for hybris Sensor framework backend.

Package: libsensorfw-qt5-configs
Section: misc
Priority: extra
Architecture: any
Depends: sensorfw-qt5 (= ${binary:Version}), libqt5core5a, android-headers, libhardware2
Description: Sensor framework hybris support
Provides support for hybris Sensor framework backend.
1 change: 0 additions & 1 deletion debian/libsensorfw-qt5-hybris.dirs
@@ -1,2 +1 @@
/etc/sensorfw/
/usr/lib/sensord-qt5
1 change: 0 additions & 1 deletion debian/libsensorfw-qt5-hybris.install
@@ -1,6 +1,5 @@
/usr/lib/libhybrissensorfw*.so.*
/usr/lib/libhybrissensorfw*.so
/usr/lib/sensord-qt5/libhybris*.so
/etc/sensorfw/sensord-hybris.conf


1 change: 0 additions & 1 deletion debian/libsensorfw-qt5-hybris.postinst
@@ -1,2 +1 @@
/sbin/ldconfig
/usr/bin/sensord-daemon-conf-setup
1 change: 0 additions & 1 deletion debian/libsensorfw-qt5-plugins.dirs
@@ -1,2 +1 @@
/etc/sensorfw/
/usr/lib/sensord-qt5
12 changes: 0 additions & 12 deletions debian/libsensorfw-qt5-plugins.install
@@ -1,15 +1,3 @@
/etc/sensorfw/sensord-aava.conf
/etc/sensorfw/sensord-arm_grouper_0000.conf
/etc/sensorfw/sensord.conf
/etc/sensorfw/sensord-exopc.conf
/etc/sensorfw/sensord-icdk.conf
/etc/sensorfw/sensord-mrst_cdk.conf
/etc/sensorfw/sensord-ncdk.conf
/etc/sensorfw/sensord-oaktrail.conf
/etc/sensorfw/sensord-rm_680.conf
/etc/sensorfw/sensord-rm_696.conf
/etc/sensorfw/sensord-rx_51.conf
/etc/sensorfw/sensord-u8500.conf
/usr/lib/sensord-qt5/libaccelerometeradaptor-qt5.so
/usr/lib/sensord-qt5/libalssensor-qt5.so
/usr/lib/sensord-qt5/libdownsamplefilter-qt5.so
Expand Down
1 change: 0 additions & 1 deletion debian/libsensorfw-qt5-plugins.postinst
@@ -1,2 +1 @@
/sbin/ldconfig
/usr/bin/sensord-daemon-conf-setup
2 changes: 1 addition & 1 deletion debian/rules
Expand Up @@ -48,7 +48,7 @@ configure-stamp: builddir
dh_testdir

# Add here commands to configure the package.
cd $(BUILD_DIR) && qmake $(QMAKECONFIG) "QMAKE_CXXFLAGS=$(CFLAGS)" "MAKE_DOCS=$(MAKE_DOCS)" ../$(PROJECT_NAME).pro
cd $(BUILD_DIR) && qmake $(QMAKECONFIG) CONFIG+="configs" "QMAKE_CXXFLAGS=$(CFLAGS)" "MAKE_DOCS=$(MAKE_DOCS)" ../$(PROJECT_NAME).pro
export LD_RUN_PATH=/usr/lib/sensord-qt5/

touch configure-stamp
Expand Down
5 changes: 1 addition & 4 deletions debian/sensorfw-qt5.install
@@ -1,8 +1,5 @@
/usr/lib/libsensorclient-qt5.so*
/usr/lib/libsensordatatypes-qt5.so*
/usr/lib/libsensorfw-qt5.so*
/usr/sbin/sensord
/usr/sbin/sensorfwd
/etc/dbus-1/system.d/*
/etc/sensorfw/sensord.conf.d/90-sensord-default.conf
/usr/bin/sensord-daemon-conf-setup
/lib/systemd/system/sensord.service
31 changes: 29 additions & 2 deletions sensorfw.pro
Expand Up @@ -17,7 +17,34 @@ SUBDIRS = datatypes \
equals(QT_MAJOR_VERSION, 4): {
SUBDIRS = datatypes qt-api
}


contains(CONFIG,configs) {
# !contains(CONFIG,hybris) {
SENSORDHYBRISCONFIGFILE.files = config/sensord-hybris.conf
SENSORDHYBRISCONFIGFILE.path = /etc/sensorfw
INSTALLS += SENSORDHYBRISCONFIGFILE
# }
SENSORFWCONFIGFILES.files = config/sensord-rx_51.conf \
config/sensord-oaktrail.conf \
config/sensord-exopc.conf \
config/sensord-aava.conf \
config/sensord-rm_696.conf \
config/sensord-arm_grouper_0000.conf \
config/sensord-mrst_cdk.conf \
config/sensord-ncdk.conf \
config/sensord.conf \
config/sensord-rm_680.conf \
config/sensord-icdk.conf \
config/sensord-u8500.conf \

SENSORFWCONFIGFILES.path = /etc/sensorfw

SENSORCONFIG_SETUP.files = config/sensord-daemon-conf-setup
SENSORCONFIG_SETUP.path = /usr/bin

INSTALLS += SENSORFWCONFIGFILES SENSORCONFIG_SETUP
}

contains(CONFIG,hybris) {

SUBDIRS = core/hybris.pro \
Expand Down Expand Up @@ -69,7 +96,7 @@ equals(QT_MAJOR_VERSION, 5): {
SENSORDCONFIGFILES.path = /etc/sensorfw/sensord.conf.d
INSTALLS += SENSORDCONFIGFILES

SENSORSYSTEMD.files = rpm/sensord.service
SENSORSYSTEMD.files = rpm/sensorfwd.service
SENSORSYSTEMD.path = /lib/systemd/system
INSTALLS += SENSORSYSTEMD
}
Expand Down

0 comments on commit 85f63d8

Please sign in to comment.