diff options
6 files changed, 377 insertions, 0 deletions
diff --git a/recipes-navigation/gpsd/gpsd-3.16.20161219/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.old.patch b/recipes-navigation/gpsd/gpsd-3.16.20161219/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.old.patch new file mode 100644 index 0000000..2ea3226 --- /dev/null +++ b/recipes-navigation/gpsd/gpsd-3.16.20161219/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.old.patch @@ -0,0 +1,75 @@ +From 1e2cea8945bc2183fbe1a012dcd633a352125952 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Tue, 24 Apr 2012 18:45:14 +0200 +Subject: [PATCH] SConstruct: prefix includepy with sysroot and drop sysroot + from python_lib_dir + +* without PYTHONPATH, distutil's sysconfig returns INCLUDEPY without sysroot prefix + and with PYTHONPATH from OE it's pointing to native python dir + + $ export PYTHONPATH=/OE/shr-core/tmp-eglibc/sysroots/om-gta02/usr/lib/python2.7/ + $ python + Python 2.7.2 (default, Apr 18 2012, 09:19:59) + [GCC 4.6.2] on linux2 + Type "help", "copyright", "credits" or "license" for more information. + >>> from distutils import sysconfig + >>> sysconfig.get_config_vars('INCLUDEPY') + ['/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/python2.7'] + >>> + $ unset PYTHONPATH + $ python + Python 2.7.2 (default, Apr 18 2012, 09:19:59) + [GCC 4.6.2] on linux2 + Type "help", "copyright", "credits" or "license" for more information. + >>> from distutils import sysconfig + >>> sysconfig.get_config_vars('INCLUDEPY') + ['/python2.7'] + >>> import sysconfig + >>> sysconfig.get_config_vars('INCLUDEPY') + ['/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/python2.7'] +* python_lib_dir = python_lib_dir.replace(env['sysroot'], '') + returns path to target sysroot + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +Signed-off-by: Peter A. Bigot <pab@pabigot.com> +--- + SConstruct | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/SConstruct b/SConstruct +index 6c93311..cde8b3d 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']: + 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_env.AddPostAction(python_extensions_install, '$STRIP $TARGET') ++ env.AddPostAction(python_extensions_install, '$CHRPATH -r "%s" "$TARGET"' \ ++ % (python_lib_dir, )) + + python_modules_install = python_env.Install( DESTDIR + python_module_dir, + python_modules) +-- +2.1.0 + diff --git a/recipes-navigation/gpsd/gpsd-3.16.20161219/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch b/recipes-navigation/gpsd/gpsd-3.16.20161219/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch new file mode 100644 index 0000000..d1eb2ad --- /dev/null +++ b/recipes-navigation/gpsd/gpsd-3.16.20161219/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch @@ -0,0 +1,13 @@ +--- /home/jklug/3.17/old/SConstruct 2016-12-19 14:53:02.406689189 -0600 ++++ ./SConstruct 2016-12-19 17:27:27.594669617 -0600 +@@ -1341,6 +1341,10 @@ + python_config['BASECFLAGS'] += ' -coverage' + python_config['LDFLAGS'] += ' -coverage' + python_config['LDSHARED'] += ' -coverage' ++ if env['sysroot']: ++ print "Prefixing includepy '%s' with sysroot prefix" % python_config['INCLUDEPY'] ++ python_config['INCLUDEPY'] = os.path.normpath("%s/%s/%s/%s" % (env['sysroot'], env['prefix'], env['includedir'], python_config['INCLUDEPY'])) ++ print "Python Include: '%s'" % python_config['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: diff --git a/recipes-navigation/gpsd/gpsd-3.16.20161219/0001-include-sys-ttydefaults.h.patch b/recipes-navigation/gpsd/gpsd-3.16.20161219/0001-include-sys-ttydefaults.h.patch new file mode 100644 index 0000000..b27c671 --- /dev/null +++ b/recipes-navigation/gpsd/gpsd-3.16.20161219/0001-include-sys-ttydefaults.h.patch @@ -0,0 +1,34 @@ +From 543f79222520cc6ab65d20f9fa356dac5c848e3b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 17 Aug 2016 02:16:12 +0000 +Subject: [PATCH] include sys/ttydefaults.h + +This is needed for CTRL definition, as exposed by musl on glibc +this include file gets pulled indirectly. + +/usr/src/debug/gpsd/3.14-r0/gpsd-3.14/gpsmon.c:605: undefined reference to `CTRL' +clang-3.9: error: linker command failed with exit code 1 (use -v to see invocation) +scons: *** [gpsmon] Error 1 + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + gpsmon.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gpsmon.c b/gpsmon.c +index bee05b8..daed818 100644 +--- a/gpsmon.c ++++ b/gpsmon.c +@@ -20,6 +20,7 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <sys/select.h> ++#include <sys/ttydefaults.h> + #include <fcntl.h> + #ifndef S_SPLINT_S + #include <unistd.h> +-- +1.8.3.1 + diff --git a/recipes-navigation/gpsd/gpsd-3.16.20161219/0002-SConstruct-remove-rpath.patch b/recipes-navigation/gpsd/gpsd-3.16.20161219/0002-SConstruct-remove-rpath.patch new file mode 100644 index 0000000..083a662 --- /dev/null +++ b/recipes-navigation/gpsd/gpsd-3.16.20161219/0002-SConstruct-remove-rpath.patch @@ -0,0 +1,45 @@ +From d090638ff983e509162d5e3b62aa4918de4aa5fa Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Tue, 24 Apr 2012 16:24:35 +0200 +Subject: [PATCH 2/4] SConstruct: remove rpath + +* even with correct prefix (without DESTDIR) included it's redundant + WARNING: QA Issue: libgps: + /work/armv4t-oe-linux-gnueabi/gpsd/gpsd-3.5-r0/packages-split/libgps/usr/lib/libgps.so.20.0 + contains probably-redundant RPATH /usr/lib +* and with prefix from scons.bbclass it's invalid + WARNING: QA Issue: package libgps contains bad RPATH + /OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd/gpsd-3.5-r0/image/usr/lib + in file + /OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd/gpsd-3.5-r0/packages-split/libgps/usr/lib/libgps.so.20.0 + +Upstream-Status: Inapppropriate [embedded specific] + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> +Signed-off-by: Peter A. Bigot <pab@pabigot.com> +--- + SConstruct | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/SConstruct b/SConstruct +index f0cafa8..ff46713 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -1340,8 +1340,11 @@ if qt_env: + binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), compiled_qgpsmmlib)) + + if env["shared"] and env["chrpath"]: +- env.AddPostAction(binaryinstall, '$CHRPATH -r "%s" "$TARGET"' \ +- % (installdir('libdir', False), )) ++ if not env['sysroot']: ++ env.AddPostAction(binaryinstall, '$CHRPATH -r "%s" "$TARGET"' \ ++ % (installdir('libdir', False), )) ++ else: ++ env.AddPostAction(binaryinstall, '$CHRPATH -d "$TARGET"') + + if not env['debug'] and not env['profiling'] and env['strip']: + env.AddPostAction(binaryinstall, '$STRIP $TARGET') +-- +1.8.5.5 + diff --git a/recipes-navigation/gpsd/gpsd-3.16.20161219/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch b/recipes-navigation/gpsd/gpsd-3.16.20161219/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch new file mode 100644 index 0000000..8527f0d --- /dev/null +++ b/recipes-navigation/gpsd/gpsd-3.16.20161219/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch @@ -0,0 +1,52 @@ +From 697e2e9ff97487266d817cdd41bacc83f681e3d7 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Sun, 29 Apr 2012 00:05:59 +0200 +Subject: [PATCH 4/4] SConstruct: disable html and man docs building because + xmlto-native from OE is broken + +It will try to load dtd and fail: +| xmlto man gpsctl.xml; mv `basename gpsctl.1` gpsctl.1 +| xmlto: /var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd-3.4-r2/gpsd-3.4/gpsctl.xml does not validate (status 3) +| xmlto: Fix document syntax or use --skip-validation option +| I/O error : Attempt to load network entity http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd +| /var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd-3.4-r2/gpsd-3.4/gpsctl.xml:8: warning: failed to load external entity "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" +| "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> +| ^ +| I/O error : Attempt to load network entity http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd +| warning: failed to load external entity "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" +| validity error : Could not load the external subset "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" +| Document /var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd-3.4-r2/gpsd-3.4/gpsctl.xml does not validate +| mv: cannot stat `gpsctl.1': No such file or directory +| scons: *** [gpsctl.1] Error 1 +| scons: building terminated because of errors. + +Upstream-Status: Inappropriate [disable feature] + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +Signed-off-by: Peter A. Bigot <pab@pabigot.com> +--- + SConstruct | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/SConstruct b/SConstruct +index 0e518e7..c01a71b 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -704,12 +704,12 @@ size_t strlcpy(/*@out@*/char *dst, /*@in@*/const char *src, size_t size); + + manbuilder = mangenerator = 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`" + htmlbuilder = xmlto % "html-nochunks" +-- +1.8.5.5 + diff --git a/recipes-navigation/gpsd/gpsd_3.16.20161219.bb b/recipes-navigation/gpsd/gpsd_3.16.20161219.bb new file mode 100644 index 0000000..e2ac693 --- /dev/null +++ b/recipes-navigation/gpsd/gpsd_3.16.20161219.bb @@ -0,0 +1,158 @@ +SUMMARY = "A TCP/IP Daemon simplifying the communication with GPS devices" +SECTION = "console/network" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://../git/COPYING;md5=d217a23f408e91c94359447735bc1800" +DEPENDS = "dbus dbus-glib ncurses python libusb1 chrpath-replacement-native pps-tools" +PROVIDES = "virtual/gpsd" + +EXTRANATIVEPATH += "chrpath-native" + +# Do we still need this? +# file://0004-SConstruct-disable-html-and-man-docs-building-becaus.patch +# file://0001-include-sys-ttydefaults.h.patch +# file://0002-SConstruct-remove-rpath.patch + +# git://git.savannah.nongnu.org/gpsd.git +SRC_URI = "git://git.savannah.nongnu.org/gpsd.git;branch=master;protocol=git \ + file://0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch \ + file://gpsd-default \ + file://gpsd \ + file://60-gpsd.rules \ + file://gpsd.service \ +" +S = "${WORKDIR}/git" + +SRCREV = "fde48f5538520bd98da42b4b9f60b5074c61bc2d" +# Fixed +# file://0001-Check-for-__STDC_NO_ATOMICS__-before-using-stdatomic.patch +# file://0002-Add-a-test-for-C11-and-check-we-have-C11-before-usin.patch +# file://0003-Whoops-check-for-C11-not-for-not-C11-in-stdatomic.h-.patch +# file://0001-Include-stdatomic.h-only-in-C-mode.patch +# file://0001-libgpsd-core-Fix-issue-with-ACTIVATE-hook-not-being-.patch + +SRC_URI[md5sum] = "68691b5de4c94f82ec4062b042b5eb63" +SRC_URI[sha256sum] = "03579af13a4d3fe0c5b79fa44b5f75c9f3cac6749357f1d99ce5d38c09bc2029" + + +inherit scons update-rc.d python-dir pythonnative systemd + +INITSCRIPT_NAME = "gpsd" +INITSCRIPT_PARAMS = "defaults 35" + +SYSTEMD_OESCONS = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false',d)}" + +export STAGING_INCDIR +export STAGING_LIBDIR + +# Necessary for python +export BUILD_SYS +export HOST_SYS + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}" +PACKAGECONFIG[bluez] = "bluez='false',${BLUEZ}" +PACKAGECONFIG[qt] = "qt='yes',qt='no',qt4-x11-free" +EXTRA_OESCONS = " \ + sysroot=${STAGING_DIR_TARGET} \ + libQgpsmm='false' \ + debug='true' \ + strip='false' \ + chrpath='yes' \ + systemd='${SYSTEMD_OESCONS}' \ + libdir='${libdir}' \ + ublox='yes' \ + pps='yes' \ + gpsd_group='gps' \ + ntpshm='yes' \ + ${PACKAGECONFIG_CONFARGS} \ +" +# this cannot be used, because then chrpath is not found and only static lib is built +# target=${HOST_SYS} + +do_compile_prepend() { + export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}" + export PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=\"${PKG_CONFIG_SYSROOT_DIR}\" pkg-config" + export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}" + export LINKFLAGS="${LDFLAGS}" +} + +do_install() { + export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}" + export PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=\"${PKG_CONFIG_SYSROOT_DIR}\" pkg-config" + export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}" + export LINKFLAGS="${LDFLAGS}" + + export DESTDIR="${D}" + # prefix is used for RPATH and DESTDIR/prefix for instalation + ${STAGING_BINDIR_NATIVE}/scons prefix=${prefix} install ${EXTRA_OESCONS}|| \ + bbfatal "scons install execution failed." +} + +do_install_append() { + install -d ${D}/${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/gpsd ${D}/${sysconfdir}/init.d/ + install -d ${D}/${sysconfdir}/default + install -m 0644 ${WORKDIR}/gpsd-default ${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 -d ${D}${base_libdir}/udev/ + install -m 0755 ${S}/gpsd.hotplug ${D}${base_libdir}/udev/ + + #support for python + install -d ${D}/${PYTHON_SITEPACKAGES_DIR}/gps + install -m 755 ${S}/gps/*.py ${D}/${PYTHON_SITEPACKAGES_DIR}/gps + + #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}.socket ${D}${systemd_unitdir}/system/${BPN}.socket +} + +pkg_postinst_${PN}-conf() { + update-alternatives --install ${sysconfdir}/default/gpsd gpsd-defaults ${sysconfdir}/default/gpsd.default 10 +} + +pkg_postrm_${PN}-conf() { + update-alternatives --remove gpsd-defaults ${sysconfdir}/default/gpsd.default +} + +PACKAGES =+ "libgps libgpsd python-pygps-dbg python-pygps gpsd-udev gpsd-conf gpsd-gpsctl gps-utils" + +FILES_${PN}-dev += "${libdir}/pkgconfdir/libgpsd.pc ${libdir}/pkgconfdir/libgps.pc \ + ${libdir}/libQgpsmm.prl" + +FILES_python-pygps-dbg += " ${libdir}/python*/site-packages/gps/.debug" + +RDEPENDS_${PN} = "gpsd-gpsctl" +RRECOMMENDS_${PN} = "gpsd-conf gpsd-udev gpsd-machine-conf" + +SUMMARY_gpsd-udev = "udev relevant files to use gpsd hotplugging" +FILES_gpsd-udev = "${base_libdir}/udev ${sysconfdir}/udev/*" +RDEPENDS_gpsd-udev += "udev gpsd-conf" + +SUMMARY_libgpsd = "C service library used for communicating with gpsd" +FILES_libgpsd = "${libdir}/libgpsd.so.*" + +SUMMARY_libgps = "C service library used for communicating with gpsd" +FILES_libgps = "${libdir}/libgps.so.*" + +SUMMARY_gpsd-conf = "gpsd configuration files and init scripts" +FILES_gpsd-conf = "${sysconfdir}" +CONFFILES_gpsd-conf = "${sysconfdir}/default/gpsd.default" + +SUMMARY_gpsd-gpsctl = "Tool for tweaking GPS modes" +FILES_gpsd-gpsctl = "${bindir}/gpsctl" + +SUMMARY_gps-utils = "Utils used for simulating, monitoring,... a GPS" +FILES_gps-utils = "${bindir}/*" +RDEPENDS_gps-utils = "python-pygps" + +SUMMARY_python-pygps = "Python bindings to gpsd" +FILES_python-pygps = "${PYTHON_SITEPACKAGES_DIR}/*" +RDEPENDS_python-pygps = "python-core python-curses gpsd python-json" + +RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" +SYSTEMD_SERVICE_${PN} = "${PN}.socket" |