diff options
Diffstat (limited to 'import-layers/meta-openembedded/meta-oe/recipes-navigation')
10 files changed, 49 insertions, 243 deletions
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.4.4.bb b/import-layers/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.4.4.bb index 1d531aec7..b31d8eb4e 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.4.4.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.4.4.bb @@ -8,9 +8,9 @@ SECTION = "console/network" LIC_FILES_CHKSUM = "file://COPYING;md5=8114b83a0435d8136b47bd70111ce5cd" -DEPENDS = "glib-2.0 dbus json-glib libsoup-2.4 intltool-native gobject-introspection-native" +DEPENDS = "glib-2.0 dbus json-glib libsoup-2.4 intltool-native" -inherit autotools pkgconfig gtk-doc +inherit autotools pkgconfig gtk-doc gobject-introspection SRC_URI = " \ http://www.freedesktop.org/software/geoclue/releases/2.4/geoclue-${PV}.tar.xz \ diff --git a/import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-3.16/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch b/import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-3.17/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch index 2ea3226a4..1fa27c210 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-3.16/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-3.17/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch @@ -39,36 +39,42 @@ Signed-off-by: Peter A. Bigot <pab@pabigot.com> 1 file changed, 9 insertions(+) diff --git a/SConstruct b/SConstruct -index 6c93311..cde8b3d 100644 +index 3318bb48..e1c4f963 100644 --- a/SConstruct +++ b/SConstruct -@@ -1148,6 +1148,12 @@ else: - basecflags += ' -coverage' - ldflags += ' -coverage' - ldshared += ' -coverage' -+ -+ if env['sysroot']: -+ print "Prefixing includepy '%s' with sysroot prefix" % includepy -+ includepy = os.path.normpath("%s/%s/%s/%s" % (env['sysroot'], env['prefix'], env['includedir'], includepy)) -+ print "'%s'" % includepy -+ - # in case CC/CXX was set to the scan-build wrapper, - # ensure that we build the python modules with scan-build, too - if env['CC'] is None or env['CC'].find('scan-build') < 0: -@@ -1408,11 +1414,14 @@ if not env['python']: +@@ -934,7 +934,7 @@ else: + + # Set up configuration for target Python + +-PYTHON_LIBDIR_CALL = 'sysconfig.get_python_lib()' ++PYTHON_LIBDIR_CALL = 'sysconfig.get_python_lib(plat_specific=1)' + + PYTHON_CONFIG_NAMES = ['CC', 'CXX', 'OPT', 'BASECFLAGS', + 'CCSHARED', 'LDSHARED', 'SO', 'INCLUDEPY', 'LDFLAGS'] +@@ -1364,7 +1364,7 @@ else: + LINK=ldshared, + SHLIBPREFIX="", + SHLIBSUFFIX=python_config['SO'], +- CPPPATH=[python_config['INCLUDEPY']], ++ CPPPATH=[os.path.normpath("%s/%s/%s/%s" % (env['sysroot'], env['prefix'], env['includedir'], python_config['INCLUDEPY']))] if env['sysroot'] else [python_config['INCLUDEPY']], + CPPFLAGS=python_config['OPT'], + CFLAGS=python_config['BASECFLAGS'], + CXXFLAGS=python_config['BASECFLAGS']) +@@ -1662,12 +1662,15 @@ if ((not env['debug'] and not env['profiling'] and not env['nostrip'] + if not env['python']: python_install = [] else: - python_lib_dir = env['python_libdir'] -+ python_lib_dir = python_lib_dir.replace(env['sysroot'], '') - python_module_dir = python_lib_dir + os.sep + 'gps' - python_extensions_install = python_env.Install( DESTDIR + python_module_dir, - python_built_extensions) - if not env['debug'] and not env['profiling'] and not env['nostrip'] and not sys.platform.startswith('darwin'): ++ python_libdir = python_libdir.replace(env['sysroot'], '') + python_module_dir = python_libdir + os.sep + 'gps' + python_extensions_install = python_env.Install(DESTDIR + python_module_dir, + python_built_extensions) + if ((not env['debug'] and not env['profiling'] + and not env['nostrip'] and not sys.platform.startswith('darwin'))): python_env.AddPostAction(python_extensions_install, '$STRIP $TARGET') + env.AddPostAction(python_extensions_install, '$CHRPATH -r "%s" "$TARGET"' \ -+ % (python_lib_dir, )) ++ % (python_libdir, )) - python_modules_install = python_env.Install( DESTDIR + python_module_dir, + python_modules_install = python_env.Install(DESTDIR + python_module_dir, python_modules) -- 2.1.0 diff --git a/import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-3.16/0001-include-sys-ttydefaults.h.patch b/import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-3.17/0001-include-sys-ttydefaults.h.patch index f496b5e7d..e91e4e9fb 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-3.16/0001-include-sys-ttydefaults.h.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-3.17/0001-include-sys-ttydefaults.h.patch @@ -19,10 +19,10 @@ Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> 1 file changed, 1 insertion(+) diff --git a/gpsmon.c b/gpsmon.c -index ead84d0..f205cb1 100644 +index 89c43ee2..5cc0dabd 100644 --- a/gpsmon.c +++ b/gpsmon.c -@@ -20,6 +20,7 @@ +@@ -24,6 +24,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/select.h> diff --git a/import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-3.16/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch b/import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-3.17/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch index 8527f0db3..ba3d205d1 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-3.16/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-3.17/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch @@ -29,23 +29,22 @@ Signed-off-by: Peter A. Bigot <pab@pabigot.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SConstruct b/SConstruct -index 0e518e7..c01a71b 100644 +index 3318bb48..a5bb756d 100644 --- a/SConstruct +++ b/SConstruct -@@ -704,12 +704,12 @@ size_t strlcpy(/*@out@*/char *dst, /*@in@*/const char *src, size_t size); +@@ -889,11 +889,11 @@ else: - manbuilder = mangenerator = htmlbuilder = None + manbuilder = htmlbuilder = None if env['manbuild']: - if config.CheckXsltproc(): + if False and config.CheckXsltproc(): - mangenerator = 'xsltproc' build = "xsltproc --nonet %s $SOURCE >$TARGET" htmlbuilder = build % docbook_html_uri manbuilder = build % docbook_man_uri - elif WhereIs("xmlto"): + elif False and WhereIs("xmlto"): - mangenerator = 'xmlto' - xmlto = "xmlto %s $SOURCE || mv `basename $TARGET` `dirname $TARGET`" + xmlto = "xmlto %s $SOURCE || mv `basename $TARGET` " \ + "`dirname $TARGET`" htmlbuilder = xmlto % "html-nochunks" -- 1.8.5.5 diff --git a/import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/60-gpsd.rules b/import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/60-gpsd.rules deleted file mode 100644 index 61143b8f6..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/60-gpsd.rules +++ /dev/null @@ -1,47 +0,0 @@ -# udev rules for gpsd -# $Id$ -# -# GPSes don't have their own USB device class. They're serial-over-USB -# devices, so what you see is actually the ID of the serial-over-USB chip. -# Fortunately, just two of these account for over 80% of consumer-grade -# GPS sensors. The gpsd.hotplug.wrapper script will tell a running gpsd -# that it should look at the device that just went active, because it -# might be a GPS. -# -# The following setup works on Debian - something similar will apply on -# other distributions: -# -# /etc/udev/gpsd.rules -# /etc/udev/rules.d/025_gpsd.rules -> ../gpsd.rules -# /lib/udev/gpsd.hotplug.wrapper -# /lib/udev/gpsd.hotplug -# -# Setting the link in /etc/udev/rules.d activates the rule and determines -# when to run it on boot (similar to init.d processing). - -SUBSYSTEM!="tty", GOTO="gpsd_rules_end" - -# Prolific Technology, Inc. PL2303 Serial Port -ATTR{idVendor}=="067b", ATTR{idProduct}=="2303", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper" -# ATEN International Co., Ltd UC-232A Serial Port [pl2303] -ATTR{idVendor}=="0557", ATTR{idProduct}=="2008", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper" -# FTDI 8U232AM -ATTR{idVendor}=="0403", ATTR{idProduct}=="6001", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper" -# Cypress M8/CY7C64013 (DeLorme uses these) -ATTR{idVendor}=="1163", ATTR{idProduct}=="0100", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper" -# PS-360 OEM (Microsoft GPS sold with Street and Trips 2005) -ATTR{idVendor}=="067b", ATTR{idProduct}=="aaa0", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper" -# Garmin International GPSmap, various models (tested with Garmin GPS 18 USB) -ATTR{idVendor}=="091e", ATTR{idProduct}=="0003", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper" -# Cygnal Integrated Products, Inc. CP210x Composite Device (Used by Holux m241) -ATTR{idVendor}=="10c4", ATTR{idProduct}=="ea60", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper" -# u-blox AG, u-blox 5 (tested with Navilock NL-402U) -ATTR{idVendor}=="1546", ATTR{idProduct}=="01a5", SYMLINK="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper" -# FTDI FT232 -ATTR{idVendor}=="0403", ATTR{idProduct}=="6001", SYMLINK="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper" -# u-blox 4 -ATTR{idVendor}=="1546", ATTR{idProduct}=="01a4", SYMLINK="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper" - -ACTION=="remove", RUN+="/lib/udev/gpsd.hotplug.wrapper" - -LABEL="gpsd_rules_end" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/gpsd b/import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/gpsd deleted file mode 100755 index ba73dafb2..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/gpsd +++ /dev/null @@ -1,136 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: gpsd -# Required-Start: $remote_fs $network -# Should-Start: bluetooth dbus udev -# Required-Stop: $remote_fs $network -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: GPS (Global Positioning System) daemon start/stop script -# Description: Start/Stop script for the gpsd service daemon, -# which is able to monitor one or more GPS devices -# connected to a host computer, making all data on -# the location and movements of the sensors available -# to be queried on TCP port 2947. -### END INIT INFO - -# Author: Bernd Zeimetz <bzed@debian.org> -# -# Please remove the "Author" lines above and replace them -# with your own name if you copy and modify this script. - -# Do NOT "set -e" - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="GPS (Global Positioning System) daemon" -NAME=gpsd -DAEMON=/usr/sbin/$NAME -PIDFILE=/var/run/$NAME.pid -SCRIPTNAME=/etc/init.d/$NAME - -# Exit if the package is not installed -[ -x "$DAEMON" ] || exit 0 - -# Read configuration, if present -[ -r /etc/default/$NAME ] && . /etc/default/$NAME - -if [ -z "$GPSD_SOCKET" ] && [ -z "$DEVICES" ]; then - GPSD_SOCKET=/var/run/gpsd.sock -fi - -if [ -n "$GPSD_SOCKET" ]; then - GPSD_OPTIONS="$GPSD_OPTIONS -F $GPSD_SOCKET" -fi - -# -# Function that starts the daemon/service -# -do_start() -{ - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test \ - -- $GPSD_OPTIONS -P $PIDFILE $GPS_DEVICES > /dev/null \ - || return 1 - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ - $GPSD_OPTIONS -P $PIDFILE $GPS_DEVICES \ - || return 2 -} - -# -# Function that stops the daemon/service -# -do_stop() -{ - # Return - # 0 if daemon has been stopped - # 1 if daemon was already stopped - # 2 if daemon could not be stopped - # other if a failure occurred - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME - RETVAL="$?" - [ "$RETVAL" = 2 ] && return 2 - # Many daemons don't delete their pidfiles when they exit. - rm -f $PIDFILE - return "$RETVAL" -} - -# -# Function that sends a SIGHUP to the daemon/service -# -do_reload() { - # - # If the daemon can reload its configuration without - # restarting (for example, when it is sent a SIGHUP), - # then implement that here. - # - start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME - return 0 -} - -case "$1" in - start) - echo "Starting $DESC" "$NAME" - do_start - exit $? - ;; - stop) - echo "Stopping $DESC" "$NAME" - do_stop - exit $? - ;; - status) - ;; - reload|force-reload) - echo "Reloading $DESC" "$NAME" - do_reload - exit $? - ;; - restart) - # - # If the "reload" option is implemented then remove the - # 'force-reload' alias - # - echo "Restarting $DESC" "$NAME" - do_stop - case "$?" in - 0|1) - do_start - exit $? - ;; - *) - # Failed to stop - exit 1 - ;; - esac - ;; - *) - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 - ;; -esac - -: diff --git a/import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/gpsd-default b/import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/gpsd-default deleted file mode 100644 index 0ceff0382..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/gpsd-default +++ /dev/null @@ -1,5 +0,0 @@ -# If you must specify a non-NMEA driver, uncomment and modify the next line -GPSD_SOCKET="/var/run/gpsd.sock" -GPSD_OPTIONS="" -GPS_DEVICES="" - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/gpsd.service b/import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/gpsd.service deleted file mode 100644 index 7131a589d..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/gpsd.service +++ /dev/null @@ -1,10 +0,0 @@ -[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/import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.16.bb b/import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.17.bb index 26d74867b..d526db2be 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.16.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.17.bb @@ -11,13 +11,9 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \ file://0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch \ file://0004-SConstruct-disable-html-and-man-docs-building-becaus.patch \ file://0001-include-sys-ttydefaults.h.patch \ - file://gpsd-default \ - file://gpsd \ - file://60-gpsd.rules \ - file://gpsd.service \ " -SRC_URI[md5sum] = "68691b5de4c94f82ec4062b042b5eb63" -SRC_URI[sha256sum] = "03579af13a4d3fe0c5b79fa44b5f75c9f3cac6749357f1d99ce5d38c09bc2029" +SRC_URI[md5sum] = "e0cfadcf4a65dfbdd2afb11c58f4e4a1" +SRC_URI[sha256sum] = "68e0dbecfb5831997f8b3d6ba48aed812eb465d8c0089420ab68f9ce4d85e77a" inherit scons update-rc.d python-dir pythonnative systemd bluetooth update-alternatives @@ -67,13 +63,13 @@ do_install() { do_install_append() { install -d ${D}/${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/gpsd ${D}/${sysconfdir}/init.d/ + install -m 0755 ${S}/packaging/deb/etc_init.d_gpsd ${D}/${sysconfdir}/init.d/gpsd install -d ${D}/${sysconfdir}/default - install -m 0644 ${WORKDIR}/gpsd-default ${D}/${sysconfdir}/default/gpsd.default + install -m 0644 ${S}/packaging/deb/etc_default_gpsd ${D}/${sysconfdir}/default/gpsd.default #support for udev install -d ${D}/${sysconfdir}/udev/rules.d - install -m 0644 ${WORKDIR}/60-gpsd.rules ${D}/${sysconfdir}/udev/rules.d + install -m 0644 ${S}/gpsd.rules ${D}/${sysconfdir}/udev/rules.d/ install -d ${D}${base_libdir}/udev/ install -m 0755 ${S}/gpsd.hotplug ${D}${base_libdir}/udev/ @@ -83,7 +79,8 @@ do_install_append() { #support for systemd install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_unitdir}/system/${BPN}.service + install -m 0644 ${S}/systemd/${BPN}.service ${D}${systemd_unitdir}/system/${BPN}.service + install -m 0644 ${S}/systemd/${BPN}ctl@.service ${D}${systemd_unitdir}/system/${BPN}ctl@.service install -m 0644 ${S}/systemd/${BPN}.socket ${D}${systemd_unitdir}/system/${BPN}.socket } @@ -132,7 +129,7 @@ RDEPENDS_python-pygps = " \ RPROVIDES_${PN} += "${PN}-systemd" RREPLACES_${PN} += "${PN}-systemd" RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "${PN}.socket" +SYSTEMD_SERVICE_${PN} = "${BPN}.socket ${BPN}ctl@.service" ALTERNATIVE_${PN} = "gpsd-defaults" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery_2.7.bb b/import-layers/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery_2.7.bb index 1a00b0808..010f65fb9 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery_2.7.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery_2.7.bb @@ -5,7 +5,9 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://orrery.c;endline=25;md5=d792bdf2b591972da175aecc38d88cfe" DEPENDS = "gtk+" -inherit autotools-brokensep pkgconfig +inherit distro_features_check autotools-brokensep pkgconfig + +REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "http://projects.openmoko.org/frs/download.php/923/orrery_2.7_clean.tar.gz \ file://orrery.png \ |