From 6120742bb848f6ccdc13c70a060cbb93bcbe8841 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Wed, 6 Jun 2012 00:29:31 +0200 Subject: 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 --- 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(-) create mode 100644 meta-oe/recipes-navigation/gpsd/gpsd/gpsd.service 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 0000000000..7131a589d7 --- /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 4f00cf4602..ebc4af6d69 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 60b30df15e..083163b6d3 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 } -- cgit 1.2.3-korg