diff options
author | Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> | 2012-03-09 00:07:47 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2012-04-29 23:29:32 +0200 |
commit | 38dac2ac3d37b81985646aa9a4908b2a1633f203 (patch) | |
tree | 4ec71b5822102282dddcd2444a840972832373e3 /meta-oe/recipes-navigation | |
parent | 8f9b2e3a102e66426ce5b269a6827fc6a3218bef (diff) | |
download | meta-openembedded-38dac2ac3d37b81985646aa9a4908b2a1633f203.tar.gz |
gpsd: update to 3.4
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
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-3.4/60-gpsd.rules (renamed from meta-oe/recipes-navigation/gpsd/gpsd-2.96/60-gpsd.rules) | 0 | ||||
-rwxr-xr-x | meta-oe/recipes-navigation/gpsd/gpsd-3.4/gpsd (renamed from meta-oe/recipes-navigation/gpsd/gpsd-2.96/gpsd) | 0 | ||||
-rw-r--r-- | meta-oe/recipes-navigation/gpsd/gpsd-3.4/gpsd-default (renamed from meta-oe/recipes-navigation/gpsd/gpsd-2.96/gpsd-default) | 0 | ||||
-rw-r--r-- | meta-oe/recipes-navigation/gpsd/gpsd-3.4/gpsd.service (renamed from meta-oe/recipes-navigation/gpsd/gpsd-2.96/gpsd.service) | 0 | ||||
-rw-r--r-- | meta-oe/recipes-navigation/gpsd/gpsd-3.4/gpsd.socket (renamed from meta-oe/recipes-navigation/gpsd/gpsd-2.96/gpsd.socket) | 0 | ||||
-rw-r--r-- | meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb (renamed from meta-oe/recipes-navigation/gpsd/gpsd_2.96.bb) | 49 |
6 files changed, 27 insertions, 22 deletions
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-2.96/60-gpsd.rules b/meta-oe/recipes-navigation/gpsd/gpsd-3.4/60-gpsd.rules index c01db068d..c01db068d 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd-2.96/60-gpsd.rules +++ b/meta-oe/recipes-navigation/gpsd/gpsd-3.4/60-gpsd.rules | |||
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-2.96/gpsd b/meta-oe/recipes-navigation/gpsd/gpsd-3.4/gpsd index ba73dafb2..ba73dafb2 100755 --- a/meta-oe/recipes-navigation/gpsd/gpsd-2.96/gpsd +++ b/meta-oe/recipes-navigation/gpsd/gpsd-3.4/gpsd | |||
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-2.96/gpsd-default b/meta-oe/recipes-navigation/gpsd/gpsd-3.4/gpsd-default index 0ceff0382..0ceff0382 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd-2.96/gpsd-default +++ b/meta-oe/recipes-navigation/gpsd/gpsd-3.4/gpsd-default | |||
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-2.96/gpsd.service b/meta-oe/recipes-navigation/gpsd/gpsd-3.4/gpsd.service index 8deaf759a..8deaf759a 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd-2.96/gpsd.service +++ b/meta-oe/recipes-navigation/gpsd/gpsd-3.4/gpsd.service | |||
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-2.96/gpsd.socket b/meta-oe/recipes-navigation/gpsd/gpsd-3.4/gpsd.socket index 13c17f248..13c17f248 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd-2.96/gpsd.socket +++ b/meta-oe/recipes-navigation/gpsd/gpsd-3.4/gpsd.socket | |||
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_2.96.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb index 7e2a96cb1..972871a32 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd_2.96.bb +++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb | |||
@@ -2,27 +2,21 @@ DESCRIPTION = "A TCP/IP Daemon simplifying the communication with GPS devices" | |||
2 | SECTION = "console/network" | 2 | SECTION = "console/network" |
3 | LICENSE = "BSD" | 3 | LICENSE = "BSD" |
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800" |
5 | DEPENDS = "dbus-glib ncurses python libusb1" | 5 | DEPENDS = "dbus dbus-glib ncurses python libusb1" |
6 | PROVIDES = "virtual/gpsd" | 6 | PROVIDES = "virtual/gpsd" |
7 | 7 | ||
8 | PR = "r3" | 8 | PR = "r0" |
9 | 9 | ||
10 | EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ | 10 | SRC_URI = "http://download.savannah.gnu.org/releases/gpsd/gpsd-${PV}.tar.gz;name=gpsd \ |
11 | --x-libraries=${STAGING_LIBDIR} \ | ||
12 | --enable-dbus \ | ||
13 | --disable-libQgpsmm \ | ||
14 | " | ||
15 | |||
16 | SRC_URI = "http://download.berlios.de/${PN}/${P}bis.tar.gz;name=gpsd \ | ||
17 | file://gpsd-default \ | 11 | file://gpsd-default \ |
18 | file://gpsd \ | 12 | file://gpsd \ |
19 | file://gpsd.socket \ | 13 | file://gpsd.socket \ |
20 | file://gpsd.service \ | 14 | file://gpsd.service \ |
21 | file://60-gpsd.rules" | 15 | file://60-gpsd.rules" |
22 | SRC_URI[gpsd.md5sum] = "52b00cab0fb34bbf1923ae35c7ced6c4" | 16 | SRC_URI[gpsd.md5sum] = "c01353459faa68834309109d4e868460" |
23 | SRC_URI[gpsd.sha256sum] = "c6d72565bc06b802c749e69808eb7c6ee165962dc17383971c9001b5e1763690" | 17 | SRC_URI[gpsd.sha256sum] = "79f7de9ead63c7f5d2c9a92e85b5f82e53323c4d451ef8e27ea265ac3ef9a70f" |
24 | 18 | ||
25 | inherit autotools update-rc.d python-dir systemd | 19 | inherit scons update-rc.d python-dir systemd |
26 | 20 | ||
27 | INITSCRIPT_NAME = "gpsd" | 21 | INITSCRIPT_NAME = "gpsd" |
28 | INITSCRIPT_PARAMS = "defaults 35" | 22 | INITSCRIPT_PARAMS = "defaults 35" |
@@ -35,22 +29,28 @@ LDFLAGS += "-L${STAGING_LIBDIR} -lm" | |||
35 | export STAGING_INCDIR | 29 | export STAGING_INCDIR |
36 | export STAGING_LIBDIR | 30 | export STAGING_LIBDIR |
37 | 31 | ||
38 | TARGET_CC_ARCH += "${LDFLAGS}" | 32 | CC += "${LDFLAGS}" |
39 | 33 | ||
40 | do_configure_prepend() { | 34 | EXTRA_OESCONS = " \ |
41 | # skip first | 35 | libQgpsmm='false' \ |
42 | sed -i "s#for pylibpath in '/usr/lib'#for pylibpath in #g" ${S}/configure.ac | 36 | debug='true' \ |
43 | # disable xmlto, in case xsltproc doesn't work xmlto is used and fails | 37 | strip='false' \ |
44 | sed -i "s#AC_CHECK_PROG(WITH_XMLTO#AC_CHECK_PROG(WITH_XMLTO_DISABLED_IN_OE#g" ${S}/configure.ac | 38 | systemd='true' \ |
45 | } | 39 | pkgconfig='${PKG_CONFIG_DIR}' \ |
40 | " | ||
46 | 41 | ||
47 | do_compile_prepend() { | 42 | do_compile_prepend() { |
43 | export LIBPATH="${STAGING_LIBDIR}" | ||
44 | export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}" | ||
45 | export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}" | ||
48 | export BUILD_SYS="${BUILD_SYS}" | 46 | export BUILD_SYS="${BUILD_SYS}" |
49 | export HOST_SYS="${HOST_SYS}" | 47 | export HOST_SYS="${HOST_SYS}" |
50 | find ${S} -name "*.so" -exec rm -f {} \; | ||
51 | } | 48 | } |
52 | 49 | ||
53 | do_install_prepend() { | 50 | do_install_prepend() { |
51 | export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}" | ||
52 | export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}" | ||
53 | |||
54 | export BUILD_SYS="${BUILD_SYS}" | 54 | export BUILD_SYS="${BUILD_SYS}" |
55 | export HOST_SYS="${HOST_SYS}" | 55 | export HOST_SYS="${HOST_SYS}" |
56 | } | 56 | } |
@@ -67,7 +67,12 @@ do_install_append() { | |||
67 | install -d ${D}${base_libdir}/udev/ | 67 | install -d ${D}${base_libdir}/udev/ |
68 | install -m 0755 ${S}/gpsd.hotplug ${D}${base_libdir}/udev/ | 68 | install -m 0755 ${S}/gpsd.hotplug ${D}${base_libdir}/udev/ |
69 | install -d ${D}${base_libdir}/udev/ | 69 | install -d ${D}${base_libdir}/udev/ |
70 | install -m 0755 ${S}/gpsd.hotplug.wrapper ${D}${base_libdir}/udev/ | 70 | |
71 | #support for python | ||
72 | install -d ${D}/${PYTHON_SITEPACKAGES_DIR}/gps | ||
73 | for f in ${S}/gps/* ;do | ||
74 | install $f ${D}/${PYTHON_SITEPACKAGES_DIR}/gps | ||
75 | done | ||
71 | } | 76 | } |
72 | 77 | ||
73 | pkg_postinst_${PN}-conf() { | 78 | pkg_postinst_${PN}-conf() { |
@@ -95,7 +100,7 @@ FILES_libgpsd = "${libdir}/libgpsd.so.*" | |||
95 | DESCRIPTION_libgps = "C service library used for communicating with gpsd" | 100 | DESCRIPTION_libgps = "C service library used for communicating with gpsd" |
96 | FILES_libgps = "${libdir}/libgps.so.*" | 101 | FILES_libgps = "${libdir}/libgps.so.*" |
97 | 102 | ||
98 | DESCRIPTION_gpsd-conf = "gpsd configuration files and init scripts" | 103 | DESCRIPTION_gpsd-conf = "gpsd configuration files and init scripts" |
99 | FILES_gpsd-conf = "${sysconfdir}" | 104 | FILES_gpsd-conf = "${sysconfdir}" |
100 | 105 | ||
101 | DESCRIPTION_gpsd-gpsctl = "Tool for tweaking GPS modes" | 106 | DESCRIPTION_gpsd-gpsctl = "Tool for tweaking GPS modes" |