diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2012-04-24 17:43:35 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2012-04-29 23:29:33 +0200 |
commit | c09342fd6cc4644eb8114bdd2f004856c8546d50 (patch) | |
tree | 43e792c769e8f8f140fdb54763d536a7dcd76ef3 /meta-oe/recipes-navigation | |
parent | 112193fcdfa67a581b5a218a2c766d507f972746 (diff) | |
download | meta-openembedded-c09342fd6cc4644eb8114bdd2f004856c8546d50.tar.gz |
gpsd: use gpsd.service and gpsd.socket from source tree, drop local files
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-navigation')
-rw-r--r-- | meta-oe/recipes-navigation/gpsd/gpsd/gpsd.service | 9 | ||||
-rw-r--r-- | meta-oe/recipes-navigation/gpsd/gpsd/gpsd.socket | 9 | ||||
-rw-r--r-- | meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb | 7 |
3 files changed, 5 insertions, 20 deletions
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd/gpsd.service b/meta-oe/recipes-navigation/gpsd/gpsd/gpsd.service deleted file mode 100644 index 8deaf759a..000000000 --- a/meta-oe/recipes-navigation/gpsd/gpsd/gpsd.service +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | [Unit] | ||
2 | Description=GPS (Global Positioning System) Daemon | ||
3 | Requires=gpsd.socket | ||
4 | |||
5 | [Service] | ||
6 | ExecStart=/usr/sbin/gpsd -N | ||
7 | |||
8 | [Install] | ||
9 | Also=gpsd.socket | ||
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd/gpsd.socket b/meta-oe/recipes-navigation/gpsd/gpsd/gpsd.socket deleted file mode 100644 index 13c17f248..000000000 --- a/meta-oe/recipes-navigation/gpsd/gpsd/gpsd.socket +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | [Unit] | ||
2 | Description=GPS (Global Positioning System) Daemon Sockets | ||
3 | |||
4 | [Socket] | ||
5 | ListenStream=/var/run/gpsd.sock | ||
6 | ListenStream=127.0.0.1:2947 | ||
7 | |||
8 | [Install] | ||
9 | WantedBy=sockets.target | ||
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb index 37fb79d10..d139091fd 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb +++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb | |||
@@ -11,8 +11,6 @@ SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \ | |||
11 | file://0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch \ | 11 | file://0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch \ |
12 | file://gpsd-default \ | 12 | file://gpsd-default \ |
13 | file://gpsd \ | 13 | file://gpsd \ |
14 | file://gpsd.socket \ | ||
15 | file://gpsd.service \ | ||
16 | file://60-gpsd.rules \ | 14 | file://60-gpsd.rules \ |
17 | " | 15 | " |
18 | SRC_URI[md5sum] = "c01353459faa68834309109d4e868460" | 16 | SRC_URI[md5sum] = "c01353459faa68834309109d4e868460" |
@@ -72,6 +70,11 @@ do_install_append() { | |||
72 | #support for python | 70 | #support for python |
73 | install -d ${D}/${PYTHON_SITEPACKAGES_DIR}/gps | 71 | install -d ${D}/${PYTHON_SITEPACKAGES_DIR}/gps |
74 | install -m 755 ${S}/gps/*.py ${D}/${PYTHON_SITEPACKAGES_DIR}/gps | 72 | install -m 755 ${S}/gps/*.py ${D}/${PYTHON_SITEPACKAGES_DIR}/gps |
73 | |||
74 | #support for systemd | ||
75 | install -d ${D}${systemd_unitdir}/system/ | ||
76 | install -m 0644 ${S}/systemd/${PN}.service ${D}${systemd_unitdir}/system/${PN}.service | ||
77 | install -m 0644 ${S}/systemd/${PN}.socket ${D}${systemd_unitdir}/system/${PN}.socket | ||
75 | } | 78 | } |
76 | 79 | ||
77 | pkg_postinst_${PN}-conf() { | 80 | pkg_postinst_${PN}-conf() { |