aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis 'GNUtoo' Carikli <GNUtoo@no-log.org>2012-03-09 00:07:47 +0100
committerDenis 'GNUtoo' Carikli <GNUtoo@no-log.org>2012-04-20 15:15:55 +0200
commitba641e072cc99f385d2c69bac7fc5236b08fe5f6 (patch)
treeec488c48ef810bd8b10f19d37373c2a0200d1f6b
parent4d1182b1aa762d19e49be8200e7fcd6a15b8bcd9 (diff)
downloadmeta-openembedded-contrib-gnutoo/gpsd-3.4.tar.gz
meta-openembedded-contrib-gnutoo/gpsd-3.4.tar.bz2
meta-openembedded-contrib-gnutoo/gpsd-3.4.zip
gpsd: update to 3.4gnutoo/gpsd-3.4
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
-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-xmeta-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 c01db068de..c01db068de 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 ba73dafb2c..ba73dafb2c 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 0ceff03824..0ceff03824 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 8deaf759a7..8deaf759a7 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 13c17f2480..13c17f2480 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 7e2a96cb11..972871a321 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"
SECTION = "console/network"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800"
-DEPENDS = "dbus-glib ncurses python libusb1"
+DEPENDS = "dbus dbus-glib ncurses python libusb1"
PROVIDES = "virtual/gpsd"
-PR = "r3"
+PR = "r0"
-EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
- --x-libraries=${STAGING_LIBDIR} \
- --enable-dbus \
- --disable-libQgpsmm \
-"
-
-SRC_URI = "http://download.berlios.de/${PN}/${P}bis.tar.gz;name=gpsd \
+SRC_URI = "http://download.savannah.gnu.org/releases/gpsd/gpsd-${PV}.tar.gz;name=gpsd \
file://gpsd-default \
file://gpsd \
file://gpsd.socket \
file://gpsd.service \
file://60-gpsd.rules"
-SRC_URI[gpsd.md5sum] = "52b00cab0fb34bbf1923ae35c7ced6c4"
-SRC_URI[gpsd.sha256sum] = "c6d72565bc06b802c749e69808eb7c6ee165962dc17383971c9001b5e1763690"
+SRC_URI[gpsd.md5sum] = "c01353459faa68834309109d4e868460"
+SRC_URI[gpsd.sha256sum] = "79f7de9ead63c7f5d2c9a92e85b5f82e53323c4d451ef8e27ea265ac3ef9a70f"
-inherit autotools update-rc.d python-dir systemd
+inherit scons update-rc.d python-dir systemd
INITSCRIPT_NAME = "gpsd"
INITSCRIPT_PARAMS = "defaults 35"
@@ -35,22 +29,28 @@ LDFLAGS += "-L${STAGING_LIBDIR} -lm"
export STAGING_INCDIR
export STAGING_LIBDIR
-TARGET_CC_ARCH += "${LDFLAGS}"
+CC += "${LDFLAGS}"
-do_configure_prepend() {
- # skip first
- sed -i "s#for pylibpath in '/usr/lib'#for pylibpath in #g" ${S}/configure.ac
- # disable xmlto, in case xsltproc doesn't work xmlto is used and fails
- sed -i "s#AC_CHECK_PROG(WITH_XMLTO#AC_CHECK_PROG(WITH_XMLTO_DISABLED_IN_OE#g" ${S}/configure.ac
-}
+EXTRA_OESCONS = " \
+ libQgpsmm='false' \
+ debug='true' \
+ strip='false' \
+ systemd='true' \
+ pkgconfig='${PKG_CONFIG_DIR}' \
+"
do_compile_prepend() {
+ export LIBPATH="${STAGING_LIBDIR}"
+ export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
+ export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}"
export BUILD_SYS="${BUILD_SYS}"
export HOST_SYS="${HOST_SYS}"
- find ${S} -name "*.so" -exec rm -f {} \;
}
do_install_prepend() {
+ export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
+ export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}"
+
export BUILD_SYS="${BUILD_SYS}"
export HOST_SYS="${HOST_SYS}"
}
@@ -67,7 +67,12 @@ do_install_append() {
install -d ${D}${base_libdir}/udev/
install -m 0755 ${S}/gpsd.hotplug ${D}${base_libdir}/udev/
install -d ${D}${base_libdir}/udev/
- install -m 0755 ${S}/gpsd.hotplug.wrapper ${D}${base_libdir}/udev/
+
+ #support for python
+ install -d ${D}/${PYTHON_SITEPACKAGES_DIR}/gps
+ for f in ${S}/gps/* ;do
+ install $f ${D}/${PYTHON_SITEPACKAGES_DIR}/gps
+ done
}
pkg_postinst_${PN}-conf() {
@@ -95,7 +100,7 @@ FILES_libgpsd = "${libdir}/libgpsd.so.*"
DESCRIPTION_libgps = "C service library used for communicating with gpsd"
FILES_libgps = "${libdir}/libgps.so.*"
-DESCRIPTION_gpsd-conf = "gpsd configuration files and init scripts"
+DESCRIPTION_gpsd-conf = "gpsd configuration files and init scripts"
FILES_gpsd-conf = "${sysconfdir}"
DESCRIPTION_gpsd-gpsctl = "Tool for tweaking GPS modes"