Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
sensorfw
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Labels
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Jobs
Commits
Open sidebar
mer-core
sensorfw
Commits
14f7c8db
Commit
14f7c8db
authored
May 05, 2013
by
Lorn Potter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[sensorfw] remove mce, change daemon output to syslog/journal
parent
45dfcc51
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
21 additions
and
14 deletions
+21
-14
makedist
makedist
+2
-1
rpm/sensord.service
rpm/sensord.service
+1
-1
rpm/sensorfw-qt5.spec
rpm/sensorfw-qt5.spec
+11
-6
rpm/sensorfw-qt5.yaml
rpm/sensorfw-qt5.yaml
+2
-4
rpm/sensorfw.spec
rpm/sensorfw.spec
+2
-1
rpm/sensorfw.yaml
rpm/sensorfw.yaml
+1
-1
sensorfw.pro
sensorfw.pro
+2
-0
No files found.
makedist
View file @
14f7c8db
...
...
@@ -15,10 +15,11 @@ PROJECT=sensorfw
# Parse it from any Qt *.pro or *.pri files in CWD:
# PROJECT=$(grep -E "TARGET ?= ?" *.pr[io]|cut -d' ' -f3)
while
getopts
ht: o
while
getopts
q
ht: o
do case
$o
in
h
)
head
=
1
;;
t
)
TAG
=
"
$OPTARG
"
;;
q
)
PROJECT
=
sensorfw-qt5
;;
?
)
printf
>
&2
"Usage:
$0
[-h] [-t TAG]
\n
"
exit
2
;;
esac
...
...
rpm/sensord.service
View file @
14f7c8db
...
...
@@ -5,7 +5,7 @@ After=boardname.service
[Service]
Type=forking
ExecStartPre=/bin/sh /usr/bin/sensord-daemon-conf-setup
ExecStart=/usr/sbin/sensord -c=/etc/sensorfw/primaryuse.conf -d --log-target=
4 --log-file-path=/var/log/sensord.lo
g
ExecStart=/usr/sbin/sensord -c=/etc/sensorfw/primaryuse.conf -d --log-target=
8 --log-level=warnin
g
ExecReload=/bin/kill -HUP $MAINPID
[Install]
...
...
rpm/sensorfw-qt5.spec
View file @
14f7c8db
...
...
@@ -9,7 +9,7 @@ Name: sensorfw-qt5
# << macros
Summary: Sensor Framework Qt5
Version: 0.7.2.
2
Version: 0.7.2.
4
Release: 0
Group: System/Sensor Framework
License: LGPLv2+
...
...
@@ -33,7 +33,7 @@ BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(Qt5Test)
BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: pkgconfig(mce)
#
BuildRequires: pkgconfig(mce)
Obsoletes: sensorframework
...
...
@@ -94,8 +94,9 @@ export LD_RUN_PATH=/usr/lib/sensord/
# << build pre
export QT_SELECT=5
%qmake \
CONFIG+=mce
%qmake5
#\
# CONFIG+=mce
make %{?jobs:-j%jobs}
...
...
@@ -132,6 +133,12 @@ systemctl reload-or-try-restart sensord.service
/sbin/ldconfig
systemctl daemon-reload
%post tests
/sbin/ldconfig
%postun tests
/sbin/ldconfig
%files
%defattr(-,root,root,-)
# >> files
...
...
@@ -158,8 +165,6 @@ systemctl daemon-reload
%{_libdir}/pkgconfig/*
%{_includedir}/sensord-qt5/*
%{_datadir}/qt5/mkspecs/features/sensord.prf
# From docs
#%attr(644,root,root)%{_defaultdocdir}/sensord/html/*
# << files devel
%files tests
...
...
rpm/sensorfw-qt5.yaml
View file @
14f7c8db
Name
:
sensorfw-qt5
Summary
:
Sensor Framework Qt5
Version
:
0.7.2.
2
Version
:
0.7.2.
4
Release
:
0
Group
:
"
System/Sensor
Framework"
License
:
LGPLv2+
...
...
@@ -20,7 +20,6 @@ Requires:
PkgConfigBR
:
-
Qt5Core
-
gconf-2.0
-
mce
#PkgBR:
# - doxygen
...
...
@@ -33,8 +32,7 @@ Configure: none
Builder
:
qmake5
UseAsNeeded
:
no
QMakeOptions
:
-
"
CONFIG+=mce"
#QMakeOptions:
SubPackages
:
-
Name
:
devel
...
...
rpm/sensorfw.spec
View file @
14f7c8db
...
...
@@ -9,7 +9,7 @@ Name: sensorfw
# << macros
Summary: Sensor Framework
Version: 0.7.2.
2
Version: 0.7.2.
4
Release: 0
Group: System/Sensor Framework
License: LGPLv2+
...
...
@@ -23,6 +23,7 @@ Requires: qt
Requires: GConf-dbus
Requires: %{name}-configs
Requires: systemd
Requires: mce
Requires(preun): systemd
Requires(post): /sbin/ldconfig
Requires(post): systemd
...
...
rpm/sensorfw.yaml
View file @
14f7c8db
Name
:
sensorfw
Summary
:
Sensor Framework
Version
:
0.7.2.
2
Version
:
0.7.2.
4
Release
:
0
Group
:
"
System/Sensor
Framework"
License
:
LGPLv2+
...
...
sensorfw.pro
View file @
14f7c8db
...
...
@@ -57,3 +57,5 @@ equals(QT_MAJOR_VERSION, 5): {
OTHER_FILES += rpm/sensorfw-qt5.spec \
rpm/sensorfw-qt5.yaml
}
OTHER_FILES += config
/*
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment