[oe-commits] Denis 'GNUtoo' Carikli : gpsd: override gpsd. service to use GPS_DEVICES from /etc/default/gpsd
git at git.openembedded.org
git at git.openembedded.org
Thu Jun 21 18:05:01 UTC 2012
Module: meta-openembedded.git
Branch: master
Commit: 6ba88f7ad957bf2f6fb4527f77697429f7d98a52
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=6ba88f7ad957bf2f6fb4527f77697429f7d98a52
Author: Denis 'GNUtoo' Carikli <GNUtoo at no-log.org>
Date: Thu Jun 21 08:18:45 2012 +0000
gpsd: override gpsd.service to use GPS_DEVICES from /etc/default/gpsd
Without that fix gpsd starts without using the machine specific
gps serial port.
On some devices like the GTA04, not only that makes GPS not work,
but that also prevent suspend because GPS has to be off in order
for suspend to succeed(and the program powering off the GPS
has to know if the GPS is on or off by using gpsd).
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo at no-log.org>
Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>
---
meta-oe/recipes-navigation/gpsd/gpsd/gpsd.service | 10 ++++++++++
meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb | 5 +++--
meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb | 5 +++--
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd/gpsd.service b/meta-oe/recipes-navigation/gpsd/gpsd/gpsd.service
new file mode 100644
index 0000000..7131a58
--- /dev/null
+++ b/meta-oe/recipes-navigation/gpsd/gpsd/gpsd.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=GPS (Global Positioning System) Daemon
+Requires=gpsd.socket
+
+[Service]
+EnvironmentFile=/etc/default/gpsd
+ExecStart=/usr/sbin/gpsd -N $GPS_DEVICES
+
+[Install]
+Also=gpsd.socket
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb
index 4f00cf4..ebc4af6 100644
--- a/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb
+++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800"
DEPENDS = "dbus dbus-glib ncurses python libusb1 chrpath-native"
PROVIDES = "virtual/gpsd"
-PR = "r1"
+PR = "r2"
SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \
file://0001-SConstruct-fix-DSO-build-for-ntpshm-garmin_monitor.patch \
@@ -15,6 +15,7 @@ SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \
file://0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch \
file://0001-SConstruct-disable-html-and-man-docs-building-becaus.patch \
file://gpsd-default \
+ file://gpsd.service \
file://gpsd \
file://60-gpsd.rules \
"
@@ -83,7 +84,7 @@ do_install_append() {
#support for systemd
install -d ${D}${systemd_unitdir}/system/
- install -m 0644 ${S}/systemd/${PN}.service ${D}${systemd_unitdir}/system/${PN}.service
+ install -m 0644 ${WORKDIR}/${PN}.service ${D}${systemd_unitdir}/system/${PN}.service
install -m 0644 ${S}/systemd/${PN}.socket ${D}${systemd_unitdir}/system/${PN}.socket
}
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb
index 60b30df..083163b 100644
--- a/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb
+++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800"
DEPENDS = "dbus dbus-glib ncurses python libusb1"
PROVIDES = "virtual/gpsd"
-PR = "r1"
+PR = "r2"
DEFAULT_PREFERENCE = "-1"
SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \
@@ -16,6 +16,7 @@ SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \
file://0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch \
file://0001-SConstruct-disable-html-and-man-docs-building-becaus.patch \
file://gpsd-default \
+ file://gpsd.service \
file://gpsd \
file://60-gpsd.rules \
"
@@ -84,7 +85,7 @@ do_install_append() {
#support for systemd
install -d ${D}${systemd_unitdir}/system/
- install -m 0644 ${S}/systemd/${PN}.service ${D}${systemd_unitdir}/system/${PN}.service
+ install -m 0644 ${WORKDIR}/${PN}.service ${D}${systemd_unitdir}/system/${PN}.service
install -m 0644 ${S}/systemd/${PN}.socket ${D}${systemd_unitdir}/system/${PN}.socket
}
More information about the Openembedded-commits
mailing list