diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-13 14:29:26 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-15 16:22:04 +0200 |
commit | e965f6efc0942b08f5ab39a623833ebe8f39115e (patch) | |
tree | 7727c3308f9b5adbca406d591242ac0a974903ee /meta-oe/recipes-navigation | |
parent | 87259e3768de680a7cb39fc9e0959a4387fb57f2 (diff) | |
download | meta-openembedded-e965f6efc0942b08f5ab39a623833ebe8f39115e.tar.gz |
gpsd: move systemd support from meta-systemd back to meta-oe
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 | 10 | ||||
-rw-r--r-- | meta-oe/recipes-navigation/gpsd/gpsd_3.7.bb | 17 |
2 files changed, 24 insertions, 3 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 000000000..7131a589d --- /dev/null +++ b/meta-oe/recipes-navigation/gpsd/gpsd/gpsd.service | |||
@@ -0,0 +1,10 @@ | |||
1 | [Unit] | ||
2 | Description=GPS (Global Positioning System) Daemon | ||
3 | Requires=gpsd.socket | ||
4 | |||
5 | [Service] | ||
6 | EnvironmentFile=/etc/default/gpsd | ||
7 | ExecStart=/usr/sbin/gpsd -N $GPS_DEVICES | ||
8 | |||
9 | [Install] | ||
10 | Also=gpsd.socket | ||
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bb index ceb700a61..122861479 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bb +++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bb | |||
@@ -7,7 +7,7 @@ PROVIDES = "virtual/gpsd" | |||
7 | 7 | ||
8 | EXTRANATIVEPATH += "chrpath-native" | 8 | EXTRANATIVEPATH += "chrpath-native" |
9 | 9 | ||
10 | PR = "r3" | 10 | PR = "r6" |
11 | 11 | ||
12 | SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \ | 12 | SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \ |
13 | file://0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch \ | 13 | file://0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch \ |
@@ -17,16 +17,17 @@ SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \ | |||
17 | file://gpsd-default \ | 17 | file://gpsd-default \ |
18 | file://gpsd \ | 18 | file://gpsd \ |
19 | file://60-gpsd.rules \ | 19 | file://60-gpsd.rules \ |
20 | file://gpsd.service \ | ||
20 | " | 21 | " |
21 | SRC_URI[md5sum] = "52d9785eaf1a51298bb8900dbde88f98" | 22 | SRC_URI[md5sum] = "52d9785eaf1a51298bb8900dbde88f98" |
22 | SRC_URI[sha256sum] = "7800c478ee9d7ca7a502b0f892828561b1fbf7bc69d9d38c447c82c3628302ac" | 23 | SRC_URI[sha256sum] = "7800c478ee9d7ca7a502b0f892828561b1fbf7bc69d9d38c447c82c3628302ac" |
23 | 24 | ||
24 | inherit scons update-rc.d python-dir pythonnative | 25 | inherit scons update-rc.d python-dir pythonnative systemd |
25 | 26 | ||
26 | INITSCRIPT_NAME = "gpsd" | 27 | INITSCRIPT_NAME = "gpsd" |
27 | INITSCRIPT_PARAMS = "defaults 35" | 28 | INITSCRIPT_PARAMS = "defaults 35" |
28 | 29 | ||
29 | SYSTEMD_OESCONS ??= "false" | 30 | SYSTEMD_OESCONS = "${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false',d)}" |
30 | 31 | ||
31 | export STAGING_INCDIR | 32 | export STAGING_INCDIR |
32 | export STAGING_LIBDIR | 33 | export STAGING_LIBDIR |
@@ -79,6 +80,11 @@ do_install_append() { | |||
79 | #support for python | 80 | #support for python |
80 | install -d ${D}/${PYTHON_SITEPACKAGES_DIR}/gps | 81 | install -d ${D}/${PYTHON_SITEPACKAGES_DIR}/gps |
81 | install -m 755 ${S}/gps/*.py ${D}/${PYTHON_SITEPACKAGES_DIR}/gps | 82 | install -m 755 ${S}/gps/*.py ${D}/${PYTHON_SITEPACKAGES_DIR}/gps |
83 | |||
84 | #support for systemd | ||
85 | install -d ${D}${systemd_unitdir}/system/ | ||
86 | install -m 0644 ${WORKDIR}/${PN}.service ${D}${systemd_unitdir}/system/${PN}.service | ||
87 | install -m 0644 ${S}/systemd/${PN}.socket ${D}${systemd_unitdir}/system/${PN}.socket | ||
82 | } | 88 | } |
83 | 89 | ||
84 | pkg_postinst_${PN}-conf() { | 90 | pkg_postinst_${PN}-conf() { |
@@ -121,3 +127,8 @@ RDEPENDS_gps-utils = "python-pygps" | |||
121 | DESCRIPTION_python-pygps = "Python bindings to gpsd" | 127 | DESCRIPTION_python-pygps = "Python bindings to gpsd" |
122 | FILES_python-pygps = "${PYTHON_SITEPACKAGES_DIR}/*" | 128 | FILES_python-pygps = "${PYTHON_SITEPACKAGES_DIR}/*" |
123 | RDEPENDS_python-pygps = "python-core python-curses gpsd python-json" | 129 | RDEPENDS_python-pygps = "python-core python-curses gpsd python-json" |
130 | |||
131 | RPROVIDES_${PN} += "${PN}-systemd" | ||
132 | RREPLACES_${PN} += "${PN}-systemd" | ||
133 | RCONFLICTS_${PN} += "${PN}-systemd" | ||
134 | SYSTEMD_SERVICE_${PN} = "${PN}.socket" | ||