From ca5c55acb366ff5f80af00737a8110673ccf252b Mon Sep 17 00:00:00 2001 From: Andrii Pientsov Date: Thu, 21 May 2020 09:08:42 +0300 Subject: Remove duplicates --- conf/distro/java.inc | 11 - conf/distro/mlinux.conf | 77 - recipes-core/mlinux/mlinux-feed-configs.bb | 23 - recipes-core/mlinux/mlinux-version.bb | 22 - .../cell-radio-carrierswitch.default | 6 - .../cell-radio-carrierswitch.init | 26 - .../multitech/cell-radio-carrierswitch_1.0.bb | 25 - recipes-core/multitech/commissioning_1.0.1.bb | 42 - recipes-core/multitech/config/99_radio | 24 - recipes-core/multitech/config/chat_wrapper | 205 -- recipes-core/multitech/config/chat_wrapper.default | 20 - .../multitech/config/config-mths/default/bluetooth | 8 - .../multitech/config/config-mths/default/dnsmasq | 27 - .../multitech/config/config-mths/default/hostapd | 11 - .../multitech/config/config-mths/default/ntpd | 36 - .../multitech/config/config-mths/default/rs9113 | 14 - .../config/config-mths/default/usb-gadget | 6 - .../config/config-mths/dnsmasq.d/dhcp.conf | 12 - .../multitech/config/config-mths/hostapd.conf | 1996 -------------------- .../config/config-mths/ifplugd/ifplugd.action | 30 - .../multitech/config/config-mths/ifplugd/usb0.conf | 2 - .../multitech/config/config-mths/ifplugd/usb1.conf | 2 - .../config/config-mths/modprobe.d/cfg80211.conf | 7 - .../config/config-mths/modprobe.d/mts-io.conf | 1 - .../config/config-mths/network/interfaces.mths | 12 - recipes-core/multitech/config/config.init | 207 -- recipes-core/multitech/config/network/interfaces | 81 - recipes-core/multitech/config/ppp/chap-secrets | 3 - recipes-core/multitech/config/ppp/options | 27 - recipes-core/multitech/config/ppp/pap-secrets | 3 - .../multitech/config/ppp/peers/README.fwswitch | 76 - recipes-core/multitech/config/ppp/peers/cdma | 9 - recipes-core/multitech/config/ppp/peers/cdma_chat | 18 - recipes-core/multitech/config/ppp/peers/gsm | 11 - recipes-core/multitech/config/ppp/peers/gsm_chat | 47 - recipes-core/multitech/config/ppp/peers/l4e1 | 11 - recipes-core/multitech/config/ppp/peers/l4e1_chat | 43 - recipes-core/multitech/config/ppp/peers/l4n1 | 11 - recipes-core/multitech/config/ppp/peers/l4n1_chat | 1 - .../multitech/config/ppp/peers/l4n1_chat_non_vz | 67 - .../multitech/config/ppp/peers/l4n1_chat_vz | 44 - recipes-core/multitech/config/ppp/peers/lap3 | 11 - recipes-core/multitech/config/ppp/peers/lap3_chat | 43 - recipes-core/multitech/config/ppp/peers/leu1 | 11 - recipes-core/multitech/config/ppp/peers/leu1_chat | 43 - recipes-core/multitech/config/ppp/peers/lna3 | 11 - recipes-core/multitech/config/ppp/peers/lna3_chat | 1 - .../multitech/config/ppp/peers/lna3_chat_non_vz | 68 - .../multitech/config/ppp/peers/lna3_chat_vz | 44 - recipes-core/multitech/config/ppp/peers/lsp3 | 11 - recipes-core/multitech/config/ppp/peers/lsp3_chat | 19 - recipes-core/multitech/config/ppp/peers/lvw2 | 11 - recipes-core/multitech/config/ppp/peers/lvw2_chat | 27 - recipes-core/multitech/config_2.3.bb | 95 - .../multitech/reset-handler/reset-handler.default | 2 - .../multitech/reset-handler/reset-handler.init | 30 - .../multitech/reset-handler/reset-handler.sh | 74 - recipes-core/multitech/reset-handler_1.0.bb | 30 - recipes-core/multitech/upgrade-reboot_1.0.0.bb | 17 - recipes-core/sysvinit/files/bootlogd | 1 - recipes-core/sysvinit/files/rc | 193 -- recipes-core/sysvinit/files/start_getty_open | 6 - .../sysvinit/sysvinit-inittab_2.88dsf.bbappend | 29 - ...prefix-includepy-with-sysroot-and-drop-sy.patch | 75 - .../gpsd-3.16/0001-include-sys-ttydefaults.h.patch | 34 - .../gpsd-3.16/0002-SConstruct-remove-rpath.patch | 45 - ...disable-html-and-man-docs-building-becaus.patch | 52 - .../gpsd-3.16/0005-suppress-text-in-binary.patch | 30 - .../gpsd/gpsd-3.16/0006-itu_r_tf_460_6.patch | 23 - .../gpsd/gpsd-3.16/0006-sysclockcrash.patch | 48 - .../gpsd/gpsd-3.16/0006-ubxtimelps.patch | 200 -- .../gpsd/gpsd-3.16/0008-major_gnu.patch | 12 - .../gpsd/gpsd-3.16/leap2017Aug31.patch | 167 -- .../gpsd/gpsd-3.16/leap2017Aug31.readme.txt | 169 -- ...prefix-includepy-with-sysroot-and-drop-sy.patch | 88 - .../0001-include-sys-ttydefaults.h.patch | 35 - ...disable-html-and-man-docs-building-becaus.patch | 47 - .../gpsd/gpsd-3.18.1/0006-itu_r_tf_460_6.patch | 23 - .../gpsd/gpsd-3.18.1/0006-ubxtimelps.patch | 192 -- .../gpsd/gpsd-3.18.1/leap2017Aug31.patch | 167 -- .../gpsd/gpsd-3.18.1/leap2017Aug31.readme.txt | 169 -- recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb | 7 - recipes-navigation/gpsd/gpsd/gpsd | 184 -- recipes-navigation/gpsd/gpsd/gpsd-default | 76 - recipes-navigation/gpsd/gpsd/gpsd.rules | 50 - recipes-navigation/gpsd/gpsd/gpsd.service | 10 - recipes-navigation/gpsd/gpsd/gpsd_fixed.sh | 125 -- recipes-navigation/gpsd/gpsd/gpsd_settime.sh | 84 - recipes-navigation/gpsd/gpsd/gpsd_ubx_fixed.sh | 176 -- recipes-navigation/gpsd/gpsd/gpsd_ubx_settime.sh | 80 - recipes-navigation/gpsd/gpsd_3.16.bb | 221 --- recipes-navigation/gpsd/gpsd_3.16.bb.old | 217 --- recipes-navigation/gpsd/gpsd_3.18.1.bb | 237 --- recipes-navigation/gpsd/gpsd_3.18.1.bb.save | 236 --- recipes-navigation/gpsd/gpsdupdater/bin/bldgpsd.sh | 61 - .../gpsd/gpsdupdater/lib/bashinstaller.sh | 22 - .../gpsd/gpsdupdater/lib/opkginstall.sh | 15 - recipes-navigation/gpsd/libgps24_3.18.1.bb | 142 -- recipes-navigation/gpsd/libgps24_3.18.1.bb.old | 142 -- 99 files changed, 7742 deletions(-) delete mode 100644 conf/distro/java.inc delete mode 100644 conf/distro/mlinux.conf delete mode 100644 recipes-core/mlinux/mlinux-feed-configs.bb delete mode 100644 recipes-core/mlinux/mlinux-version.bb delete mode 100644 recipes-core/multitech/cell-radio-carrierswitch/cell-radio-carrierswitch.default delete mode 100644 recipes-core/multitech/cell-radio-carrierswitch/cell-radio-carrierswitch.init delete mode 100644 recipes-core/multitech/cell-radio-carrierswitch_1.0.bb delete mode 100644 recipes-core/multitech/commissioning_1.0.1.bb delete mode 100644 recipes-core/multitech/config/99_radio delete mode 100755 recipes-core/multitech/config/chat_wrapper delete mode 100644 recipes-core/multitech/config/chat_wrapper.default delete mode 100644 recipes-core/multitech/config/config-mths/default/bluetooth delete mode 100644 recipes-core/multitech/config/config-mths/default/dnsmasq delete mode 100644 recipes-core/multitech/config/config-mths/default/hostapd delete mode 100644 recipes-core/multitech/config/config-mths/default/ntpd delete mode 100644 recipes-core/multitech/config/config-mths/default/rs9113 delete mode 100644 recipes-core/multitech/config/config-mths/default/usb-gadget delete mode 100644 recipes-core/multitech/config/config-mths/dnsmasq.d/dhcp.conf delete mode 100644 recipes-core/multitech/config/config-mths/hostapd.conf delete mode 100755 recipes-core/multitech/config/config-mths/ifplugd/ifplugd.action delete mode 100644 recipes-core/multitech/config/config-mths/ifplugd/usb0.conf delete mode 100644 recipes-core/multitech/config/config-mths/ifplugd/usb1.conf delete mode 100644 recipes-core/multitech/config/config-mths/modprobe.d/cfg80211.conf delete mode 100644 recipes-core/multitech/config/config-mths/modprobe.d/mts-io.conf delete mode 100644 recipes-core/multitech/config/config-mths/network/interfaces.mths delete mode 100644 recipes-core/multitech/config/config.init delete mode 100644 recipes-core/multitech/config/network/interfaces delete mode 100644 recipes-core/multitech/config/ppp/chap-secrets delete mode 100644 recipes-core/multitech/config/ppp/options delete mode 100644 recipes-core/multitech/config/ppp/pap-secrets delete mode 100644 recipes-core/multitech/config/ppp/peers/README.fwswitch delete mode 100644 recipes-core/multitech/config/ppp/peers/cdma delete mode 100644 recipes-core/multitech/config/ppp/peers/cdma_chat delete mode 100644 recipes-core/multitech/config/ppp/peers/gsm delete mode 100644 recipes-core/multitech/config/ppp/peers/gsm_chat delete mode 100644 recipes-core/multitech/config/ppp/peers/l4e1 delete mode 100644 recipes-core/multitech/config/ppp/peers/l4e1_chat delete mode 100644 recipes-core/multitech/config/ppp/peers/l4n1 delete mode 120000 recipes-core/multitech/config/ppp/peers/l4n1_chat delete mode 100644 recipes-core/multitech/config/ppp/peers/l4n1_chat_non_vz delete mode 100644 recipes-core/multitech/config/ppp/peers/l4n1_chat_vz delete mode 100644 recipes-core/multitech/config/ppp/peers/lap3 delete mode 100644 recipes-core/multitech/config/ppp/peers/lap3_chat delete mode 100644 recipes-core/multitech/config/ppp/peers/leu1 delete mode 100644 recipes-core/multitech/config/ppp/peers/leu1_chat delete mode 100644 recipes-core/multitech/config/ppp/peers/lna3 delete mode 120000 recipes-core/multitech/config/ppp/peers/lna3_chat delete mode 100644 recipes-core/multitech/config/ppp/peers/lna3_chat_non_vz delete mode 100644 recipes-core/multitech/config/ppp/peers/lna3_chat_vz delete mode 100644 recipes-core/multitech/config/ppp/peers/lsp3 delete mode 100644 recipes-core/multitech/config/ppp/peers/lsp3_chat delete mode 100644 recipes-core/multitech/config/ppp/peers/lvw2 delete mode 100644 recipes-core/multitech/config/ppp/peers/lvw2_chat delete mode 100644 recipes-core/multitech/config_2.3.bb delete mode 100644 recipes-core/multitech/reset-handler/reset-handler.default delete mode 100644 recipes-core/multitech/reset-handler/reset-handler.init delete mode 100755 recipes-core/multitech/reset-handler/reset-handler.sh delete mode 100644 recipes-core/multitech/reset-handler_1.0.bb delete mode 100644 recipes-core/multitech/upgrade-reboot_1.0.0.bb delete mode 100644 recipes-core/sysvinit/files/bootlogd delete mode 100755 recipes-core/sysvinit/files/rc delete mode 100644 recipes-core/sysvinit/files/start_getty_open delete mode 100644 recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend delete mode 100644 recipes-navigation/gpsd/gpsd-3.16/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch delete mode 100644 recipes-navigation/gpsd/gpsd-3.16/0001-include-sys-ttydefaults.h.patch delete mode 100644 recipes-navigation/gpsd/gpsd-3.16/0002-SConstruct-remove-rpath.patch delete mode 100644 recipes-navigation/gpsd/gpsd-3.16/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch delete mode 100644 recipes-navigation/gpsd/gpsd-3.16/0005-suppress-text-in-binary.patch delete mode 100644 recipes-navigation/gpsd/gpsd-3.16/0006-itu_r_tf_460_6.patch delete mode 100644 recipes-navigation/gpsd/gpsd-3.16/0006-sysclockcrash.patch delete mode 100644 recipes-navigation/gpsd/gpsd-3.16/0006-ubxtimelps.patch delete mode 100644 recipes-navigation/gpsd/gpsd-3.16/0008-major_gnu.patch delete mode 100644 recipes-navigation/gpsd/gpsd-3.16/leap2017Aug31.patch delete mode 100644 recipes-navigation/gpsd/gpsd-3.16/leap2017Aug31.readme.txt delete mode 100644 recipes-navigation/gpsd/gpsd-3.18.1/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch delete mode 100644 recipes-navigation/gpsd/gpsd-3.18.1/0001-include-sys-ttydefaults.h.patch delete mode 100644 recipes-navigation/gpsd/gpsd-3.18.1/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch delete mode 100644 recipes-navigation/gpsd/gpsd-3.18.1/0006-itu_r_tf_460_6.patch delete mode 100644 recipes-navigation/gpsd/gpsd-3.18.1/0006-ubxtimelps.patch delete mode 100644 recipes-navigation/gpsd/gpsd-3.18.1/leap2017Aug31.patch delete mode 100644 recipes-navigation/gpsd/gpsd-3.18.1/leap2017Aug31.readme.txt delete mode 100644 recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb delete mode 100755 recipes-navigation/gpsd/gpsd/gpsd delete mode 100644 recipes-navigation/gpsd/gpsd/gpsd-default delete mode 100644 recipes-navigation/gpsd/gpsd/gpsd.rules delete mode 100644 recipes-navigation/gpsd/gpsd/gpsd.service delete mode 100644 recipes-navigation/gpsd/gpsd/gpsd_fixed.sh delete mode 100755 recipes-navigation/gpsd/gpsd/gpsd_settime.sh delete mode 100755 recipes-navigation/gpsd/gpsd/gpsd_ubx_fixed.sh delete mode 100755 recipes-navigation/gpsd/gpsd/gpsd_ubx_settime.sh delete mode 100644 recipes-navigation/gpsd/gpsd_3.16.bb delete mode 100644 recipes-navigation/gpsd/gpsd_3.16.bb.old delete mode 100644 recipes-navigation/gpsd/gpsd_3.18.1.bb delete mode 100644 recipes-navigation/gpsd/gpsd_3.18.1.bb.save delete mode 100755 recipes-navigation/gpsd/gpsdupdater/bin/bldgpsd.sh delete mode 100755 recipes-navigation/gpsd/gpsdupdater/lib/bashinstaller.sh delete mode 100755 recipes-navigation/gpsd/gpsdupdater/lib/opkginstall.sh delete mode 100644 recipes-navigation/gpsd/libgps24_3.18.1.bb delete mode 100644 recipes-navigation/gpsd/libgps24_3.18.1.bb.old diff --git a/conf/distro/java.inc b/conf/distro/java.inc deleted file mode 100644 index 6980075..0000000 --- a/conf/distro/java.inc +++ /dev/null @@ -1,11 +0,0 @@ -PREFERRED_PROVIDER_virtual/java-initial-native = "cacao-initial-native" -PREFERRED_PROVIDER_virtual/java-native = "jamvm-native" - -#PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial" - -PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native" - -#PREFERRED_VERSION_openjdk-7-jre = "25b30-2.3.12" -#PREFERRED_VERSION_icedtea7-native = "2.1.3" - -#PREFERRED_PROVIDER_openjdk-7-jre = "openjdk-7-jre" diff --git a/conf/distro/mlinux.conf b/conf/distro/mlinux.conf deleted file mode 100644 index 98ee5be..0000000 --- a/conf/distro/mlinux.conf +++ /dev/null @@ -1,77 +0,0 @@ -DISTRO = "mlinux" -DISTRO_NAME = "mLinux" -#DISTRO_BASE_VERSION = "5.0" -DISTRO_BASE_VERSION = "6.0" -#DISTRO_VERSION = "${DISTRO_BASE_VERSION}.0dev34" -DISTRO_VERSION = "${DISTRO_BASE_VERSION}.0dev1" -DISTRO_CODENAME = "" -SDK_VENDOR = "-mlinux" -SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}" -SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${IMAGE_BASENAME}-${TUNE_PKGARCH}" -SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}" - -# add static libs to toolchain builds -SDKIMAGE_FEATURES = "dev-pkgs dbg-pkgs staticdev-pkgs" - -MAINTAINER = "MultiTech Systems " - -TARGET_VENDOR = "-mlinux" - -LOCALCONF_VERSION = "1" -LAYER_CONF_VERSION ?= "6" - -DISTRO_FEATURES_MLINUX = "argp largefile xattr \ - ipv6 ipsec ppp \ - bluetooth irda usbgadget usbhost wifi \ - cramfs ext2 smbfs nfs \ - libc-crypt pam \ - sysvinit x11" -DISTRO_FEATURES ?= "${DISTRO_FEATURES_LIBC} ${DISTRO_FEATURES_MLINUX}" - -# disable pulseaudio -DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio" - -# extra packages to add to images -DISTRO_EXTRA_RDEPENDS += "mlinux-version" - -# add mlinux source mirror -INHERIT += "mlinux-mirrors" - -# Package feed configuration -DISTRO_FEED_URI = "http://multitech.net/mlinux/feeds/${DISTRO_VERSION}" -DISTRO_FEED_PREFIX = "mlinux" - -EXTRAOPKGCONFIG = "" - -# don't append to tmpdir -TCLIBCAPPEND = "" - -IPKG_VARIANT = "opkg" -DEFAULT_TIMEZONE = "America/Chicago" - -# default mtadm password -MTADM_PASSWORD_HASH ?= "e97PZLy9l09O6" - -SANITY_TESTED_DISTROS ?= " \ - Ubuntu-14.04 \n \ - Ubuntu-14.10 \n \ - Ubuntu-15.04 \n \ - Ubuntu-15.10 \n \ - Ubuntu-16.04 \n \ - Fedora-22 \n \ - Fedora-23 \n \ - Fedora-24 \n \ - CentOSLinux-7.* \n \ - Debian-8.* \n \ - openSUSE-13.2 \n \ - SUSELINUX-42.1 \n \ - " - -PREFERRED_PROVIDER_jpeg = "jpeg" -PREFERRED_PROVIDER_jpeg-native = "jpeg-native" -require java.inc - -PREFERRED_VERSION_nodejs ?= "10.%" -PREFERRED_VERSION_nodejs-native ?= "10.%" - -PREFERRED_VERSION_gpsd ?= "3.18.%" diff --git a/recipes-core/mlinux/mlinux-feed-configs.bb b/recipes-core/mlinux/mlinux-feed-configs.bb deleted file mode 100644 index 4291f24..0000000 --- a/recipes-core/mlinux/mlinux-feed-configs.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Configuration files for online package repositories aka feeds" -PR = "r1" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -feeds="all ${TUNE_PKGARCH} ${MACHINE_ARCH}" -feed_file="mlinux-feed.conf" - -do_compile() { - mkdir -p ${S}/${sysconfdir}/opkg - rm -f ${S}/${sysconfdir}/opkg/${feed_file} - for feed in ${feeds}; do - echo "src/gz ${DISTRO_FEED_PREFIX}-${feed} ${DISTRO_FEED_URI}/${feed}" >> ${S}/${sysconfdir}/opkg/${feed_file} - done -} -do_install () { - install -d ${D}${sysconfdir}/opkg - install -m 0644 ${S}/${sysconfdir}/opkg/* ${D}${sysconfdir}/opkg/ -} - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -CONFFILES_${PN} += "${sysconfdir}/opkg/${feed_file}" diff --git a/recipes-core/mlinux/mlinux-version.bb b/recipes-core/mlinux/mlinux-version.bb deleted file mode 100644 index 85adfbb..0000000 --- a/recipes-core/mlinux/mlinux-version.bb +++ /dev/null @@ -1,22 +0,0 @@ -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -inherit mlinux_metadata_scm - -# always parse this file so PV can change automatically -BB_DONT_CACHE = "1" - -PV = "${DISTRO_VERSION}_${MLINUX_METADATA_REVISION}" -PR = "r2" -PE = "1" - -PACKAGES = "${PN}" -PACKAGE_ARCH = "${MACHINE_ARCH}" - -do_install() { - mkdir -p ${D}${sysconfdir} - echo "mLinux ${DISTRO_VERSION}" > ${D}${sysconfdir}/mlinux-version - echo "Built from branch: ${MLINUX_METADATA_BRANCH}" >> ${D}${sysconfdir}/mlinux-version - echo "Revision: ${MLINUX_METADATA_REVISION}" >> ${D}${sysconfdir}/mlinux-version - echo "${MLINUX_LAYERS}" > ${D}${sysconfdir}/mlinux-layers -} diff --git a/recipes-core/multitech/cell-radio-carrierswitch/cell-radio-carrierswitch.default b/recipes-core/multitech/cell-radio-carrierswitch/cell-radio-carrierswitch.default deleted file mode 100644 index 7128721..0000000 --- a/recipes-core/multitech/cell-radio-carrierswitch/cell-radio-carrierswitch.default +++ /dev/null @@ -1,6 +0,0 @@ -# set to "no" to disable cell-radio-fwswitch on boot -ENABLED="yes" - -# The default timeout is 60 seconds. -# It depends on how long your radio takes to get ready. -# export TIMEOUT 60 diff --git a/recipes-core/multitech/cell-radio-carrierswitch/cell-radio-carrierswitch.init b/recipes-core/multitech/cell-radio-carrierswitch/cell-radio-carrierswitch.init deleted file mode 100644 index 6b8a640..0000000 --- a/recipes-core/multitech/cell-radio-carrierswitch/cell-radio-carrierswitch.init +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -# no firmware switch by default -ENABLED="no" - -[ -r /etc/default/cell-radio-carrierswitch ] && source /etc/default/cell-radio-carrierswitch -[ "$ENABLED" == "yes" ] || exit 0 - -# It may take a couple of boots to get the APN straightened out. -# mlinux-switch-apn is only effective for LNA3. It will only -# take action if it detects a different SIM from the one -# that is configured. It requires a RADIO that is active. -# The script is executed in the background to prevent holding up the -# boot. - -case $1 in - start) - (/usr/sbin/mlinux-switch-apn 2>&1 | logger -p daemon.notice) & - ;; - - *) - echo "Usage: $0 {start}" - exit 2 - ;; -esac - diff --git a/recipes-core/multitech/cell-radio-carrierswitch_1.0.bb b/recipes-core/multitech/cell-radio-carrierswitch_1.0.bb deleted file mode 100644 index 0220dba..0000000 --- a/recipes-core/multitech/cell-radio-carrierswitch_1.0.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "Radio firmware switching functionality for dual image units (only LNA3 radios for now)" -SECTION = "base" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -PR = "r1" - -RDEPENDS_${PN} = "radio-query radio-cmd mlinux-scripts" - -inherit update-rc.d -INITSCRIPT_NAME = "cell-radio-carrierswitch" -INITSCRIPT_PARAMS = "start 63 5 ." - -SRC_URI = "\ - file://cell-radio-carrierswitch.default \ - file://cell-radio-carrierswitch.init \ -" - -do_install() { - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/cell-radio-carrierswitch.init ${D}${sysconfdir}/init.d/cell-radio-carrierswitch - - install -d ${D}${sysconfdir}/default - install -m 0644 ${WORKDIR}/cell-radio-carrierswitch.default ${D}${sysconfdir}/default/cell-radio-carrierswitch -} - diff --git a/recipes-core/multitech/commissioning_1.0.1.bb b/recipes-core/multitech/commissioning_1.0.1.bb deleted file mode 100644 index 06e1904..0000000 --- a/recipes-core/multitech/commissioning_1.0.1.bb +++ /dev/null @@ -1,42 +0,0 @@ -inherit update-rc.d - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=593c81e8a2bd8b4c4e310d8792372b13" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -DEPENDS = "fcgi jsoncpp shadow" -RDEPENDS_${PN} += "jsoncpp lighttpd lighttpd-module-fastcgi lighttpd-module-openssl lighttpd-module-redirect bash" -RDEPENDS_${PN}-php-fpm += "php-fpm ${PN}" -PACKAGES =+ "${PN}-php-fpm" - -INITSCRIPT_PACKAGES = "${PN} ${PN}-php-fpm" -INITSCRIPT_NAME_${PN} = "commission " -INITSCRIPT_PARAMS_${PN} = "start 9 2 3 4 5 ." -INITSCRIPT_NAME_${PN}-php-fpm = "commission-php-fpm" -INITSCRIPT_PARAMS_${PN}-php-fpm = "start 9 2 3 4 5 ." - -PR = "r1" -SRCREV = "${PV}" - -FILES_${PN}-php-fpm = "/etc/init.d/commission-php-fpm" -FILES_${PN} += "/www/" - -SRC_URI = "git://git.multitech.net/commissioning;branch=master" - -S = "${WORKDIR}/git" -do_compile() { - oe_runmake all -} -do_install() { - - cp -a ${S}/${sysconfdir}/ ${D}/ - cp -a ${S}/www/ ${D}/ - cp -a ${S}/${prefix} ${D}/ - chmod 755 ${D}/etc/init.d/* - chmod 755 ${D}/${libexecdir}/commission/* - chown -R root:root ${D}/ - - oe_runmake install DESTDIR=${D} - chmod 755 ${D}/usr/bin/commissioning.fcgi -} diff --git a/recipes-core/multitech/config/99_radio b/recipes-core/multitech/config/99_radio deleted file mode 100644 index c2aa885..0000000 --- a/recipes-core/multitech/config/99_radio +++ /dev/null @@ -1,24 +0,0 @@ -# This configuration file lists filesystem objects that should get verified -# during startup and be created if missing. -# -# Every line must either be a comment starting with # -# or a definition of format: -# -# where the items are separated by whitespace ! -# -# : d|f|l : (d)irectory|(f)ile|(l)ink -# -# A linking example: -# l root root 0777 /var/test /tmp/testfile -# f root root 0644 /var/test none -# -# Understanding links: -# When populate-volatile is to verify/create a directory or file, it will first -# check it's existence. If a link is found to exist in the place of the target, -# the path of the target is replaced with the target the link points to. -# Thus, if a link is in the place to be verified, the object will be created -# in the place the link points to instead. -# This explains the order of "link before object" as in the example above, where -# a link will be created at /var/test pointing to /tmp/testfile and due to this -# link the file defined as /var/test will actually be created as /tmp/testfile. -d root dialout 2775 /run/radio none diff --git a/recipes-core/multitech/config/chat_wrapper b/recipes-core/multitech/config/chat_wrapper deleted file mode 100755 index f1fd30c..0000000 --- a/recipes-core/multitech/config/chat_wrapper +++ /dev/null @@ -1,205 +0,0 @@ -#!/bin/bash - -# Rules for chat scripts -# No comments allowed at the end of AT+CGDCONT in chat script -# The last AT+CGDCONT= must use the same context as the dialer. -# If desired, The AT+CGDCONT may be prefixed by #MT[[:space:]]+ -# Example: -#MT AT+CGDCONT="IPV6","data","192.168.2.1",0,1,"EXTRA" -# -# If you do not use a comment, the entire AT+CGDCONT command -# must be surrounded by apostrophes. This command will be executed -# twice, once in the chat wrapper, and a 2nd time in the chat -# itself. -# -# The space after "#MT" may be any number including tabs. -# If #MT AT+CGDCONT= is found, only the last one is chosen. -# Any uncommented AT+CGDCONT= is then ignored. -# If there are not #MT AT+CGDCONT= lines, then any line without -# a comment chararacter before AT+CGDONT= is accepted, but only the -# last one in the file. - -NAME=chat_wrapper -CONFIG=/etc/default/${NAME} -function finish -{ - ${LOG} "Launch:" "$@" - exec "$@" - # NOTREACHED -} - -[[ -f $CONFIG ]] || exit 1 - -. ${CONFIG} - -: ${REGWAITTIME:=300} -: ${FINALWAIT:=5} - -: ${LOG:="/usr/bin/logger -t ${NAME} -p daemon.notice"} - -${LOG} Timeout is $REGWAITTIME, execute "$@" -((i=$#)) -chatscript="${!i}" -${LOG} Parsing chat script "$chatscript" - -# CONTEXT is last context string in chat script -CONTEXT=$(egrep "^#MT[[:space:]]+(AT\+CGDCONT=.*)" ${chatscript} | tail -1) -if ((${#CONTEXT} == 0)) ; then - CONTEXT=$(egrep "^[^#]+AT\+CGDCONT=" ${chatscript} | tail -1) - [[ $CONTEXT =~ \'(AT\+CGDCONT=([0-9]+)[^$\']+) ]] -else - [[ $CONTEXT =~ (AT\+CGDCONT=([0-9]+).*)$ ]] -fi - -# CONTEXTNUM is the context number that is configured in the dialer. -CONTEXT="${BASH_REMATCH[1]}" -if ((${#CONTEXT} == 0)) ; then - ${LOG} No context specifiction in the chat script - finish "$@" - # NOTREACHED -fi -((CONTEXTNUM=${BASH_REMATCH[2]})) - - -${LOG} "Using Context ${CONTEXTNUM} based on chat script: ${CONTEXT}" - -# At this point if there is no context number, we can skip everything else. - -# Get Modem's context settings -MCONTEXT=$(/usr/bin/radio-cmd ${RADIOOPTION} -t10000 'AT+CGDCONT?' 2>&1 | tr -d '\r') -if [[ $MCONTEXT =~ [Ee][Rr][Rr][Oo][Rr] ]] ; then - RADIOOPTION="${RADIOOPTION2}" - MCONTEXT=$(/usr/bin/radio-cmd ${RADIOOPTION} -t10000 'AT+CGDCONT?' 2>&1 | tr -d '\r') -fi - -if ! [[ $MCONTEXT =~ \+CGDCONT:[[:space:]]+${CONTEXTNUM},\"([^\"]*)\",\"([^\"]*)\",\"([^\"]*)\",([0-9]+),([0-9]+)([^$'\n']*) ]] ; then - logger -s -p daemon.error "No valid context in modem. Is it ready?" - echo "$MCONTEXT" | logger -s -p daemon.error -fi - -MPDP="${BASH_REMATCH[1]}" -MAPN="${BASH_REMATCH[2]}" -MADDR="${BASH_REMATCH[3]}" -MDCOMP="${BASH_REMATCH[4]}" -MHCOMP="${BASH_REMATCH[5]}" -MFULLBOAT="${BASH_REMATCH[6]}" - -[[ $CONTEXT =~ AT\+CGDCONT=${CONTEXTNUM},\"([^\"]*)\",\"([^\"]*)\"(,\"([^\"]*)\"(,([0-9]+)(,([0-9]+)(,[^\']*))*)*)* ]] -PDP="${BASH_REMATCH[1]}" -APN="${BASH_REMATCH[2]}" -ADDR="${BASH_REMATCH[4]}" # Optional -DCOMP="${BASH_REMATCH[6]}" # Optional -HCOMP="${BASH_REMATCH[8]}" # Optional -FULLBOAT="${BASH_REMATCH[9]}" # Optional - -# On some modems there are more parameters than others. -if [[ $MFULLBOAT != $FULLBOAT ]] ; then - ${LOG} "Only the first five context parameters are considered. The rest will be ignored." - ${LOG} "modem: \"$MFULLBOAT\"" - ${LOG} "chat script: \"$FULLBOAT\"" -fi - -if ((${#DCOMP} == 0)) ; then - ((DCOMP=0)) # Default -fi -if ((${#HCOMP} == 0)) ; then - ((HCOMP=0)) # Default -fi - -# Only update context on a mismatch between chat and modem. -if [[ $MPDP != $PDP ]] || [[ $MAPN != $APN ]] || \ - [[ $MADDR != $ADDR ]] || ((MDCOMP != DCOMP)) || \ - ((MHCOMP != HCOMP)) ; then - ${LOG} "Modem context $MPDP,$MAPN,$MADDR,$MDCOMP,$MHCOMP does not match chat script" - ${LOG} "Chat script context $PDP,$APN,$ADDR,$DCOMP,$HCOMP does not match the modem" - if [[ $MPDP != $PDP ]] ; then - ${LOG} "PDP mismatch" - fi - if [[ $MAPN != $APN ]] ; then - ${LOG} "APN mismatch" - fi - if [[ $MADDR != $ADDR ]] ; then - ${LOG} "ADDR mismatch" - fi - if [[ $MDCOMP != $DCOMP ]] ; then - ${LOG} "DCOMP mismatch" - fi - if [[ $MHCOMP != $HCOMP ]] ; then - ${LOG} "HCOMP mismatch" - fi - if [[ $MFULLBOAT != $FULLBOAT ]] ; then - ${LOG} "Final parameter mismatches ignored" - ${LOG} "Parameter 6 and up on the modem:" - ${LOG} "\"${MFULLBOAT}\"" - ${LOG} "Parameter 6 and up on the chat script:" - ${LOG} "\"${FULLBOAT}\"" - fi - ${LOG} "$MCONTEXT" - ${LOG} "Dropping registration with carrier to set context" - # Need to deregister - /usr/bin/radio-cmd ${RADIOOPTION} -t10000 'AT+COPS=2' - # H5 radios do not like addresses that are empty with "" - if ((${#ADDR} == 0)) ; then - CMDSTR="AT+CGDCONT=${CONTEXTNUM},\"${PDP}\",\"${APN}\",,$DCOMP,${HCOMP}${FULLBOAT}" - else - CMDSTR="AT+CGDCONT=${CONTEXTNUM},\"${PDP}\",\"${APN}\",\"${ADDR}\",$DCOMP,${HCOMP}${FULLBOAT}" - fi - ${LOG} "Issued command /usr/bin/radio-cmd ${RADIOOPTION} -t10000 ..." - ${LOG} "... ${CMDSTR}" - - # If we fail to set the APN, sleep and try it again for up to 10 seconds. - result=1 - count=10 - while ((result != 0)) && ((count > 0)) ; do - ((count--)) || true - LOGMSG=$(/usr/bin/radio-cmd ${RADIOOPTION} -t10000 "${CMDSTR}" 2>&1) - result=$? - ${LOG} "Result ${result}, Got response ${LOGMSG}" - if [[ $LOGMSG =~ ERROR ]] ; then - result=1 - fi - sleep 1 - done - - # re-enable the modem to defaults. - /usr/bin/radio-cmd ${RADIOOPTION} -t10000 'AT+COPS=0' - sleep 1 - - # Some older modems will not re-register after the COPS - # command if you do not reset them using CFUN. - /usr/bin/radio-cmd ${RADIOOPTION} -t10000 'AT+CFUN=0' - /usr/bin/radio-cmd ${RADIOOPTION} -t10000 'AT+CFUN=1' - - # Abort PPP if the Context is not correct. We don't want - # to cause the carrier to disable the account by dialing - # out with a bad APN. - if ((result != 0)) ; then - ${LOG} "AT+CGDCONT failed, aborting" - exit $result - fi - sleep 1 - ${LOG} "New context is set. Wait up to $REGWAITTIME seconds to register" - # Wait for registration - uptime=$(cat /proc/uptime) - [[ $uptime =~ ^([^\.]*) ]] - t0=${BASH_REMATCH[1]} - while ! [[ $(/usr/bin/radio-query ${RADIOOPTION} --netreg) =~ ^REGISTERED$ ]] ; do - sleep 5 - uptime=$(cat /proc/uptime) - [[ $uptime =~ ^([^\.]*) ]] - t1=${BASH_REMATCH[1]} - if ((t1-t0 > REGWAITTIME)) ; then - ${LOG} "$((t1-t0)) seconds has expired" - exit 1 - fi - done - uptime=$(cat /proc/uptime) - [[ $uptime =~ ^([^\.]*) ]] - t1=${BASH_REMATCH[1]} - ${LOG} "Re-registered in $((t1-t0)) seconds -- wait ${FINALWAIT} more seconds" - sleep $FINALWAIT -else - ${LOG} "Context $CONTEXTNUM matches and nothing to do." -fi -finish "$@" -# NOTREACHED diff --git a/recipes-core/multitech/config/chat_wrapper.default b/recipes-core/multitech/config/chat_wrapper.default deleted file mode 100644 index a1b4e41..0000000 --- a/recipes-core/multitech/config/chat_wrapper.default +++ /dev/null @@ -1,20 +0,0 @@ -# The maximum time to wait for registration -# when changing the modem context parameters. -# This is ignored if the context is -# already set correctly in the modem. -REGWAITTIME=300 - -# The time to wait after registration -# when setting the context -# before attempting a PPP connection. -# This is ignored if the context is -# already set correctly in the modem. -FINALWAIT=5 - -# Option for radio-query, radio-cmd -# Used by /usr/libexec/ppp/chat_wrapper, -# mlinux-switch-apn, mlinux-switch-cell-fw -RADIOOPTION="-d /dev/modem_at1" - -# Device to use if RADIOOPTION fails: -RADIOOPTION2="-d /dev/modem_at0" diff --git a/recipes-core/multitech/config/config-mths/default/bluetooth b/recipes-core/multitech/config/config-mths/default/bluetooth deleted file mode 100644 index ec46cfd..0000000 --- a/recipes-core/multitech/config/config-mths/default/bluetooth +++ /dev/null @@ -1,8 +0,0 @@ -# Set to 1 to enable bluetooth daemon -BLUETOOTH_ENABLED=1 - -# Use the following to setup bluetooth usability -BLUETOOTHCTL_CMD="power on\ndiscoverable on\npairable on\n" - -#Compatilitity mode -#MOREOPTIONS="-C" diff --git a/recipes-core/multitech/config/config-mths/default/dnsmasq b/recipes-core/multitech/config/config-mths/default/dnsmasq deleted file mode 100644 index 129fda1..0000000 --- a/recipes-core/multitech/config/config-mths/default/dnsmasq +++ /dev/null @@ -1,27 +0,0 @@ -# MTHS dnsmasq -# and a hook to set up config files for MTHS -ENABLED="yes" - -# This configuration is for manufacturing test. -# Factory resets should not put back wifi defaults. -if [[ -f /var/config/.defaults2.tar.gz ]] ; then - rm /var/config/.defaults2.tar.gz -fi - -# Stop ntpd. ntpd default is in root. -sed -i 's/ENABLED="yes"/ENABLED="no"/' /etc/default/ntpd -# Use the ifplugd in /var/config -if ! [[ -L /etc/ifplugd ]] ; then - rm -rf /etc/ifplugd - ln -s /var/config/ifplugd /etc/ifplugd - # ifplugd is already started (and probably bombed) - # restart it. - /etc/init.d/ifplugd stop - /etc/init.d/ifplugd start -fi - -if ! [[ -L /etc/default/usb-gadget ]] && [[ -f /var/config/default/usb-gadget ]] ; then - rm -rf /etc/default/usb-gadget - ln -s /var/config/default/usb-gadget /etc/default/usb-gadget -fi - diff --git a/recipes-core/multitech/config/config-mths/default/hostapd b/recipes-core/multitech/config/config-mths/default/hostapd deleted file mode 100644 index 75c1c8a..0000000 --- a/recipes-core/multitech/config/config-mths/default/hostapd +++ /dev/null @@ -1,11 +0,0 @@ -# set to "yes" to start hostapd on boot -START_ON_BOOT="yes" -DEVICEID=$(cat /sys/devices/platform/mts-io/device-id) -SSID="hs-${DEVICEID}" -CONF=/etc/hostapd.conf - -PREUP="ifdown wifi1 - ifup wifi1 - sed -ri 's/^ssid=.*/ssid=hs-'${DEVICEID}/ ${CONF} - logger -s -t hostapd -p daemon.alert 'hostapd SSID line is '${SSID}" - diff --git a/recipes-core/multitech/config/config-mths/default/ntpd b/recipes-core/multitech/config/config-mths/default/ntpd deleted file mode 100644 index a0d3bcf..0000000 --- a/recipes-core/multitech/config/config-mths/default/ntpd +++ /dev/null @@ -1,36 +0,0 @@ -ENABLED="no" - - -CONFIGFILE=/etc/ntp.conf - -# The GPSD_* parameters in this file are ignored -# if the uBlox GPS is not present. - -# Require a GPS lock/fix before starting NTP -# This is needed if we are not using NTP servers. -# NTP will not work with the GPS if the GPS is not -# locked before starting. -# See /etc/default/gpsd for the states required. -GPSD_REQUIRED=0 - -# Number of seconds between testing for a GPS -# lock prior to calling ntpd. -GPSD_WAIT_TIME=120 - -# Since the HW Clock could be off by a second or -# so, our GPS might get marked as a false ticker -# if we do not set the system clock to the GPS -# first. The current correct way to do this -# according to the ntp doc is ntpd -gq -c conffile -# which must be done before ntpd is started. -# conffile should exclude the local clock, so it is -# ignored while doing the initial sync. -# ntpd -gq apparently does not work with the GPS -# when tested with the clock more than one day off -# and no ntpd. The gps shared memory is never polled. -# -# If there is a uBlox GPS present, the time is -# read from the GPS to initialize the system time -# before NTP is started. -SET_SYSTEM_CLOCK=1 - diff --git a/recipes-core/multitech/config/config-mths/default/rs9113 b/recipes-core/multitech/config/config-mths/default/rs9113 deleted file mode 100644 index 2594625..0000000 --- a/recipes-core/multitech/config/config-mths/default/rs9113 +++ /dev/null @@ -1,14 +0,0 @@ -RS9113_LOAD=1 -RSI_ANTENNA_DIVERSITY=0 -COEX_MODE=6 -WLAN_RF_PWR_MODE=0x00 -BT_RF_PWR_MODE=0x00 -BT_RF_TX_POWER_MODE=0 -BT_RF_RX_POWER_MODE=0 -SET_COUNTRY_CODE=0 -ANT_SEL_VAL=2 -ONBOARD_ANT_SEL=1 -SET_RETRY_COUNT=15 -SLEEPTIME=100000 -INTSLEEPTIME=100000 - diff --git a/recipes-core/multitech/config/config-mths/default/usb-gadget b/recipes-core/multitech/config/config-mths/default/usb-gadget deleted file mode 100644 index 944ef8a..0000000 --- a/recipes-core/multitech/config/config-mths/default/usb-gadget +++ /dev/null @@ -1,6 +0,0 @@ -# set to "no" to disable usb-gadget -ENABLED="yes" - -USB_MODE="networking" -MODULE_OPTIONS="" - diff --git a/recipes-core/multitech/config/config-mths/dnsmasq.d/dhcp.conf b/recipes-core/multitech/config/config-mths/dnsmasq.d/dhcp.conf deleted file mode 100644 index 47eb1c0..0000000 --- a/recipes-core/multitech/config/config-mths/dnsmasq.d/dhcp.conf +++ /dev/null @@ -1,12 +0,0 @@ -interface=wifi1 -dhcp-range=10.0.0.100,10.0.0.250,12h -dhcp-lease-max=200 -dhcp-leasefile=/var/config/dnsmasq_dhcp_wifi1.leases -dhcp-option=option:netmask,255.255.255.0 -dhcp-option=option:router,10.0.0.1 -dhcp-option=option:dns-server,10.0.0.1 -dhcp-authoritative -interface=usb0 -dhcp-range=192.168.3.100,192.168.3.250,12h -dhcp-option=option:router,192.168.3.1 -dhcp-option=option:dns-server,192.168.3.1 diff --git a/recipes-core/multitech/config/config-mths/hostapd.conf b/recipes-core/multitech/config/config-mths/hostapd.conf deleted file mode 100644 index 8acd72b..0000000 --- a/recipes-core/multitech/config/config-mths/hostapd.conf +++ /dev/null @@ -1,1996 +0,0 @@ -##### hostapd configuration file ############################################## -# Empty lines and lines starting with # are ignored - -# AP netdevice name (without 'ap' postfix, i.e., wlan0 uses wlan0ap for -# management frames with the Host AP driver); wlan0 with many nl80211 drivers -# Note: This attribute can be overridden by the values supplied with the '-i' -# command line parameter. -interface=wifi1 - -# In case of atheros and nl80211 driver interfaces, an additional -# configuration parameter, bridge, may be used to notify hostapd if the -# interface is included in a bridge. This parameter is not used with Host AP -# driver. If the bridge parameter is not set, the drivers will automatically -# figure out the bridge interface (assuming sysfs is enabled and mounted to -# /sys) and this parameter may not be needed. -# -# For nl80211, this parameter can be used to request the AP interface to be -# added to the bridge automatically (brctl may refuse to do this before hostapd -# has been started to change the interface mode). If needed, the bridge -# interface is also created. -#bridge=br0 - -# Driver interface type (hostap/wired/none/nl80211/bsd); -# default: hostap). nl80211 is used with all Linux mac80211 drivers. -# Use driver=none if building hostapd as a standalone RADIUS server that does -# not control any wireless/wired driver. -# driver=hostap - -# Driver interface parameters (mainly for development testing use) -# driver_params= - -# hostapd event logger configuration -# -# Two output method: syslog and stdout (only usable if not forking to -# background). -# -# Module bitfield (ORed bitfield of modules that will be logged; -1 = all -# modules): -# bit 0 (1) = IEEE 802.11 -# bit 1 (2) = IEEE 802.1X -# bit 2 (4) = RADIUS -# bit 3 (8) = WPA -# bit 4 (16) = driver interface -# bit 5 (32) = IAPP -# bit 6 (64) = MLME -# -# Levels (minimum value for logged events): -# 0 = verbose debugging -# 1 = debugging -# 2 = informational messages -# 3 = notification -# 4 = warning -# -logger_syslog=-1 -logger_syslog_level=2 -logger_stdout=-1 -logger_stdout_level=2 - -# Interface for separate control program. If this is specified, hostapd -# will create this directory and a UNIX domain socket for listening to requests -# from external programs (CLI/GUI, etc.) for status information and -# configuration. The socket file will be named based on the interface name, so -# multiple hostapd processes/interfaces can be run at the same time if more -# than one interface is used. -# /var/run/hostapd is the recommended directory for sockets and by default, -# hostapd_cli will use it when trying to connect with hostapd. -ctrl_interface=/var/run/hostapd - -# Access control for the control interface can be configured by setting the -# directory to allow only members of a group to use sockets. This way, it is -# possible to run hostapd as root (since it needs to change network -# configuration and open raw sockets) and still allow GUI/CLI components to be -# run as non-root users. However, since the control interface can be used to -# change the network configuration, this access needs to be protected in many -# cases. By default, hostapd is configured to use gid 0 (root). If you -# want to allow non-root users to use the contron interface, add a new group -# and change this value to match with that group. Add users that should have -# control interface access to this group. -# -# This variable can be a group name or gid. -#ctrl_interface_group=wheel -ctrl_interface_group=0 - - -##### IEEE 802.11 related configuration ####################################### - -# SSID to be used in IEEE 802.11 management frames -ssid=hs- -# Alternative formats for configuring SSID -# (double quoted string, hexdump, printf-escaped string) -#ssid2="test" -#ssid2=74657374 -#ssid2=P"hello\nthere" - -# UTF-8 SSID: Whether the SSID is to be interpreted using UTF-8 encoding -#utf8_ssid=1 - -# Country code (ISO/IEC 3166-1). Used to set regulatory domain. -# Set as needed to indicate country in which device is operating. -# This can limit available channels and transmit power. -country_code=US - -# Enable IEEE 802.11d. This advertises the country_code and the set of allowed -# channels and transmit power levels based on the regulatory limits. The -# country_code setting must be configured with the correct country for -# IEEE 802.11d functions. -# (default: 0 = disabled) -#ieee80211d=1 - -# Enable IEEE 802.11h. This enables radar detection and DFS support if -# available. DFS support is required on outdoor 5 GHz channels in most countries -# of the world. This can be used only with ieee80211d=1. -# (default: 0 = disabled) -#ieee80211h=1 - -# Add Power Constraint element to Beacon and Probe Response frames -# This config option adds Power Constraint element when applicable and Country -# element is added. Power Constraint element is required by Transmit Power -# Control. This can be used only with ieee80211d=1. -# Valid values are 0..255. -#local_pwr_constraint=3 - -# Set Spectrum Management subfield in the Capability Information field. -# This config option forces the Spectrum Management bit to be set. When this -# option is not set, the value of the Spectrum Management bit depends on whether -# DFS or TPC is required by regulatory authorities. This can be used only with -# ieee80211d=1 and local_pwr_constraint configured. -#spectrum_mgmt_required=1 - -# Operation mode (a = IEEE 802.11a (5 GHz), b = IEEE 802.11b (2.4 GHz), -# g = IEEE 802.11g (2.4 GHz), ad = IEEE 802.11ad (60 GHz); a/g options are used -# with IEEE 802.11n (HT), too, to specify band). For IEEE 802.11ac (VHT), this -# needs to be set to hw_mode=a. When using ACS (see channel parameter), a -# special value "any" can be used to indicate that any support band can be used. -# This special case is currently supported only with drivers with which -# offloaded ACS is used. -# Default: IEEE 802.11b -hw_mode=g - -# Channel number (IEEE 802.11) -# (default: 0, i.e., not set) -# Please note that some drivers do not use this value from hostapd and the -# channel will need to be configured separately with iwconfig. -# -# If CONFIG_ACS build option is enabled, the channel can be selected -# automatically at run time by setting channel=acs_survey or channel=0, both of -# which will enable the ACS survey based algorithm. -channel=10 - -# ACS tuning - Automatic Channel Selection -# See: http://wireless.kernel.org/en/users/Documentation/acs -# -# You can customize the ACS survey algorithm with following variables: -# -# acs_num_scans requirement is 1..100 - number of scans to be performed that -# are used to trigger survey data gathering of an underlying device driver. -# Scans are passive and typically take a little over 100ms (depending on the -# driver) on each available channel for given hw_mode. Increasing this value -# means sacrificing startup time and gathering more data wrt channel -# interference that may help choosing a better channel. This can also help fine -# tune the ACS scan time in case a driver has different scan dwell times. -# -# acs_chan_bias is a space-separated list of : pairs. It can be -# used to increase (or decrease) the likelihood of a specific channel to be -# selected by the ACS algorithm. The total interference factor for each channel -# gets multiplied by the specified bias value before finding the channel with -# the lowest value. In other words, values between 0.0 and 1.0 can be used to -# make a channel more likely to be picked while values larger than 1.0 make the -# specified channel less likely to be picked. This can be used, e.g., to prefer -# the commonly used 2.4 GHz band channels 1, 6, and 11 (which is the default -# behavior on 2.4 GHz band if no acs_chan_bias parameter is specified). -# -# Defaults: -#acs_num_scans=5 -#acs_chan_bias=1:0.8 6:0.8 11:0.8 - -# Channel list restriction. This option allows hostapd to select one of the -# provided channels when a channel should be automatically selected. -# Channel list can be provided as range using hyphen ('-') or individual -# channels can be specified by space (' ') separated values -# Default: all channels allowed in selected hw_mode -#chanlist=100 104 108 112 116 -#chanlist=1 6 11-13 - -# Beacon interval in kus (1.024 ms) (default: 100; range 15..65535) -beacon_int=100 - -# DTIM (delivery traffic information message) period (range 1..255): -# number of beacons between DTIMs (1 = every beacon includes DTIM element) -# (default: 2) -dtim_period=2 - -# Maximum number of stations allowed in station table. New stations will be -# rejected after the station table is full. IEEE 802.11 has a limit of 2007 -# different association IDs, so this number should not be larger than that. -# (default: 2007) -max_num_sta=255 - -# RTS/CTS threshold; -1 = disabled (default); range -1..65535 -# If this field is not included in hostapd.conf, hostapd will not control -# RTS threshold and 'iwconfig wlan# rts ' can be used to set it. -rts_threshold=-1 - -# Fragmentation threshold; -1 = disabled (default); range -1, 256..2346 -# If this field is not included in hostapd.conf, hostapd will not control -# fragmentation threshold and 'iwconfig wlan# frag ' can be used to set -# it. -fragm_threshold=-1 - -# Rate configuration -# Default is to enable all rates supported by the hardware. This configuration -# item allows this list be filtered so that only the listed rates will be left -# in the list. If the list is empty, all rates are used. This list can have -# entries that are not in the list of rates the hardware supports (such entries -# are ignored). The entries in this list are in 100 kbps, i.e., 11 Mbps = 110. -# If this item is present, at least one rate have to be matching with the rates -# hardware supports. -# default: use the most common supported rate setting for the selected -# hw_mode (i.e., this line can be removed from configuration file in most -# cases) -#supported_rates=10 20 55 110 60 90 120 180 240 360 480 540 - -# Basic rate set configuration -# List of rates (in 100 kbps) that are included in the basic rate set. -# If this item is not included, usually reasonable default set is used. -#basic_rates=10 20 -#basic_rates=10 20 55 110 -#basic_rates=60 120 240 - -# Short Preamble -# This parameter can be used to enable optional use of short preamble for -# frames sent at 2 Mbps, 5.5 Mbps, and 11 Mbps to improve network performance. -# This applies only to IEEE 802.11b-compatible networks and this should only be -# enabled if the local hardware supports use of short preamble. If any of the -# associated STAs do not support short preamble, use of short preamble will be -# disabled (and enabled when such STAs disassociate) dynamically. -# 0 = do not allow use of short preamble (default) -# 1 = allow use of short preamble -#preamble=1 - -# Station MAC address -based authentication -# Please note that this kind of access control requires a driver that uses -# hostapd to take care of management frame processing and as such, this can be -# used with driver=hostap or driver=nl80211, but not with driver=atheros. -# 0 = accept unless in deny list -# 1 = deny unless in accept list -# 2 = use external RADIUS server (accept/deny lists are searched first) -macaddr_acl=0 - -# Accept/deny lists are read from separate files (containing list of -# MAC addresses, one per line). Use absolute path name to make sure that the -# files can be read on SIGHUP configuration reloads. -#accept_mac_file=/etc/hostapd.accept -#deny_mac_file=/etc/hostapd.deny - -# IEEE 802.11 specifies two authentication algorithms. hostapd can be -# configured to allow both of these or only one. Open system authentication -# should be used with IEEE 802.1X. -# Bit fields of allowed authentication algorithms: -# bit 0 = Open System Authentication -# bit 1 = Shared Key Authentication (requires WEP) -auth_algs=3 - -# Send empty SSID in beacons and ignore probe request frames that do not -# specify full SSID, i.e., require stations to know SSID. -# default: disabled (0) -# 1 = send empty (length=0) SSID in beacon and ignore probe request for -# broadcast SSID -# 2 = clear SSID (ASCII 0), but keep the original length (this may be required -# with some clients that do not support empty SSID) and ignore probe -# requests for broadcast SSID -ignore_broadcast_ssid=0 - -# Do not reply to broadcast Probe Request frames from unassociated STA if there -# is no room for additional stations (max_num_sta). This can be used to -# discourage a STA from trying to associate with this AP if the association -# would be rejected due to maximum STA limit. -# Default: 0 (disabled) -#no_probe_resp_if_max_sta=0 - -# Additional vendor specific elements for Beacon and Probe Response frames -# This parameter can be used to add additional vendor specific element(s) into -# the end of the Beacon and Probe Response frames. The format for these -# element(s) is a hexdump of the raw information elements (id+len+payload for -# one or more elements) -#vendor_elements=dd0411223301 - -# Additional vendor specific elements for (Re)Association Response frames -# This parameter can be used to add additional vendor specific element(s) into -# the end of the (Re)Association Response frames. The format for these -# element(s) is a hexdump of the raw information elements (id+len+payload for -# one or more elements) -#assocresp_elements=dd0411223301 - -# TX queue parameters (EDCF / bursting) -# tx_queue__ -# queues: data0, data1, data2, data3, after_beacon, beacon -# (data0 is the highest priority queue) -# parameters: -# aifs: AIFS (default 2) -# cwmin: cwMin (1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, -# 16383, 32767) -# cwmax: cwMax (same values as cwMin, cwMax >= cwMin) -# burst: maximum length (in milliseconds with precision of up to 0.1 ms) for -# bursting -# -# Default WMM parameters (IEEE 802.11 draft; 11-03-0504-03-000e): -# These parameters are used by the access point when transmitting frames -# to the clients. -# -# Low priority / AC_BK = background -#tx_queue_data3_aifs=7 -#tx_queue_data3_cwmin=15 -#tx_queue_data3_cwmax=1023 -#tx_queue_data3_burst=0 -# Note: for IEEE 802.11b mode: cWmin=31 cWmax=1023 burst=0 -# -# Normal priority / AC_BE = best effort -#tx_queue_data2_aifs=3 -#tx_queue_data2_cwmin=15 -#tx_queue_data2_cwmax=63 -#tx_queue_data2_burst=0 -# Note: for IEEE 802.11b mode: cWmin=31 cWmax=127 burst=0 -# -# High priority / AC_VI = video -#tx_queue_data1_aifs=1 -#tx_queue_data1_cwmin=7 -#tx_queue_data1_cwmax=15 -#tx_queue_data1_burst=3.0 -# Note: for IEEE 802.11b mode: cWmin=15 cWmax=31 burst=6.0 -# -# Highest priority / AC_VO = voice -#tx_queue_data0_aifs=1 -#tx_queue_data0_cwmin=3 -#tx_queue_data0_cwmax=7 -#tx_queue_data0_burst=1.5 -# Note: for IEEE 802.11b mode: cWmin=7 cWmax=15 burst=3.3 - -# 802.1D Tag (= UP) to AC mappings -# WMM specifies following mapping of data frames to different ACs. This mapping -# can be configured using Linux QoS/tc and sch_pktpri.o module. -# 802.1D Tag 802.1D Designation Access Category WMM Designation -# 1 BK AC_BK Background -# 2 - AC_BK Background -# 0 BE AC_BE Best Effort -# 3 EE AC_BE Best Effort -# 4 CL AC_VI Video -# 5 VI AC_VI Video -# 6 VO AC_VO Voice -# 7 NC AC_VO Voice -# Data frames with no priority information: AC_BE -# Management frames: AC_VO -# PS-Poll frames: AC_BE - -# Default WMM parameters (IEEE 802.11 draft; 11-03-0504-03-000e): -# for 802.11a or 802.11g networks -# These parameters are sent to WMM clients when they associate. -# The parameters will be used by WMM clients for frames transmitted to the -# access point. -# -# note - txop_limit is in units of 32microseconds -# note - acm is admission control mandatory flag. 0 = admission control not -# required, 1 = mandatory -# note - Here cwMin and cmMax are in exponent form. The actual cw value used -# will be (2^n)-1 where n is the value given here. The allowed range for these -# wmm_ac_??_{cwmin,cwmax} is 0..15 with cwmax >= cwmin. -# -wmm_enabled=1 -# -# WMM-PS Unscheduled Automatic Power Save Delivery [U-APSD] -# Enable this flag if U-APSD supported outside hostapd (eg., Firmware/driver) -#uapsd_advertisement_enabled=1 -# -# Low priority / AC_BK = background -wmm_ac_bk_cwmin=4 -wmm_ac_bk_cwmax=10 -wmm_ac_bk_aifs=7 -wmm_ac_bk_txop_limit=0 -wmm_ac_bk_acm=0 -# Note: for IEEE 802.11b mode: cWmin=5 cWmax=10 -# -# Normal priority / AC_BE = best effort -wmm_ac_be_aifs=3 -wmm_ac_be_cwmin=4 -wmm_ac_be_cwmax=10 -wmm_ac_be_txop_limit=0 -wmm_ac_be_acm=0 -# Note: for IEEE 802.11b mode: cWmin=5 cWmax=7 -# -# High priority / AC_VI = video -wmm_ac_vi_aifs=2 -wmm_ac_vi_cwmin=3 -wmm_ac_vi_cwmax=4 -wmm_ac_vi_txop_limit=94 -wmm_ac_vi_acm=0 -# Note: for IEEE 802.11b mode: cWmin=4 cWmax=5 txop_limit=188 -# -# Highest priority / AC_VO = voice -wmm_ac_vo_aifs=2 -wmm_ac_vo_cwmin=2 -wmm_ac_vo_cwmax=3 -wmm_ac_vo_txop_limit=47 -wmm_ac_vo_acm=0 -# Note: for IEEE 802.11b mode: cWmin=3 cWmax=4 burst=102 - -# Static WEP key configuration -# -# The key number to use when transmitting. -# It must be between 0 and 3, and the corresponding key must be set. -# default: not set -#wep_default_key=0 -# The WEP keys to use. -# A key may be a quoted string or unquoted hexadecimal digits. -# The key length should be 5, 13, or 16 characters, or 10, 26, or 32 -# digits, depending on whether 40-bit (64-bit), 104-bit (128-bit), or -# 128-bit (152-bit) WEP is used. -# Only the default key must be supplied; the others are optional. -# default: not set -#wep_key0=123456789a -#wep_key1="vwxyz" -#wep_key2=0102030405060708090a0b0c0d -#wep_key3=".2.4.6.8.0.23" - -# Station inactivity limit -# -# If a station does not send anything in ap_max_inactivity seconds, an -# empty data frame is sent to it in order to verify whether it is -# still in range. If this frame is not ACKed, the station will be -# disassociated and then deauthenticated. This feature is used to -# clear station table of old entries when the STAs move out of the -# range. -# -# The station can associate again with the AP if it is still in range; -# this inactivity poll is just used as a nicer way of verifying -# inactivity; i.e., client will not report broken connection because -# disassociation frame is not sent immediately without first polling -# the STA with a data frame. -# default: 300 (i.e., 5 minutes) -#ap_max_inactivity=300 -# -# The inactivity polling can be disabled to disconnect stations based on -# inactivity timeout so that idle stations are more likely to be disconnected -# even if they are still in range of the AP. This can be done by setting -# skip_inactivity_poll to 1 (default 0). -#skip_inactivity_poll=0 - -# Disassociate stations based on excessive transmission failures or other -# indications of connection loss. This depends on the driver capabilities and -# may not be available with all drivers. -#disassoc_low_ack=1 - -# Maximum allowed Listen Interval (how many Beacon periods STAs are allowed to -# remain asleep). Default: 65535 (no limit apart from field size) -#max_listen_interval=100 - -# WDS (4-address frame) mode with per-station virtual interfaces -# (only supported with driver=nl80211) -# This mode allows associated stations to use 4-address frames to allow layer 2 -# bridging to be used. -#wds_sta=1 - -# If bridge parameter is set, the WDS STA interface will be added to the same -# bridge by default. This can be overridden with the wds_bridge parameter to -# use a separate bridge. -#wds_bridge=wds-br0 - -# Start the AP with beaconing disabled by default. -#start_disabled=0 - -# Client isolation can be used to prevent low-level bridging of frames between -# associated stations in the BSS. By default, this bridging is allowed. -#ap_isolate=1 - -# BSS Load update period (in BUs) -# This field is used to enable and configure adding a BSS Load element into -# Beacon and Probe Response frames. -#bss_load_update_period=50 - -# Fixed BSS Load value for testing purposes -# This field can be used to configure hostapd to add a fixed BSS Load element -# into Beacon and Probe Response frames for testing purposes. The format is -# :: -#bss_load_test=12:80:20000 - -##### IEEE 802.11n related configuration ###################################### - -# ieee80211n: Whether IEEE 802.11n (HT) is enabled -# 0 = disabled (default) -# 1 = enabled -# Note: You will also need to enable WMM for full HT functionality. -# Note: hw_mode=g (2.4 GHz) and hw_mode=a (5 GHz) is used to specify the band. -#ieee80211n=1 - -# ht_capab: HT capabilities (list of flags) -# LDPC coding capability: [LDPC] = supported -# Supported channel width set: [HT40-] = both 20 MHz and 40 MHz with secondary -# channel below the primary channel; [HT40+] = both 20 MHz and 40 MHz -# with secondary channel above the primary channel -# (20 MHz only if neither is set) -# Note: There are limits on which channels can be used with HT40- and -# HT40+. Following table shows the channels that may be available for -# HT40- and HT40+ use per IEEE 802.11n Annex J: -# freq HT40- HT40+ -# 2.4 GHz 5-13 1-7 (1-9 in Europe/Japan) -# 5 GHz 40,48,56,64 36,44,52,60 -# (depending on the location, not all of these channels may be available -# for use) -# Please note that 40 MHz channels may switch their primary and secondary -# channels if needed or creation of 40 MHz channel maybe rejected based -# on overlapping BSSes. These changes are done automatically when hostapd -# is setting up the 40 MHz channel. -# Spatial Multiplexing (SM) Power Save: [SMPS-STATIC] or [SMPS-DYNAMIC] -# (SMPS disabled if neither is set) -# HT-greenfield: [GF] (disabled if not set) -# Short GI for 20 MHz: [SHORT-GI-20] (disabled if not set) -# Short GI for 40 MHz: [SHORT-GI-40] (disabled if not set) -# Tx STBC: [TX-STBC] (disabled if not set) -# Rx STBC: [RX-STBC1] (one spatial stream), [RX-STBC12] (one or two spatial -# streams), or [RX-STBC123] (one, two, or three spatial streams); Rx STBC -# disabled if none of these set -# HT-delayed Block Ack: [DELAYED-BA] (disabled if not set) -# Maximum A-MSDU length: [MAX-AMSDU-7935] for 7935 octets (3839 octets if not -# set) -# DSSS/CCK Mode in 40 MHz: [DSSS_CCK-40] = allowed (not allowed if not set) -# 40 MHz intolerant [40-INTOLERANT] (not advertised if not set) -# L-SIG TXOP protection support: [LSIG-TXOP-PROT] (disabled if not set) -#ht_capab=[HT40-][SHORT-GI-20][SHORT-GI-40] - -# Require stations to support HT PHY (reject association if they do not) -#require_ht=1 - -# If set non-zero, require stations to perform scans of overlapping -# channels to test for stations which would be affected by 40 MHz traffic. -# This parameter sets the interval in seconds between these scans. Setting this -# to non-zero allows 2.4 GHz band AP to move dynamically to a 40 MHz channel if -# no co-existence issues with neighboring devices are found. -#obss_interval=0 - -##### IEEE 802.11ac related configuration ##################################### - -# ieee80211ac: Whether IEEE 802.11ac (VHT) is enabled -# 0 = disabled (default) -# 1 = enabled -# Note: You will also need to enable WMM for full VHT functionality. -# Note: hw_mode=a is used to specify that 5 GHz band is used with VHT. -#ieee80211ac=1 - -# vht_capab: VHT capabilities (list of flags) -# -# vht_max_mpdu_len: [MAX-MPDU-7991] [MAX-MPDU-11454] -# Indicates maximum MPDU length -# 0 = 3895 octets (default) -# 1 = 7991 octets -# 2 = 11454 octets -# 3 = reserved -# -# supported_chan_width: [VHT160] [VHT160-80PLUS80] -# Indicates supported Channel widths -# 0 = 160 MHz & 80+80 channel widths are not supported (default) -# 1 = 160 MHz channel width is supported -# 2 = 160 MHz & 80+80 channel widths are supported -# 3 = reserved -# -# Rx LDPC coding capability: [RXLDPC] -# Indicates support for receiving LDPC coded pkts -# 0 = Not supported (default) -# 1 = Supported -# -# Short GI for 80 MHz: [SHORT-GI-80] -# Indicates short GI support for reception of packets transmitted with TXVECTOR -# params format equal to VHT and CBW = 80Mhz -# 0 = Not supported (default) -# 1 = Supported -# -# Short GI for 160 MHz: [SHORT-GI-160] -# Indicates short GI support for reception of packets transmitted with TXVECTOR -# params format equal to VHT and CBW = 160Mhz -# 0 = Not supported (default) -# 1 = Supported -# -# Tx STBC: [TX-STBC-2BY1] -# Indicates support for the transmission of at least 2x1 STBC -# 0 = Not supported (default) -# 1 = Supported -# -# Rx STBC: [RX-STBC-1] [RX-STBC-12] [RX-STBC-123] [RX-STBC-1234] -# Indicates support for the reception of PPDUs using STBC -# 0 = Not supported (default) -# 1 = support of one spatial stream -# 2 = support of one and two spatial streams -# 3 = support of one, two and three spatial streams -# 4 = support of one, two, three and four spatial streams -# 5,6,7 = reserved -# -# SU Beamformer Capable: [SU-BEAMFORMER] -# Indicates support for operation as a single user beamformer -# 0 = Not supported (default) -# 1 = Supported -# -# SU Beamformee Capable: [SU-BEAMFORMEE] -# Indicates support for operation as a single user beamformee -# 0 = Not supported (default) -# 1 = Supported -# -# Compressed Steering Number of Beamformer Antennas Supported: -# [BF-ANTENNA-2] [BF-ANTENNA-3] [BF-ANTENNA-4] -# Beamformee's capability indicating the maximum number of beamformer -# antennas the beamformee can support when sending compressed beamforming -# feedback -# If SU beamformer capable, set to maximum value minus 1 -# else reserved (default) -# -# Number of Sounding Dimensions: -# [SOUNDING-DIMENSION-2] [SOUNDING-DIMENSION-3] [SOUNDING-DIMENSION-4] -# Beamformer's capability indicating the maximum value of the NUM_STS parameter -# in the TXVECTOR of a VHT NDP -# If SU beamformer capable, set to maximum value minus 1 -# else reserved (default) -# -# MU Beamformer Capable: [MU-BEAMFORMER] -# Indicates support for operation as an MU beamformer -# 0 = Not supported or sent by Non-AP STA (default) -# 1 = Supported -# -# VHT TXOP PS: [VHT-TXOP-PS] -# Indicates whether or not the AP supports VHT TXOP Power Save Mode -# or whether or not the STA is in VHT TXOP Power Save mode -# 0 = VHT AP doesn't support VHT TXOP PS mode (OR) VHT STA not in VHT TXOP PS -# mode -# 1 = VHT AP supports VHT TXOP PS mode (OR) VHT STA is in VHT TXOP power save -# mode -# -# +HTC-VHT Capable: [HTC-VHT] -# Indicates whether or not the STA supports receiving a VHT variant HT Control -# field. -# 0 = Not supported (default) -# 1 = supported -# -# Maximum A-MPDU Length Exponent: [MAX-A-MPDU-LEN-EXP0]..[MAX-A-MPDU-LEN-EXP7] -# Indicates the maximum length of A-MPDU pre-EOF padding that the STA can recv -# This field is an integer in the range of 0 to 7. -# The length defined by this field is equal to -# 2 pow(13 + Maximum A-MPDU Length Exponent) -1 octets -# -# VHT Link Adaptation Capable: [VHT-LINK-ADAPT2] [VHT-LINK-ADAPT3] -# Indicates whether or not the STA supports link adaptation using VHT variant -# HT Control field -# If +HTC-VHTcapable is 1 -# 0 = (no feedback) if the STA does not provide VHT MFB (default) -# 1 = reserved -# 2 = (Unsolicited) if the STA provides only unsolicited VHT MFB -# 3 = (Both) if the STA can provide VHT MFB in response to VHT MRQ and if the -# STA provides unsolicited VHT MFB -# Reserved if +HTC-VHTcapable is 0 -# -# Rx Antenna Pattern Consistency: [RX-ANTENNA-PATTERN] -# Indicates the possibility of Rx antenna pattern change -# 0 = Rx antenna pattern might change during the lifetime of an association -# 1 = Rx antenna pattern does not change during the lifetime of an association -# -# Tx Antenna Pattern Consistency: [TX-ANTENNA-PATTERN] -# Indicates the possibility of Tx antenna pattern change -# 0 = Tx antenna pattern might change during the lifetime of an association -# 1 = Tx antenna pattern does not change during the lifetime of an association -#vht_capab=[SHORT-GI-80][HTC-VHT] -# -# Require stations to support VHT PHY (reject association if they do not) -#require_vht=1 - -# 0 = 20 or 40 MHz operating Channel width -# 1 = 80 MHz channel width -# 2 = 160 MHz channel width -# 3 = 80+80 MHz channel width -#vht_oper_chwidth=1 -# -# center freq = 5 GHz + (5 * index) -# So index 42 gives center freq 5.210 GHz -# which is channel 42 in 5G band -# -#vht_oper_centr_freq_seg0_idx=42 -# -# center freq = 5 GHz + (5 * index) -# So index 159 gives center freq 5.795 GHz -# which is channel 159 in 5G band -# -#vht_oper_centr_freq_seg1_idx=159 - -# Workaround to use station's nsts capability in (Re)Association Response frame -# This may be needed with some deployed devices as an interoperability -# workaround for beamforming if the AP's capability is greater than the -# station's capability. This is disabled by default and can be enabled by -# setting use_sta_nsts=1. -#use_sta_nsts=0 - -##### IEEE 802.1X-2004 related configuration ################################## - -# Require IEEE 802.1X authorization -#ieee8021x=1 - -# IEEE 802.1X/EAPOL version -# hostapd is implemented based on IEEE Std 802.1X-2004 which defines EAPOL -# version 2. However, there are many client implementations that do not handle -# the new version number correctly (they seem to drop the frames completely). -# In order to make hostapd interoperate with these clients, the version number -# can be set to the older version (1) with this configuration value. -#eapol_version=2 - -# Optional displayable message sent with EAP Request-Identity. The first \0 -# in this string will be converted to ASCII-0 (nul). This can be used to -# separate network info (comma separated list of attribute=value pairs); see, -# e.g., RFC 4284. -#eap_message=hello -#eap_message=hello\0networkid=netw,nasid=foo,portid=0,NAIRealms=example.com - -# WEP rekeying (disabled if key lengths are not set or are set to 0) -# Key lengths for default/broadcast and individual/unicast keys: -# 5 = 40-bit WEP (also known as 64-bit WEP with 40 secret bits) -# 13 = 104-bit WEP (also known as 128-bit WEP with 104 secret bits) -#wep_key_len_broadcast=5 -#wep_key_len_unicast=5 -# Rekeying period in seconds. 0 = do not rekey (i.e., set keys only once) -#wep_rekey_period=300 - -# EAPOL-Key index workaround (set bit7) for WinXP Supplicant (needed only if -# only broadcast keys are used) -eapol_key_index_workaround=0 - -# EAP reauthentication period in seconds (default: 3600 seconds; 0 = disable -# reauthentication). -#eap_reauth_period=3600 - -# Use PAE group address (01:80:c2:00:00:03) instead of individual target -# address when sending EAPOL frames with driver=wired. This is the most common -# mechanism used in wired authentication, but it also requires that the port -# is only used by one station. -#use_pae_group_addr=1 - -# EAP Re-authentication Protocol (ERP) authenticator (RFC 6696) -# -# Whether to initiate EAP authentication with EAP-Initiate/Re-auth-Start before -# EAP-Identity/Request -#erp_send_reauth_start=1 -# -# Domain name for EAP-Initiate/Re-auth-Start. Omitted from the message if not -# set (no local ER server). This is also used by the integrated EAP server if -# ERP is enabled (eap_server_erp=1). -#erp_domain=example.com - -##### Integrated EAP server ################################################### - -# Optionally, hostapd can be configured to use an integrated EAP server -# to process EAP authentication locally without need for an external RADIUS -# server. This functionality can be used both as a local authentication server -# for IEEE 802.1X/EAPOL and as a RADIUS server for other devices. - -# Use integrated EAP server instead of external RADIUS authentication -# server. This is also needed if hostapd is configured to act as a RADIUS -# authentication server. -eap_server=0 - -# Path for EAP server user database -# If SQLite support is included, this can be set to "sqlite:/path/to/sqlite.db" -# to use SQLite database instead of a text file. -#eap_user_file=/etc/hostapd.eap_user - -# CA certificate (PEM or DER file) for EAP-TLS/PEAP/TTLS -#ca_cert=/etc/hostapd.ca.pem - -# Server certificate (PEM or DER file) for EAP-TLS/PEAP/TTLS -#server_cert=/etc/hostapd.server.pem - -# Private key matching with the server certificate for EAP-TLS/PEAP/TTLS -# This may point to the same file as server_cert if both certificate and key -# are included in a single file. PKCS#12 (PFX) file (.p12/.pfx) can also be -# used by commenting out server_cert and specifying the PFX file as the -# private_key. -#private_key=/etc/hostapd.server.prv - -# Passphrase for private key -#private_key_passwd=secret passphrase - -# Server identity -# EAP methods that provide mechanism for authenticated server identity delivery -# use this value. If not set, "hostapd" is used as a default. -#server_id=server.example.com - -# Enable CRL verification. -# Note: hostapd does not yet support CRL downloading based on CDP. Thus, a -# valid CRL signed by the CA is required to be included in the ca_cert file. -# This can be done by using PEM format for CA certificate and CRL and -# concatenating these into one file. Whenever CRL changes, hostapd needs to be -# restarted to take the new CRL into use. -# 0 = do not verify CRLs (default) -# 1 = check the CRL of the user certificate -# 2 = check all CRLs in the certificate path -#check_crl=1 - -# TLS Session Lifetime in seconds -# This can be used to allow TLS sessions to be cached and resumed with an -# abbreviated handshake when using EAP-TLS/TTLS/PEAP. -# (default: 0 = session caching and resumption disabled) -#tls_session_lifetime=3600 - -# Cached OCSP stapling response (DER encoded) -# If set, this file is sent as a certificate status response by the EAP server -# if the EAP peer requests certificate status in the ClientHello message. -# This cache file can be updated, e.g., by running following command -# periodically to get an update from the OCSP responder: -# openssl ocsp \ -# -no_nonce \ -# -CAfile /etc/hostapd.ca.pem \ -# -issuer /etc/hostapd.ca.pem \ -# -cert /etc/hostapd.server.pem \ -# -url http://ocsp.example.com:8888/ \ -# -respout /tmp/ocsp-cache.der -#ocsp_stapling_response=/tmp/ocsp-cache.der - -# Cached OCSP stapling response list (DER encoded OCSPResponseList) -# This is similar to ocsp_stapling_response, but the extended version defined in -# RFC 6961 to allow multiple OCSP responses to be provided. -#ocsp_stapling_response_multi=/tmp/ocsp-multi-cache.der - -# dh_file: File path to DH/DSA parameters file (in PEM format) -# This is an optional configuration file for setting parameters for an -# ephemeral DH key exchange. In most cases, the default RSA authentication does -# not use this configuration. However, it is possible setup RSA to use -# ephemeral DH key exchange. In addition, ciphers with DSA keys always use -# ephemeral DH keys. This can be used to achieve forward secrecy. If the file -# is in DSA parameters format, it will be automatically converted into DH -# params. This parameter is required if anonymous EAP-FAST is used. -# You can generate DH parameters file with OpenSSL, e.g., -# "openssl dhparam -out /etc/hostapd.dh.pem 2048" -#dh_file=/etc/hostapd.dh.pem - -# OpenSSL cipher string -# -# This is an OpenSSL specific configuration option for configuring the default -# ciphers. If not set, "DEFAULT:!EXP:!LOW" is used as the default. -# See https://www.openssl.org/docs/apps/ciphers.html for OpenSSL documentation -# on cipher suite configuration. This is applicable only if hostapd is built to -# use OpenSSL. -#openssl_ciphers=DEFAULT:!EXP:!LOW - -# Fragment size for EAP methods -#fragment_size=1400 - -# Finite cyclic group for EAP-pwd. Number maps to group of domain parameters -# using the IANA repository for IKE (RFC 2409). -#pwd_group=19 - -# Configuration data for EAP-SIM database/authentication gateway interface. -# This is a text string in implementation specific format. The example -# implementation in eap_sim_db.c uses this as the UNIX domain socket name for -# the HLR/AuC gateway (e.g., hlr_auc_gw). In this case, the path uses "unix:" -# prefix. If hostapd is built with SQLite support (CONFIG_SQLITE=y in .config), -# database file can be described with an optional db= parameter. -#eap_sim_db=unix:/tmp/hlr_auc_gw.sock -#eap_sim_db=unix:/tmp/hlr_auc_gw.sock db=/tmp/hostapd.db - -# EAP-SIM DB request timeout -# This parameter sets the maximum time to wait for a database request response. -# The parameter value is in seconds. -#eap_sim_db_timeout=1 - -# Encryption key for EAP-FAST PAC-Opaque values. This key must be a secret, -# random value. It is configured as a 16-octet value in hex format. It can be -# generated, e.g., with the following command: -# od -tx1 -v -N16 /dev/random | colrm 1 8 | tr -d ' ' -#pac_opaque_encr_key=000102030405060708090a0b0c0d0e0f - -# EAP-FAST authority identity (A-ID) -# A-ID indicates the identity of the authority that issues PACs. The A-ID -# should be unique across all issuing servers. In theory, this is a variable -# length field, but due to some existing implementations requiring A-ID to be -# 16 octets in length, it is strongly recommended to use that length for the -# field to provid interoperability with deployed peer implementations. This -# field is configured in hex format. -#eap_fast_a_id=101112131415161718191a1b1c1d1e1f - -# EAP-FAST authority identifier information (A-ID-Info) -# This is a user-friendly name for the A-ID. For example, the enterprise name -# and server name in a human-readable format. This field is encoded as UTF-8. -#eap_fast_a_id_info=test server - -# Enable/disable different EAP-FAST provisioning modes: -#0 = provisioning disabled -#1 = only anonymous provisioning allowed -#2 = only authenticated provisioning allowed -#3 = both provisioning modes allowed (default) -#eap_fast_prov=3 - -# EAP-FAST PAC-Key lifetime in seconds (hard limit) -#pac_key_lifetime=604800 - -# EAP-FAST PAC-Key refresh time in seconds (soft limit on remaining hard -# limit). The server will generate a new PAC-Key when this number of seconds -# (or fewer) of the lifetime remains. -#pac_key_refresh_time=86400 - -# EAP-SIM and EAP-AKA protected success/failure indication using AT_RESULT_IND -# (default: 0 = disabled). -#eap_sim_aka_result_ind=1 - -# Trusted Network Connect (TNC) -# If enabled, TNC validation will be required before the peer is allowed to -# connect. Note: This is only used with EAP-TTLS and EAP-FAST. If any other -# EAP method is enabled, the peer will be allowed to connect without TNC. -#tnc=1 - -# EAP Re-authentication Protocol (ERP) - RFC 6696 -# -# Whether to enable ERP on the EAP server. -#eap_server_erp=1 - -##### IEEE 802.11f - Inter-Access Point Protocol (IAPP) ####################### - -# Interface to be used for IAPP broadcast packets -#iapp_interface=eth0 - - -##### RADIUS client configuration ############################################# -# for IEEE 802.1X with external Authentication Server, IEEE 802.11 -# authentication with external ACL for MAC addresses, and accounting - -# The own IP address of the access point (used as NAS-IP-Address) -own_ip_addr=127.0.0.1 - -# NAS-Identifier string for RADIUS messages. When used, this should be unique -# to the NAS within the scope of the RADIUS server. Please note that hostapd -# uses a separate RADIUS client for each BSS and as such, a unique -# nas_identifier value should be configured separately for each BSS. This is -# particularly important for cases where RADIUS accounting is used -# (Accounting-On/Off messages are interpreted as clearing all ongoing sessions -# and that may get interpreted as applying to all BSSes if the same -# NAS-Identifier value is used.) For example, a fully qualified domain name -# prefixed with a unique identifier of the BSS (e.g., BSSID) can be used here. -# -# When using IEEE 802.11r, nas_identifier must be set and must be between 1 and -# 48 octets long. -# -# It is mandatory to configure either own_ip_addr or nas_identifier to be -# compliant with the RADIUS protocol. When using RADIUS accounting, it is -# strongly recommended that nas_identifier is set to a unique value for each -# BSS. -#nas_identifier=ap.example.com - -# RADIUS client forced local IP address for the access point -# Normally the local IP address is determined automatically based on configured -# IP addresses, but this field can be used to force a specific address to be -# used, e.g., when the device has multiple IP addresses. -#radius_client_addr=127.0.0.1 - -# RADIUS authentication server -#auth_server_addr=127.0.0.1 -#auth_server_port=1812 -#auth_server_shared_secret=secret - -# RADIUS accounting server -#acct_server_addr=127.0.0.1 -#acct_server_port=1813 -#acct_server_shared_secret=secret - -# Secondary RADIUS servers; to be used if primary one does not reply to -# RADIUS packets. These are optional and there can be more than one secondary -# server listed. -#auth_server_addr=127.0.0.2 -#auth_server_port=1812 -#auth_server_shared_secret=secret2 -# -#acct_server_addr=127.0.0.2 -#acct_server_port=1813 -#acct_server_shared_secret=secret2 - -# Retry interval for trying to return to the primary RADIUS server (in -# seconds). RADIUS client code will automatically try to use the next server -# when the current server is not replying to requests. If this interval is set, -# primary server will be retried after configured amount of time even if the -# currently used secondary server is still working. -#radius_retry_primary_interval=600 - - -# Interim accounting update interval -# If this is set (larger than 0) and acct_server is configured, hostapd will -# send interim accounting updates every N seconds. Note: if set, this overrides -# possible Acct-Interim-Interval attribute in Access-Accept message. Thus, this -# value should not be configured in hostapd.conf, if RADIUS server is used to -# control the interim interval. -# This value should not be less 600 (10 minutes) and must not be less than -# 60 (1 minute). -#radius_acct_interim_interval=600 - -# Request Chargeable-User-Identity (RFC 4372) -# This parameter can be used to configure hostapd to request CUI from the -# RADIUS server by including Chargeable-User-Identity attribute into -# Access-Request packets. -#radius_request_cui=1 - -# Dynamic VLAN mode; allow RADIUS authentication server to decide which VLAN -# is used for the stations. This information is parsed from following RADIUS -# attributes based on RFC 3580 and RFC 2868: Tunnel-Type (value 13 = VLAN), -# Tunnel-Medium-Type (value 6 = IEEE 802), Tunnel-Private-Group-ID (value -# VLANID as a string). Optionally, the local MAC ACL list (accept_mac_file) can -# be used to set static client MAC address to VLAN ID mapping. -# 0 = disabled (default) -# 1 = option; use default interface if RADIUS server does not include VLAN ID -# 2 = required; reject authentication if RADIUS server does not include VLAN ID -#dynamic_vlan=0 - -# Per-Station AP_VLAN interface mode -# If enabled, each station is assigned its own AP_VLAN interface. -# This implies per-station group keying and ebtables filtering of inter-STA -# traffic (when passed through the AP). -# If the sta is not assigned to any VLAN, then its AP_VLAN interface will be -# added to the bridge given by the "bridge" configuration option (see above). -# Otherwise, it will be added to the per-VLAN bridge. -# 0 = disabled (default) -# 1 = enabled -#per_sta_vif=0 - -# VLAN interface list for dynamic VLAN mode is read from a separate text file. -# This list is used to map VLAN ID from the RADIUS server to a network -# interface. Each station is bound to one interface in the same way as with -# multiple BSSIDs or SSIDs. Each line in this text file is defining a new -# interface and the line must include VLAN ID and interface name separated by -# white space (space or tab). -# If no entries are provided by this file, the station is statically mapped -# to . interfaces. -#vlan_file=/etc/hostapd.vlan - -# Interface where 802.1q tagged packets should appear when a RADIUS server is -# used to determine which VLAN a station is on. hostapd creates a bridge for -# each VLAN. Then hostapd adds a VLAN interface (associated with the interface -# indicated by 'vlan_tagged_interface') and the appropriate wireless interface -# to the bridge. -#vlan_tagged_interface=eth0 - -# Bridge (prefix) to add the wifi and the tagged interface to. This gets the -# VLAN ID appended. It defaults to brvlan%d if no tagged interface is given -# and br%s.%d if a tagged interface is given, provided %s = tagged interface -# and %d = VLAN ID. -#vlan_bridge=brvlan - -# When hostapd creates a VLAN interface on vlan_tagged_interfaces, it needs -# to know how to name it. -# 0 = vlan, e.g., vlan1 -# 1 = ., e.g. eth0.1 -#vlan_naming=0 - -# Arbitrary RADIUS attributes can be added into Access-Request and -# Accounting-Request packets by specifying the contents of the attributes with -# the following configuration parameters. There can be multiple of these to -# add multiple attributes. These parameters can also be used to override some -# of the attributes added automatically by hostapd. -# Format: [:] -# attr_id: RADIUS attribute type (e.g., 26 = Vendor-Specific) -# syntax: s = string (UTF-8), d = integer, x = octet string -# value: attribute value in format indicated by the syntax -# If syntax and value parts are omitted, a null value (single 0x00 octet) is -# used. -# -# Additional Access-Request attributes -# radius_auth_req_attr=[:] -# Examples: -# Operator-Name = "Operator" -#radius_auth_req_attr=126:s:Operator -# Service-Type = Framed (2) -#radius_auth_req_attr=6:d:2 -# Connect-Info = "testing" (this overrides the automatically generated value) -#radius_auth_req_attr=77:s:testing -# Same Connect-Info value set as a hexdump -#radius_auth_req_attr=77:x:74657374696e67 - -# -# Additional Accounting-Request attributes -# radius_acct_req_attr=[:] -# Examples: -# Operator-Name = "Operator" -#radius_acct_req_attr=126:s:Operator - -# Dynamic Authorization Extensions (RFC 5176) -# This mechanism can be used to allow dynamic changes to user session based on -# commands from a RADIUS server (or some other disconnect client that has the -# needed session information). For example, Disconnect message can be used to -# request an associated station to be disconnected. -# -# This is disabled by default. Set radius_das_port to non-zero UDP port -# number to enable. -#radius_das_port=3799 -# -# DAS client (the host that can send Disconnect/CoA requests) and shared secret -#radius_das_client=192.168.1.123 shared secret here -# -# DAS Event-Timestamp time window in seconds -#radius_das_time_window=300 -# -# DAS require Event-Timestamp -#radius_das_require_event_timestamp=1 -# -# DAS require Message-Authenticator -#radius_das_require_message_authenticator=1 - -##### RADIUS authentication server configuration ############################## - -# hostapd can be used as a RADIUS authentication server for other hosts. This -# requires that the integrated EAP server is also enabled and both -# authentication services are sharing the same configuration. - -# File name of the RADIUS clients configuration for the RADIUS server. If this -# commented out, RADIUS server is disabled. -#radius_server_clients=/etc/hostapd.radius_clients - -# The UDP port number for the RADIUS authentication server -#radius_server_auth_port=1812 - -# The UDP port number for the RADIUS accounting server -# Commenting this out or setting this to 0 can be used to disable RADIUS -# accounting while still enabling RADIUS authentication. -#radius_server_acct_port=1813 - -# Use IPv6 with RADIUS server (IPv4 will also be supported using IPv6 API) -#radius_server_ipv6=1 - - -##### WPA/IEEE 802.11i configuration ########################################## - -# Enable WPA. Setting this variable configures the AP to require WPA (either -# WPA-PSK or WPA-RADIUS/EAP based on other configuration). For WPA-PSK, either -# wpa_psk or wpa_passphrase must be set and wpa_key_mgmt must include WPA-PSK. -# Instead of wpa_psk / wpa_passphrase, wpa_psk_radius might suffice. -# For WPA-RADIUS/EAP, ieee8021x must be set (but without dynamic WEP keys), -# RADIUS authentication server must be configured, and WPA-EAP must be included -# in wpa_key_mgmt. -# This field is a bit field that can be used to enable WPA (IEEE 802.11i/D3.0) -# and/or WPA2 (full IEEE 802.11i/RSN): -# bit0 = WPA -# bit1 = IEEE 802.11i/RSN (WPA2) (dot11RSNAEnabled) -#wpa=1 - -# WPA pre-shared keys for WPA-PSK. This can be either entered as a 256-bit -# secret in hex format (64 hex digits), wpa_psk, or as an ASCII passphrase -# (8..63 characters) that will be converted to PSK. This conversion uses SSID -# so the PSK changes when ASCII passphrase is used and the SSID is changed. -# wpa_psk (dot11RSNAConfigPSKValue) -# wpa_passphrase (dot11RSNAConfigPSKPassPhrase) -#wpa_psk=0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef -#wpa_passphrase=secret passphrase - -# Optionally, WPA PSKs can be read from a separate text file (containing list -# of (PSK,MAC address) pairs. This allows more than one PSK to be configured. -# Use absolute path name to make sure that the files can be read on SIGHUP -# configuration reloads. -#wpa_psk_file=/etc/hostapd.wpa_psk - -# Optionally, WPA passphrase can be received from RADIUS authentication server -# This requires macaddr_acl to be set to 2 (RADIUS) -# 0 = disabled (default) -# 1 = optional; use default passphrase/psk if RADIUS server does not include -# Tunnel-Password -# 2 = required; reject authentication if RADIUS server does not include -# Tunnel-Password -#wpa_psk_radius=0 - -# Set of accepted key management algorithms (WPA-PSK, WPA-EAP, or both). The -# entries are separated with a space. WPA-PSK-SHA256 and WPA-EAP-SHA256 can be -# added to enable SHA256-based stronger algorithms. -# (dot11RSNAConfigAuthenticationSuitesTable) -#wpa_key_mgmt=WPA-PSK WPA-EAP - -# Set of accepted cipher suites (encryption algorithms) for pairwise keys -# (unicast packets). This is a space separated list of algorithms: -# CCMP = AES in Counter mode with CBC-MAC [RFC 3610, IEEE 802.11i/D7.0] -# TKIP = Temporal Key Integrity Protocol [IEEE 802.11i/D7.0] -# Group cipher suite (encryption algorithm for broadcast and multicast frames) -# is automatically selected based on this configuration. If only CCMP is -# allowed as the pairwise cipher, group cipher will also be CCMP. Otherwise, -# TKIP will be used as the group cipher. -# (dot11RSNAConfigPairwiseCiphersTable) -# Pairwise cipher for WPA (v1) (default: TKIP) -#wpa_pairwise=TKIP CCMP -# Pairwise cipher for RSN/WPA2 (default: use wpa_pairwise value) -#rsn_pairwise=CCMP - -# Time interval for rekeying GTK (broadcast/multicast encryption keys) in -# seconds. (dot11RSNAConfigGroupRekeyTime) -#wpa_group_rekey=600 - -# Rekey GTK when any STA that possesses the current GTK is leaving the BSS. -# (dot11RSNAConfigGroupRekeyStrict) -#wpa_strict_rekey=1 - -# Time interval for rekeying GMK (master key used internally to generate GTKs -# (in seconds). -#wpa_gmk_rekey=86400 - -# Maximum lifetime for PTK in seconds. This can be used to enforce rekeying of -# PTK to mitigate some attacks against TKIP deficiencies. -#wpa_ptk_rekey=600 - -# Enable IEEE 802.11i/RSN/WPA2 pre-authentication. This is used to speed up -# roaming be pre-authenticating IEEE 802.1X/EAP part of the full RSN -# authentication and key handshake before actually associating with a new AP. -# (dot11RSNAPreauthenticationEnabled) -#rsn_preauth=1 -# -# Space separated list of interfaces from which pre-authentication frames are -# accepted (e.g., 'eth0' or 'eth0 wlan0wds0'. This list should include all -# interface that are used for connections to other APs. This could include -# wired interfaces and WDS links. The normal wireless data interface towards -# associated stations (e.g., wlan0) should not be added, since -# pre-authentication is only used with APs other than the currently associated -# one. -#rsn_preauth_interfaces=eth0 - -# peerkey: Whether PeerKey negotiation for direct links (IEEE 802.11e) is -# allowed. This is only used with RSN/WPA2. -# 0 = disabled (default) -# 1 = enabled -#peerkey=1 - -# ieee80211w: Whether management frame protection (MFP) is enabled -# 0 = disabled (default) -# 1 = optional -# 2 = required -#ieee80211w=0 - -# Group management cipher suite -# Default: AES-128-CMAC (BIP) -# Other options (depending on driver support): -# BIP-GMAC-128 -# BIP-GMAC-256 -# BIP-CMAC-256 -# Note: All the stations connecting to the BSS will also need to support the -# selected cipher. The default AES-128-CMAC is the only option that is commonly -# available in deployed devices. -#group_mgmt_cipher=AES-128-CMAC - -# Association SA Query maximum timeout (in TU = 1.024 ms; for MFP) -# (maximum time to wait for a SA Query response) -# dot11AssociationSAQueryMaximumTimeout, 1...4294967295 -#assoc_sa_query_max_timeout=1000 - -# Association SA Query retry timeout (in TU = 1.024 ms; for MFP) -# (time between two subsequent SA Query requests) -# dot11AssociationSAQueryRetryTimeout, 1...4294967295 -#assoc_sa_query_retry_timeout=201 - -# disable_pmksa_caching: Disable PMKSA caching -# This parameter can be used to disable caching of PMKSA created through EAP -# authentication. RSN preauthentication may still end up using PMKSA caching if -# it is enabled (rsn_preauth=1). -# 0 = PMKSA caching enabled (default) -# 1 = PMKSA caching disabled -#disable_pmksa_caching=0 - -# okc: Opportunistic Key Caching (aka Proactive Key Caching) -# Allow PMK cache to be shared opportunistically among configured interfaces -# and BSSes (i.e., all configurations within a single hostapd process). -# 0 = disabled (default) -# 1 = enabled -#okc=1 - -# SAE threshold for anti-clogging mechanism (dot11RSNASAEAntiCloggingThreshold) -# This parameter defines how many open SAE instances can be in progress at the -# same time before the anti-clogging mechanism is taken into use. -#sae_anti_clogging_threshold=5 - -# Enabled SAE finite cyclic groups -# SAE implementation are required to support group 19 (ECC group defined over a -# 256-bit prime order field). All groups that are supported by the -# implementation are enabled by default. This configuration parameter can be -# used to specify a limited set of allowed groups. The group values are listed -# in the IANA registry: -# http://www.iana.org/assignments/ipsec-registry/ipsec-registry.xml#ipsec-registry-9 -#sae_groups=19 20 21 25 26 - -##### IEEE 802.11r configuration ############################################## - -# Mobility Domain identifier (dot11FTMobilityDomainID, MDID) -# MDID is used to indicate a group of APs (within an ESS, i.e., sharing the -# same SSID) between which a STA can use Fast BSS Transition. -# 2-octet identifier as a hex string. -#mobility_domain=a1b2 - -# PMK-R0 Key Holder identifier (dot11FTR0KeyHolderID) -# 1 to 48 octet identifier. -# This is configured with nas_identifier (see RADIUS client section above). - -# Default lifetime of the PMK-RO in minutes; range 1..65535 -# (dot11FTR0KeyLifetime) -#r0_key_lifetime=10000 - -# PMK-R1 Key Holder identifier (dot11FTR1KeyHolderID) -# 6-octet identifier as a hex string. -# Defaults to BSSID. -#r1_key_holder=000102030405 - -# Reassociation deadline in time units (TUs / 1.024 ms; range 1000..65535) -# (dot11FTReassociationDeadline) -#reassociation_deadline=1000 - -# List of R0KHs in the same Mobility Domain -# format: <128-bit key as hex string> -# This list is used to map R0KH-ID (NAS Identifier) to a destination MAC -# address when requesting PMK-R1 key from the R0KH that the STA used during the -# Initial Mobility Domain Association. -#r0kh=02:01:02:03:04:05 r0kh-1.example.com 000102030405060708090a0b0c0d0e0f -#r0kh=02:01:02:03:04:06 r0kh-2.example.com 00112233445566778899aabbccddeeff -# And so on.. One line per R0KH. - -# List of R1KHs in the same Mobility Domain -# format: <128-bit key as hex string> -# This list is used to map R1KH-ID to a destination MAC address when sending -# PMK-R1 key from the R0KH. This is also the list of authorized R1KHs in the MD -# that can request PMK-R1 keys. -#r1kh=02:01:02:03:04:05 02:11:22:33:44:55 000102030405060708090a0b0c0d0e0f -#r1kh=02:01:02:03:04:06 02:11:22:33:44:66 00112233445566778899aabbccddeeff -# And so on.. One line per R1KH. - -# Whether PMK-R1 push is enabled at R0KH -# 0 = do not push PMK-R1 to all configured R1KHs (default) -# 1 = push PMK-R1 to all configured R1KHs whenever a new PMK-R0 is derived -#pmk_r1_push=1 - -# Whether to enable FT-over-DS -# 0 = FT-over-DS disabled -# 1 = FT-over-DS enabled (default) -#ft_over_ds=1 - -##### Neighbor table ########################################################## -# Maximum number of entries kept in AP table (either for neigbor table or for -# detecting Overlapping Legacy BSS Condition). The oldest entry will be -# removed when adding a new entry that would make the list grow over this -# limit. Note! WFA certification for IEEE 802.11g requires that OLBC is -# enabled, so this field should not be set to 0 when using IEEE 802.11g. -# default: 255 -#ap_table_max_size=255 - -# Number of seconds of no frames received after which entries may be deleted -# from the AP table. Since passive scanning is not usually performed frequently -# this should not be set to very small value. In addition, there is no -# guarantee that every scan cycle will receive beacon frames from the -# neighboring APs. -# default: 60 -#ap_table_expiration_time=3600 - -# Maximum number of stations to track on the operating channel -# This can be used to detect dualband capable stations before they have -# associated, e.g., to provide guidance on which colocated BSS to use. -# Default: 0 (disabled) -#track_sta_max_num=100 - -# Maximum age of a station tracking entry in seconds -# Default: 180 -#track_sta_max_age=180 - -# Do not reply to group-addressed Probe Request from a station that was seen on -# another radio. -# Default: Disabled -# -# This can be used with enabled track_sta_max_num configuration on another -# interface controlled by the same hostapd process to restrict Probe Request -# frame handling from replying to group-addressed Probe Request frames from a -# station that has been detected to be capable of operating on another band, -# e.g., to try to reduce likelihood of the station selecting a 2.4 GHz BSS when -# the AP operates both a 2.4 GHz and 5 GHz BSS concurrently. -# -# Note: Enabling this can cause connectivity issues and increase latency for -# discovering the AP. -#no_probe_resp_if_seen_on=wlan1 - -# Reject authentication from a station that was seen on another radio. -# Default: Disabled -# -# This can be used with enabled track_sta_max_num configuration on another -# interface controlled by the same hostapd process to reject authentication -# attempts from a station that has been detected to be capable of operating on -# another band, e.g., to try to reduce likelihood of the station selecting a -# 2.4 GHz BSS when the AP operates both a 2.4 GHz and 5 GHz BSS concurrently. -# -# Note: Enabling this can cause connectivity issues and increase latency for -# connecting with the AP. -#no_auth_if_seen_on=wlan1 - -##### Wi-Fi Protected Setup (WPS) ############################################# - -# WPS state -# 0 = WPS disabled (default) -# 1 = WPS enabled, not configured -# 2 = WPS enabled, configured -#wps_state=2 - -# Whether to manage this interface independently from other WPS interfaces -# By default, a single hostapd process applies WPS operations to all configured -# interfaces. This parameter can be used to disable that behavior for a subset -# of interfaces. If this is set to non-zero for an interface, WPS commands -# issued on that interface do not apply to other interfaces and WPS operations -# performed on other interfaces do not affect this interface. -#wps_independent=0 - -# AP can be configured into a locked state where new WPS Registrar are not -# accepted, but previously authorized Registrars (including the internal one) -# can continue to add new Enrollees. -#ap_setup_locked=1 - -# Universally Unique IDentifier (UUID; see RFC 4122) of the device -# This value is used as the UUID for the internal WPS Registrar. If the AP -# is also using UPnP, this value should be set to the device's UPnP UUID. -# If not configured, UUID will be generated based on the local MAC address. -#uuid=12345678-9abc-def0-1234-56789abcdef0 - -# Note: If wpa_psk_file is set, WPS is used to generate random, per-device PSKs -# that will be appended to the wpa_psk_file. If wpa_psk_file is not set, the -# default PSK (wpa_psk/wpa_passphrase) will be delivered to Enrollees. Use of -# per-device PSKs is recommended as the more secure option (i.e., make sure to -# set wpa_psk_file when using WPS with WPA-PSK). - -# When an Enrollee requests access to the network with PIN method, the Enrollee -# PIN will need to be entered for the Registrar. PIN request notifications are -# sent to hostapd ctrl_iface monitor. In addition, they can be written to a -# text file that could be used, e.g., to populate the AP administration UI with -# pending PIN requests. If the following variable is set, the PIN requests will -# be written to the configured file. -#wps_pin_requests=/var/run/hostapd_wps_pin_requests - -# Device Name -# User-friendly description of device; up to 32 octets encoded in UTF-8 -#device_name=Wireless AP - -# Manufacturer -# The manufacturer of the device (up to 64 ASCII characters) -#manufacturer=Company - -# Model Name -# Model of the device (up to 32 ASCII characters) -#model_name=WAP - -# Model Number -# Additional device description (up to 32 ASCII characters) -#model_number=123 - -# Serial Number -# Serial number of the device (up to 32 characters) -#serial_number=12345 - -# Primary Device Type -# Used format: -- -# categ = Category as an integer value -# OUI = OUI and type octet as a 4-octet hex-encoded value; 0050F204 for -# default WPS OUI -# subcateg = OUI-specific Sub Category as an integer value -# Examples: -# 1-0050F204-1 (Computer / PC) -# 1-0050F204-2 (Computer / Server) -# 5-0050F204-1 (Storage / NAS) -# 6-0050F204-1 (Network Infrastructure / AP) -#device_type=6-0050F204-1 - -# OS Version -# 4-octet operating system version number (hex string) -#os_version=01020300 - -# Config Methods -# List of the supported configuration methods -# Available methods: usba ethernet label display ext_nfc_token int_nfc_token -# nfc_interface push_button keypad virtual_display physical_display -# virtual_push_button physical_push_button -#config_methods=label virtual_display virtual_push_button keypad - -# WPS capability discovery workaround for PBC with Windows 7 -# Windows 7 uses incorrect way of figuring out AP's WPS capabilities by acting -# as a Registrar and using M1 from the AP. The config methods attribute in that -# message is supposed to indicate only the configuration method supported by -# the AP in Enrollee role, i.e., to add an external Registrar. For that case, -# PBC shall not be used and as such, the PushButton config method is removed -# from M1 by default. If pbc_in_m1=1 is included in the configuration file, -# the PushButton config method is left in M1 (if included in config_methods -# parameter) to allow Windows 7 to use PBC instead of PIN (e.g., from a label -# in the AP). -#pbc_in_m1=1 - -# Static access point PIN for initial configuration and adding Registrars -# If not set, hostapd will not allow external WPS Registrars to control the -# access point. The AP PIN can also be set at runtime with hostapd_cli -# wps_ap_pin command. Use of temporary (enabled by user action) and random -# AP PIN is much more secure than configuring a static AP PIN here. As such, -# use of the ap_pin parameter is not recommended if the AP device has means for -# displaying a random PIN. -#ap_pin=12345670 - -# Skip building of automatic WPS credential -# This can be used to allow the automatically generated Credential attribute to -# be replaced with pre-configured Credential(s). -#skip_cred_build=1 - -# Additional Credential attribute(s) -# This option can be used to add pre-configured Credential attributes into M8 -# message when acting as a Registrar. If skip_cred_build=1, this data will also -# be able to override the Credential attribute that would have otherwise been -# automatically generated based on network configuration. This configuration -# option points to an external file that much contain the WPS Credential -# attribute(s) as binary data. -#extra_cred=hostapd.cred - -# Credential processing -# 0 = process received credentials internally (default) -# 1 = do not process received credentials; just pass them over ctrl_iface to -# external program(s) -# 2 = process received credentials internally and pass them over ctrl_iface -# to external program(s) -# Note: With wps_cred_processing=1, skip_cred_build should be set to 1 and -# extra_cred be used to provide the Credential data for Enrollees. -# -# wps_cred_processing=1 will disabled automatic updates of hostapd.conf file -# both for Credential processing and for marking AP Setup Locked based on -# validation failures of AP PIN. An external program is responsible on updating -# the configuration appropriately in this case. -#wps_cred_processing=0 - -# AP Settings Attributes for M7 -# By default, hostapd generates the AP Settings Attributes for M7 based on the -# current configuration. It is possible to override this by providing a file -# with pre-configured attributes. This is similar to extra_cred file format, -# but the AP Settings attributes are not encapsulated in a Credential -# attribute. -#ap_settings=hostapd.ap_settings - -# WPS UPnP interface -# If set, support for external Registrars is enabled. -#upnp_iface=br0 - -# Friendly Name (required for UPnP) -# Short description for end use. Should be less than 64 characters. -#friendly_name=WPS Access Point - -# Manufacturer URL (optional for UPnP) -#manufacturer_url=http://www.example.com/ - -# Model Description (recommended for UPnP) -# Long description for end user. Should be less than 128 characters. -#model_description=Wireless Access Point - -# Model URL (optional for UPnP) -#model_url=http://www.example.com/model/ - -# Universal Product Code (optional for UPnP) -# 12-digit, all-numeric code that identifies the consumer package. -#upc=123456789012 - -# WPS RF Bands (a = 5G, b = 2.4G, g = 2.4G, ag = dual band, ad = 60 GHz) -# This value should be set according to RF band(s) supported by the AP if -# hw_mode is not set. For dual band dual concurrent devices, this needs to be -# set to ag to allow both RF bands to be advertized. -#wps_rf_bands=ag - -# NFC password token for WPS -# These parameters can be used to configure a fixed NFC password token for the -# AP. This can be generated, e.g., with nfc_pw_token from wpa_supplicant. When -# these parameters are used, the AP is assumed to be deployed with a NFC tag -# that includes the matching NFC password token (e.g., written based on the -# NDEF record from nfc_pw_token). -# -#wps_nfc_dev_pw_id: Device Password ID (16..65535) -#wps_nfc_dh_pubkey: Hexdump of DH Public Key -#wps_nfc_dh_privkey: Hexdump of DH Private Key -#wps_nfc_dev_pw: Hexdump of Device Password - -##### Wi-Fi Direct (P2P) ###################################################### - -# Enable P2P Device management -#manage_p2p=1 - -# Allow cross connection -#allow_cross_connection=1 - -#### TDLS (IEEE 802.11z-2010) ################################################# - -# Prohibit use of TDLS in this BSS -#tdls_prohibit=1 - -# Prohibit use of TDLS Channel Switching in this BSS -#tdls_prohibit_chan_switch=1 - -##### IEEE 802.11v-2011 ####################################################### - -# Time advertisement -# 0 = disabled (default) -# 2 = UTC time at which the TSF timer is 0 -#time_advertisement=2 - -# Local time zone as specified in 8.3 of IEEE Std 1003.1-2004: -# stdoffset[dst[offset][,start[/time],end[/time]]] -#time_zone=EST5 - -# WNM-Sleep Mode (extended sleep mode for stations) -# 0 = disabled (default) -# 1 = enabled (allow stations to use WNM-Sleep Mode) -#wnm_sleep_mode=1 - -# BSS Transition Management -# 0 = disabled (default) -# 1 = enabled -#bss_transition=1 - -# Proxy ARP -# 0 = disabled (default) -# 1 = enabled -#proxy_arp=1 - -# IPv6 Neighbor Advertisement multicast-to-unicast conversion -# This can be used with Proxy ARP to allow multicast NAs to be forwarded to -# associated STAs using link layer unicast delivery. -# 0 = disabled (default) -# 1 = enabled -#na_mcast_to_ucast=0 - -##### IEEE 802.11u-2011 ####################################################### - -# Enable Interworking service -#interworking=1 - -# Access Network Type -# 0 = Private network -# 1 = Private network with guest access -# 2 = Chargeable public network -# 3 = Free public network -# 4 = Personal device network -# 5 = Emergency services only network -# 14 = Test or experimental -# 15 = Wildcard -#access_network_type=0 - -# Whether the network provides connectivity to the Internet -# 0 = Unspecified -# 1 = Network provides connectivity to the Internet -#internet=1 - -# Additional Step Required for Access -# Note: This is only used with open network, i.e., ASRA shall ne set to 0 if -# RSN is used. -#asra=0 - -# Emergency services reachable -#esr=0 - -# Unauthenticated emergency service accessible -#uesa=0 - -# Venue Info (optional) -# The available values are defined in IEEE Std 802.11u-2011, 7.3.1.34. -# Example values (group,type): -# 0,0 = Unspecified -# 1,7 = Convention Center -# 1,13 = Coffee Shop -# 2,0 = Unspecified Business -# 7,1 Private Residence -#venue_group=7 -#venue_type=1 - -# Homogeneous ESS identifier (optional; dot11HESSID) -# If set, this shall be identifical to one of the BSSIDs in the homogeneous -# ESS and this shall be set to the same value across all BSSs in homogeneous -# ESS. -#hessid=02:03:04:05:06:07 - -# Roaming Consortium List -# Arbitrary number of Roaming Consortium OIs can be configured with each line -# adding a new OI to the list. The first three entries are available through -# Beacon and Probe Response frames. Any additional entry will be available only -# through ANQP queries. Each OI is between 3 and 15 octets and is configured as -# a hexstring. -#roaming_consortium=021122 -#roaming_consortium=2233445566 - -# Venue Name information -# This parameter can be used to configure one or more Venue Name Duples for -# Venue Name ANQP information. Each entry has a two or three character language -# code (ISO-639) separated by colon from the venue name string. -# Note that venue_group and venue_type have to be set for Venue Name -# information to be complete. -#venue_name=eng:Example venue -#venue_name=fin:Esimerkkipaikka -# Alternative format for language:value strings: -# (double quoted string, printf-escaped string) -#venue_name=P"eng:Example\nvenue" - -# Network Authentication Type -# This parameter indicates what type of network authentication is used in the -# network. -# format: [redirect URL] -# Network Authentication Type Indicator values: -# 00 = Acceptance of terms and conditions -# 01 = On-line enrollment supported -# 02 = http/https redirection -# 03 = DNS redirection -#network_auth_type=00 -#network_auth_type=02http://www.example.com/redirect/me/here/ - -# IP Address Type Availability -# format: <1-octet encoded value as hex str> -# (ipv4_type & 0x3f) << 2 | (ipv6_type & 0x3) -# ipv4_type: -# 0 = Address type not available -# 1 = Public IPv4 address available -# 2 = Port-restricted IPv4 address available -# 3 = Single NATed private IPv4 address available -# 4 = Double NATed private IPv4 address available -# 5 = Port-restricted IPv4 address and single NATed IPv4 address available -# 6 = Port-restricted IPv4 address and double NATed IPv4 address available -# 7 = Availability of the address type is not known -# ipv6_type: -# 0 = Address type not available -# 1 = Address type available -# 2 = Availability of the address type not known -#ipaddr_type_availability=14 - -# Domain Name -# format: [,] -#domain_name=example.com,another.example.com,yet-another.example.com - -# 3GPP Cellular Network information -# format: [;][;...] -#anqp_3gpp_cell_net=244,91;310,026;234,56 - -# NAI Realm information -# One or more realm can be advertised. Each nai_realm line adds a new realm to -# the set. These parameters provide information for stations using Interworking -# network selection to allow automatic connection to a network based on -# credentials. -# format: ,[,][,][,...] -# encoding: -# 0 = Realm formatted in accordance with IETF RFC 4282 -# 1 = UTF-8 formatted character string that is not formatted in -# accordance with IETF RFC 4282 -# NAI Realm(s): Semi-colon delimited NAI Realm(s) -# EAP Method: [:<[AuthParam1:Val1]>][<[AuthParam2:Val2]>][...] -# EAP Method types, see: -# http://www.iana.org/assignments/eap-numbers/eap-numbers.xhtml#eap-numbers-4 -# AuthParam (Table 8-188 in IEEE Std 802.11-2012): -# ID 2 = Non-EAP Inner Authentication Type -# 1 = PAP, 2 = CHAP, 3 = MSCHAP, 4 = MSCHAPV2 -# ID 3 = Inner authentication EAP Method Type -# ID 5 = Credential Type -# 1 = SIM, 2 = USIM, 3 = NFC Secure Element, 4 = Hardware Token, -# 5 = Softoken, 6 = Certificate, 7 = username/password, 9 = Anonymous, -# 10 = Vendor Specific -#nai_realm=0,example.com;example.net -# EAP methods EAP-TLS with certificate and EAP-TTLS/MSCHAPv2 with -# username/password -#nai_realm=0,example.org,13[5:6],21[2:4][5:7] - -# Arbitrary ANQP-element configuration -# Additional ANQP-elements with arbitrary values can be defined by specifying -# their contents in raw format as a hexdump of the payload. Note that these -# values will override ANQP-element contents that may have been specified in the -# more higher layer configuration parameters listed above. -# format: anqp_elem=: -# For example, AP Geospatial Location ANQP-element with unknown location: -#anqp_elem=265:0000 -# For example, AP Civic Location ANQP-element with unknown location: -#anqp_elem=266:000000 - -# GAS Address 3 behavior -# 0 = P2P specification (Address3 = AP BSSID) workaround enabled by default -# based on GAS request Address3 -# 1 = IEEE 802.11 standard compliant regardless of GAS request Address3 -# 2 = Force non-compliant behavior (Address3 = AP BSSID for all cases) -#gas_address3=0 - -# QoS Map Set configuration -# -# Comma delimited QoS Map Set in decimal values -# (see IEEE Std 802.11-2012, 8.4.2.97) -# -# format: -# [,],... -# -# There can be up to 21 optional DSCP Exceptions which are pairs of DSCP Value -# (0..63 or 255) and User Priority (0..7). This is followed by eight DSCP Range -# descriptions with DSCP Low Value and DSCP High Value pairs (0..63 or 255) for -# each UP starting from 0. If both low and high value are set to 255, the -# corresponding UP is not used. -# -# default: not set -#qos_map_set=53,2,22,6,8,15,0,7,255,255,16,31,32,39,255,255,40,47,255,255 - -##### Hotspot 2.0 ############################################################# - -# Enable Hotspot 2.0 support -#hs20=1 - -# Disable Downstream Group-Addressed Forwarding (DGAF) -# This can be used to configure a network where no group-addressed frames are -# allowed. The AP will not forward any group-address frames to the stations and -# random GTKs are issued for each station to prevent associated stations from -# forging such frames to other stations in the BSS. -#disable_dgaf=1 - -# OSU Server-Only Authenticated L2 Encryption Network -#osen=1 - -# ANQP Domain ID (0..65535) -# An identifier for a set of APs in an ESS that share the same common ANQP -# information. 0 = Some of the ANQP information is unique to this AP (default). -#anqp_domain_id=1234 - -# Deauthentication request timeout -# If the RADIUS server indicates that the station is not allowed to connect to -# the BSS/ESS, the AP can allow the station some time to download a -# notification page (URL included in the message). This parameter sets that -# timeout in seconds. -#hs20_deauth_req_timeout=60 - -# Operator Friendly Name -# This parameter can be used to configure one or more Operator Friendly Name -# Duples. Each entry has a two or three character language code (ISO-639) -# separated by colon from the operator friendly name string. -#hs20_oper_friendly_name=eng:Example operator -#hs20_oper_friendly_name=fin:Esimerkkioperaattori - -# Connection Capability -# This can be used to advertise what type of IP traffic can be sent through the -# hotspot (e.g., due to firewall allowing/blocking protocols/ports). -# format: :: -# IP Protocol: 1 = ICMP, 6 = TCP, 17 = UDP -# Port Number: 0..65535 -# Status: 0 = Closed, 1 = Open, 2 = Unknown -# Each hs20_conn_capab line is added to the list of advertised tuples. -#hs20_conn_capab=1:0:2 -#hs20_conn_capab=6:22:1 -#hs20_conn_capab=17:5060:0 - -# WAN Metrics -# format: :
:
    :
    :
      : -# WAN Info: B0-B1: Link Status, B2: Symmetric Link, B3: At Capabity -# (encoded as two hex digits) -# Link Status: 1 = Link up, 2 = Link down, 3 = Link in test state -# Downlink Speed: Estimate of WAN backhaul link current downlink speed in kbps; -# 1..4294967295; 0 = unknown -# Uplink Speed: Estimate of WAN backhaul link current uplink speed in kbps -# 1..4294967295; 0 = unknown -# Downlink Load: Current load of downlink WAN connection (scaled to 255 = 100%) -# Uplink Load: Current load of uplink WAN connection (scaled to 255 = 100%) -# Load Measurement Duration: Duration for measuring downlink/uplink load in -# tenths of a second (1..65535); 0 if load cannot be determined -#hs20_wan_metrics=01:8000:1000:80:240:3000 - -# Operating Class Indication -# List of operating classes the BSSes in this ESS use. The Global operating -# classes in Table E-4 of IEEE Std 802.11-2012 Annex E define the values that -# can be used in this. -# format: hexdump of operating class octets -# for example, operating classes 81 (2.4 GHz channels 1-13) and 115 (5 GHz -# channels 36-48): -#hs20_operating_class=5173 - -# OSU icons -# ::::: -#hs20_icon=32:32:eng:image/png:icon32:/tmp/icon32.png -#hs20_icon=64:64:eng:image/png:icon64:/tmp/icon64.png - -# OSU SSID (see ssid2 for format description) -# This is the SSID used for all OSU connections to all the listed OSU Providers. -#osu_ssid="example" - -# OSU Providers -# One or more sets of following parameter. Each OSU provider is started by the -# mandatory osu_server_uri item. The other parameters add information for the -# last added OSU provider. -# -#osu_server_uri=https://example.com/osu/ -#osu_friendly_name=eng:Example operator -#osu_friendly_name=fin:Esimerkkipalveluntarjoaja -#osu_nai=anonymous@example.com -#osu_method_list=1 0 -#osu_icon=icon32 -#osu_icon=icon64 -#osu_service_desc=eng:Example services -#osu_service_desc=fin:Esimerkkipalveluja -# -#osu_server_uri=... - -##### Fast Session Transfer (FST) support ##################################### -# -# The options in this section are only available when the build configuration -# option CONFIG_FST is set while compiling hostapd. They allow this interface -# to be a part of FST setup. -# -# FST is the transfer of a session from a channel to another channel, in the -# same or different frequency bands. -# -# For detals, see IEEE Std 802.11ad-2012. - -# Identifier of an FST Group the interface belongs to. -#fst_group_id=bond0 - -# Interface priority within the FST Group. -# Announcing a higher priority for an interface means declaring it more -# preferable for FST switch. -# fst_priority is in 1..255 range with 1 being the lowest priority. -#fst_priority=100 - -# Default LLT value for this interface in milliseconds. The value used in case -# no value provided during session setup. Default is 50 ms. -# fst_llt is in 1..4294967 range (due to spec limitation, see 10.32.2.2 -# Transitioning between states). -#fst_llt=100 - -##### Radio measurements / location ########################################### - -# The content of a LCI measurement subelement -#lci= - -# The content of a location civic measurement subelement -#civic= - -# Enable neighbor report via radio measurements -#rrm_neighbor_report=1 - -# Publish fine timing measurement (FTM) responder functionality -# This parameter only controls publishing via Extended Capabilities element. -# Actual functionality is managed outside hostapd. -#ftm_responder=0 - -# Publish fine timing measurement (FTM) initiator functionality -# This parameter only controls publishing via Extended Capabilities element. -# Actual functionality is managed outside hostapd. -#ftm_initiator=0 - -##### TESTING OPTIONS ######################################################### -# -# The options in this section are only available when the build configuration -# option CONFIG_TESTING_OPTIONS is set while compiling hostapd. They allow -# testing some scenarios that are otherwise difficult to reproduce. -# -# Ignore probe requests sent to hostapd with the given probability, must be a -# floating point number in the range [0, 1). -#ignore_probe_probability=0.0 -# -# Ignore authentication frames with the given probability -#ignore_auth_probability=0.0 -# -# Ignore association requests with the given probability -#ignore_assoc_probability=0.0 -# -# Ignore reassociation requests with the given probability -#ignore_reassoc_probability=0.0 -# -# Corrupt Key MIC in GTK rekey EAPOL-Key frames with the given probability -#corrupt_gtk_rekey_mic_probability=0.0 -# -# Include only ECSA IE without CSA IE where possible -# (channel switch operating class is needed) -#ecsa_ie_only=0 - -##### Multiple BSSID support ################################################## -# -# Above configuration is using the default interface (wlan#, or multi-SSID VLAN -# interfaces). Other BSSIDs can be added by using separator 'bss' with -# default interface name to be allocated for the data packets of the new BSS. -# -# hostapd will generate BSSID mask based on the BSSIDs that are -# configured. hostapd will verify that dev_addr & MASK == dev_addr. If this is -# not the case, the MAC address of the radio must be changed before starting -# hostapd (ifconfig wlan0 hw ether ). If a BSSID is configured for -# every secondary BSS, this limitation is not applied at hostapd and other -# masks may be used if the driver supports them (e.g., swap the locally -# administered bit) -# -# BSSIDs are assigned in order to each BSS, unless an explicit BSSID is -# specified using the 'bssid' parameter. -# If an explicit BSSID is specified, it must be chosen such that it: -# - results in a valid MASK that covers it and the dev_addr -# - is not the same as the MAC address of the radio -# - is not the same as any other explicitly specified BSSID -# -# Alternatively, the 'use_driver_iface_addr' parameter can be used to request -# hostapd to use the driver auto-generated interface address (e.g., to use the -# exact MAC addresses allocated to the device). -# -# Not all drivers support multiple BSSes. The exact mechanism for determining -# the driver capabilities is driver specific. With the current (i.e., a recent -# kernel) drivers using nl80211, this information can be checked with "iw list" -# (search for "valid interface combinations"). -# -# Please note that hostapd uses some of the values configured for the first BSS -# as the defaults for the following BSSes. However, it is recommended that all -# BSSes include explicit configuration of all relevant configuration items. -# -#bss=wlan0_0 -#ssid=test2 -# most of the above items can be used here (apart from radio interface specific -# items, like channel) - -#bss=wlan0_1 -#bssid=00:13:10:95:fe:0b -# ... diff --git a/recipes-core/multitech/config/config-mths/ifplugd/ifplugd.action b/recipes-core/multitech/config/config-mths/ifplugd/ifplugd.action deleted file mode 100755 index e7184c7..0000000 --- a/recipes-core/multitech/config/config-mths/ifplugd/ifplugd.action +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# $Id: ifplugd.action 99 2004-02-08 20:17:59Z lennart $ - -# This file is part of ifplugd. -# -# ifplugd is free software; you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free -# Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# ifplugd is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# for more details. -# -# You should have received a copy of the GNU General Public License -# along with ifplugd; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - -set -e - -if [ -z "$1" ] || [ -z "$2" ] ; then - echo "Wrong arguments" > /dev/stderr - exit 1 -fi - -[ "$2" = "up" ] && exec /sbin/ifup $1 -[ "$2" = "down" ] && exec /sbin/ifdown $1 - -exit 0 diff --git a/recipes-core/multitech/config/config-mths/ifplugd/usb0.conf b/recipes-core/multitech/config/config-mths/ifplugd/usb0.conf deleted file mode 100644 index 2fa70b3..0000000 --- a/recipes-core/multitech/config/config-mths/ifplugd/usb0.conf +++ /dev/null @@ -1,2 +0,0 @@ -INTERFACE="usb0" -ARGS="-M -fI -i ${INTERFACE} -u 0 -d 10 -r /etc/ifplugd/ifplugd.action" diff --git a/recipes-core/multitech/config/config-mths/ifplugd/usb1.conf b/recipes-core/multitech/config/config-mths/ifplugd/usb1.conf deleted file mode 100644 index df70933..0000000 --- a/recipes-core/multitech/config/config-mths/ifplugd/usb1.conf +++ /dev/null @@ -1,2 +0,0 @@ -INTERFACE="usb1" -ARGS="-M -fI -i ${INTERFACE} -u 0 -d 10 -r /etc/ifplugd/ifplugd.action" diff --git a/recipes-core/multitech/config/config-mths/modprobe.d/cfg80211.conf b/recipes-core/multitech/config/config-mths/modprobe.d/cfg80211.conf deleted file mode 100644 index 4b6d264..0000000 --- a/recipes-core/multitech/config/config-mths/modprobe.d/cfg80211.conf +++ /dev/null @@ -1,7 +0,0 @@ -# IEEE 802.11 Regulatory Domain for cfg80211 driver -# AU -- Australia -# AT -- Austria -# BE -- Belgium -# US -- USA -# 00 -- World -options cfg80211 ieee80211_regdom=00 diff --git a/recipes-core/multitech/config/config-mths/modprobe.d/mts-io.conf b/recipes-core/multitech/config/config-mths/modprobe.d/mts-io.conf deleted file mode 100644 index 7421ac4..0000000 --- a/recipes-core/multitech/config/config-mths/modprobe.d/mts-io.conf +++ /dev/null @@ -1 +0,0 @@ -blacklist mts-io diff --git a/recipes-core/multitech/config/config-mths/network/interfaces.mths b/recipes-core/multitech/config/config-mths/network/interfaces.mths deleted file mode 100644 index 2463e0a..0000000 --- a/recipes-core/multitech/config/config-mths/network/interfaces.mths +++ /dev/null @@ -1,12 +0,0 @@ -auto wifi1 -iface wifi1 inet static -address 10.0.0.1 -netmask 255.0.0.0 -pre-up bash -c '([[ -d /sys/class/net/wifi1 ]] || /opt/rs9113/onebox_util rpine0 create_vap wifi1 ap)' - -# Gadget USB -auto usb0 -iface usb0 inet static -address 192.168.3.1 -netmask 255.255.255.0 - diff --git a/recipes-core/multitech/config/config.init b/recipes-core/multitech/config/config.init deleted file mode 100644 index 27b067f..0000000 --- a/recipes-core/multitech/config/config.init +++ /dev/null @@ -1,207 +0,0 @@ -#!/bin/sh - -CONFIG_MTDC=/dev/mtd6 -CONFIG_MTDB=/dev/mtdblock6 -CONFIG_DIR=/var/config -RUN_CONF_DIR=/run/config - -OEM_MTDC=/dev/mtd7 -OEM_MTDB=/dev/mtdblock7 -OEM_DIR=/var/oem - -FILES="network/interfaces \ -ppp/options \ -ppp/pap-secrets \ -ppp/chap-secrets \ -ppp/peers \ -" - -# Files used by bluetooth or wifi. -BTWIFIFILES="\ -bluetooth/ \ -default/bluetooth \ -default/bt-pan \ -default/dnsmasq \ -default/hostapd \ -default/ifplugd \ -default/rs9113 \ -dnsmasq.d/ \ -hosts \ -hostname \ -hostapd.conf \ -modprobe.d/ \ -wpa_supplicant.conf \ -" - -# File hidden so it is not removed on hardware reset -WIFITAR=".defaults2.tar.gz" - -mount_config() { - echo "Mounting ${CONFIG_DIR}" - mkdir -p ${CONFIG_DIR} - mount ${CONFIG_DIR} - - # Prepare flash for JFFS2 or EXT4 if mount fails - if [ $? -ne 0 ]; then - echo "Creating ${CONFIG_DIR}" - fs=$(mount -fvn ${CONFIG_DIR}) - if [[ $fs =~ [[:space:]]*(/dev/(...)[^[:space:]]*) ]] ; then - if [[ ${BASH_REMATCH[2]} == mmc ]] ; then - # One more check for empty - mdev="${BASH_REMATCH[1]}" - if [[ $(dd if=$mdev count=4 2>/dev/null | tr -d '\0' | wc -c) == 0 ]] ; then - mkfs.ext4 -O 64bit ${mdev} - fi - else - flash_erase -j ${CONFIG_MTDC} 0 0 - fi - fi - mount ${CONFIG_DIR} - fi -} - -mount_oem() { - echo "Mounting ${OEM_DIR}" - mkdir -p ${OEM_DIR} - mount ${OEM_DIR} - - # Prepare flash for JFFS2 or EXT4 if mount fails - # Prepare flash for JFFS2 or EXT4 if mount fails - if [ $? -ne 0 ]; then - echo "Creating ${OEM_DIR}" - fs=$(mount -fvn ${OEM_DIR}) - if [[ $fs =~ [[:space:]]*(/dev/(...)[^[:space:]]*) ]] ; then - if [[ ${BASH_REMATCH[2]} == mmc ]] ; then - mdev="${BASH_REMATCH[1]}" - if [[ $(dd if=$mdev count=4 2>/dev/null | tr -d '\0' | wc -c) == 0 ]] ; then - mkfs.ext4 -O 64bit ${mdev} - fi - else - flash_erase -j ${OEM_MTDC} 0 0 - fi - fi - mount ${OEM_DIR} - fi -} - -case $1 in - start) - # mount config if not already mounted - if ! grep -q " ${CONFIG_DIR} " /proc/mounts; then - mount_config - else - echo "$CONFIG_DIR already mounted" - fi - - # mount oem if specified in /etc/fstab and it isn't already mounted - if mount -fvn "${OEM_DIR}" ; then - if ! grep -q " ${OEM_DIR} " /proc/mounts; then - mount_oem - else - echo "$OEM_DIR already mounted" - fi - fi - - # Default all config files if requested - cd ${CONFIG_DIR} - if [ -f force_defaults ]; then - echo "Extracting default config files" - tar -xvf /etc/defaults.tar.gz - if [[ -f ${WIFITAR} ]] ; then - echo "Extract original wifi related files" - tar -xvf ${WIFITAR} - fi - if [ -f /etc/default_pass ]; then - echo "Defaulting root password" - PASSHASH=`cat /etc/default_pass` - PASSFILE=/etc/shadow - if [ ! -e /etc/shadow ]; then - PASSFILE=/etc/passwd - fi - sed -i "s%^root:[^:]*:%root:${PASSHASH}:%" $PASSFILE - fi - - rm -f force_defaults - fi - - # Extract any missing files - TARFILES=`tar -tf /etc/defaults.tar.gz` - for file in $TARFILES; do - if [ ! -e $file ]; then - tar -xvf /etc/defaults.tar.gz $file - fi - done - - # Create links in /etc - for file in $FILES; do - if [ ! -L /etc/$file ]; then - echo "Creating link to ${CONFIG_DIR}/$file" - rm -rf /etc/$file - ln -sf ${CONFIG_DIR}/$file /etc/$file - fi - done - - # Move bluetooth wifi stuff to config directory. - # We don't have factory defaults. - ((dobackup=1)) - for file in ${BTWIFIFILES}; do - if [[ -L /etc/$file ]]; then - ((dobackup=0)) - break - fi - done - if ((dobackup==1)) ; then - tar -C /etc -czf ${CONFIG_DIR}/${WIFITAR} ${BTWIFIFILES} - fi - - for file in ${BTWIFIFILES}; do - # If last character is /, make the CONFIG directory. - if [[ ${file: -1} == / ]] ; then - file=${file%?} - echo directory $file operations - if ! [[ -d ${CONFIG_DIR}/$file ]] ; then - rm -f ${CONFIG_DIR}/$file 2>/dev/null || true - mkdir ${CONFIG_DIR}/$file - fi - fi - if [[ ! -L /etc/$file ]]; then - echo "Creating link to ${CONFIG_DIR}/$file" - dir=$(dirname $file) - if [[ $dir != '.' ]] ; then - mkdir -p "$dir" - fi - rm -rf old - mkdir old - if ! [[ -f $file ]] ; then - # Need to preserve old files which is difficult with busybox! - if [[ -d $file ]] || [[ -f $file ]] ; then - cp --parents -a $file old || true - fi - ( - cd /etc - if [[ -d $file ]] || [[ -f $file ]] ; then - cp --parents -a $file ${CONFIG_DIR} || true - fi - ) - ( - cd old - if [[ -d $file ]] || [[ -f $file ]] ; then - cp --parents -a $file .. || true - fi - ) - rm -rf old - fi - rm -rf /etc/$file - ln -sf ${CONFIG_DIR}/$file /etc/$file - fi - done - - - ;; - - *) - echo "Usage: $0 {start}" - exit 2 - ;; - -esac diff --git a/recipes-core/multitech/config/network/interfaces b/recipes-core/multitech/config/network/interfaces deleted file mode 100644 index 67c934b..0000000 --- a/recipes-core/multitech/config/network/interfaces +++ /dev/null @@ -1,81 +0,0 @@ -# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) - -# The loopback interface -auto lo -iface lo inet loopback - -# Wired interface -auto eth0 -iface eth0 inet static -address 192.168.2.1 -netmask 255.255.255.0 -# Forwarding packets on eth0 -# gateway 192.168.2.2 -# pre-up bash -c 'echo 1 >/proc/sys/net/ipv4/ip_forward' -# post-up iptables -F -# post-up iptables -t nat -F -# post-up iptables -t mangle -F -# post-up iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE - -# Bridge interface with eth0 (comment out eth0 lines above to use with bridge) -# iface eth0 inet manual -# -# auto br0 -# iface br0 inet static -# bridge_ports eth0 -# address 192.168.2.1 -# netmask 255.255.255.0 - -# Wifi client -# -# For MTR WiFi only: -# NOTE: udev rules will bring up wlan0 automatically if a wifi device is detected -# and the wlan0 interface is defined, therefore an "auto wlan0" line is not needed. -# If "auto wlan0" is also specified, startup conflicts may result. -#iface wlan0 inet dhcp -#wpa-conf /var/config/wpa_supplicant.conf -#wpa-driver nl80211 -# -# For Conduit WiFi: -# You must configure wpa_supplicant.conf as appropriate for your WiFi access point -# and its security. The "pre-up" section is needed to create the VAP device, -# wifi0. udhcpc_opts should be used to prevent DHCP from giving up too soon. The -# default timeout is less than 10 seconds, and in some circumstances is not enough -# time for wifi to connect. The udhcpc options specified below are in addition to -# those preconfigured in the ifup program. The option "-t" specifies the number -# of DHCP retries. By default each trial is 3 seconds long. As specified here, -# udhcpc will try for thirty seconds. The option "-b" specifies that if the -# attempts are made and all fail, the boot will proceed, and the udhcpc program -# will continue to periodically attempt to reach the DHCP server. Without the -b -# option, udhcpc will fail and abort if the server is not reached within the -# specified timeout. The boot will continue after the timeout, but the network -# will never be connected without some other intervention. -# -# Specifying "-t 0" results in udhcpc not running in the background, regardless -# of the presence of "-b". This causes udhcpc to enter a loop trying to reach -# the DHCP server, and only relinquising control to the boot (or ifup) if the -# server responds. -# -# The udhcpc_opts parameter will result in the following invocation -# of udhcpc from ifup: -# udhcpc -R -n -p /var/run/udhcpc.wifi0.pid -i wifi0 -t 10 -b -# -# See https://busybox.net/downloads/BusyBox.html for more information. -# -# auto wifi0 -# iface wifi0 inet dhcp -# wpa-conf /etc/wpa_supplicant.conf -# wpa-driver nl80211 -# pre-up bash -c '([[ -d /sys/class/net/wifi0 ]] || /opt/rs9113/onebox_util rpine0 create_vap wifi0 sta sw_bmiss)' -# udhcpc_opts -t 10 -b - -# The pan0 interface purpose is to support bluetooth pand -# If access to another network is required, the ip forwarding -# for eth0 could be enabled. -# auto pan0 -# iface pan0 inet static -# address 10.1.0.1 -# netmask 255.255.255.0 -# pre-up brctl addbr pan0 -# pre-up brctl setfd pan0 0 -# pre-up brctl stp pan0 off diff --git a/recipes-core/multitech/config/ppp/chap-secrets b/recipes-core/multitech/config/ppp/chap-secrets deleted file mode 100644 index 60efe8f..0000000 --- a/recipes-core/multitech/config/ppp/chap-secrets +++ /dev/null @@ -1,3 +0,0 @@ -# Secrets for authentication using CHAP -# client server secret IP addresses -* * "" * diff --git a/recipes-core/multitech/config/ppp/options b/recipes-core/multitech/config/ppp/options deleted file mode 100644 index 3b69f47..0000000 --- a/recipes-core/multitech/config/ppp/options +++ /dev/null @@ -1,27 +0,0 @@ -# Select tty device -# -# First modem AT command port (symlink to actual device) -/dev/modem_at0 - -# Uncomment below to run in foreground -#nodetach - -# Uncomment below to emit debug -#debug - -# Uncomment to keep pppd up if the connection terminates -#persist -# Uncomment for unlimited connection attempts -#maxfail 0 - -# disable logging to /etc/ppp/connect-errors -# and only log to syslog -logfile /dev/null - -lock - -# Sprint modems in some cases require IPV6 to use IPV4. -# It probably doesn't hurt to try to get IPV6, even -# if the carrier doesn't support it. -+ipv6 -ipv6cp-use-ipaddr diff --git a/recipes-core/multitech/config/ppp/pap-secrets b/recipes-core/multitech/config/ppp/pap-secrets deleted file mode 100644 index f782b4a..0000000 --- a/recipes-core/multitech/config/ppp/pap-secrets +++ /dev/null @@ -1,3 +0,0 @@ -# Secrets for authentication using PAP -# client server secret IP addresses -* * "" * diff --git a/recipes-core/multitech/config/ppp/peers/README.fwswitch b/recipes-core/multitech/config/ppp/peers/README.fwswitch deleted file mode 100644 index 47ef5ef..0000000 --- a/recipes-core/multitech/config/ppp/peers/README.fwswitch +++ /dev/null @@ -1,76 +0,0 @@ -LNA3/L4N1 firmware/SIM switching instructions - -To automatically set the APN, bring up the system -with the desired SIM installed (AT&T or Verizon). - -Execute with a Verizon SIM installed -(switch to Verizon Firmware and Chat): - -root@mtcap:~# /usr/sbin/mlinux-switch-apn -Cellular radio is ready. -Setting chat script to /etc/ppp/peers/lna3_chat_vz - -root@mtcap:~# ls -ld /etc/ppp/peers/lna3_chat -lrwxrwxrwx 1 root root 27 Aug 31 16:30 /etc/ppp/peers/lna3_chat -> /etc/ppp/peers/lna3_chat_vz - -root@mtcap:~# radio-query --active-firmware -1 - -Firmware image 1 is Verizon, and lna3_chat should point at the Verizon chat scripts lna3_chat_vz. - -To switch to an AT&T SIM (the default): - -root@mtcap:~# mlinux-switch-apn -Cellular radio is ready. -Setting chat script to /etc/ppp/peers/lna3_chat_non_vz - -It is critical that you do not use an AT&T chat script with a Verizon SIM, -because it will set the wrong APN, and it will be remembered as belonging -to the SIM/device combination. - - -The following are not recommended: -To manually set the chat script: - -mlinux-switch-apn [0|1] - -To manually switch the firmware setting: -mlinux-switch-cell-fw [0|1|-1] [timeout] - -This command sets the chat to this readme file. Then it will be needed to -set the symlink for the chat script, which can be done by using mlinux-switch-apn -with 0 for AT&T, and 1 for Verizon. - - - - - - -Put the desired SIM into the device. - -The default APN is "phone" for the LNA3. - -Set the APN using (does nothing for Sprint or Verizon chat scripts): - -# mlinux-set-apn "YOURAPN" - -Do not put a "AT+CGDCONT" in the lna3_chat_vz script or -l4n1_chat_vz script. It will cause trouble. - -To pick a firmware based on the - -To switch to the Verizon firmware and chat script: - - # mlinux-switch-cell-fw 1 - -To switch to the non-Verizon firmware and chat script: - - # mlinux-switch-cell-fw 0 - -Verizon provided APN setting over the air. If you set the APN on a Verizon SIM, -and they push a new APN, you will need to change the APN on the device. - -It is best not to set the APN. To switch from a manually set APN or incorrect APN -to letting Verizon set the APN, remove the SIM, and put it in another device. -Then register with the Verizon network. With the APN setting removed, put the SIM -back into this device. diff --git a/recipes-core/multitech/config/ppp/peers/cdma b/recipes-core/multitech/config/ppp/peers/cdma deleted file mode 100644 index 3fc231f..0000000 --- a/recipes-core/multitech/config/ppp/peers/cdma +++ /dev/null @@ -1,9 +0,0 @@ -linkname ppp0 -230400 -defaultroute -replacedefaultroute -usepeerdns -noauth -crtscts -novj -connect '/usr/sbin/chat -v -t 90 -f /etc/ppp/peers/cdma_chat' diff --git a/recipes-core/multitech/config/ppp/peers/cdma_chat b/recipes-core/multitech/config/ppp/peers/cdma_chat deleted file mode 100644 index 6ff750e..0000000 --- a/recipes-core/multitech/config/ppp/peers/cdma_chat +++ /dev/null @@ -1,18 +0,0 @@ -SAY "CDMA chat\n" -ECHO OFF -ABORT 'NO DIAL TONE' -ABORT 'NO DIALTONE' -ABORT 'NO ANSWER' -ABORT 'NO CARRIER' -ABORT 'DELAYED' -ABORT 'VOICE' -ABORT 'BUSY' -'' 'AT' -OK 'ATZ' -OK 'AT+CSQ' -SAY "Dialing...\n" -OK 'ATD#777' -SAY "Waiting for CONNECT...\n" -TIMEOUT 120 -CONNECT '' -SAY "Connected\n" diff --git a/recipes-core/multitech/config/ppp/peers/gsm b/recipes-core/multitech/config/ppp/peers/gsm deleted file mode 100644 index 4fc4361..0000000 --- a/recipes-core/multitech/config/ppp/peers/gsm +++ /dev/null @@ -1,11 +0,0 @@ -linkname ppp0 -230400 -defaultroute -replacedefaultroute -usepeerdns -ipcp-max-failure 10 -ipcp-restart 10 -noauth -crtscts -novj -connect '/usr/libexec/ppp/chat_wrapper /usr/sbin/chat -v -t 90 -f /etc/ppp/peers/gsm_chat' diff --git a/recipes-core/multitech/config/ppp/peers/gsm_chat b/recipes-core/multitech/config/ppp/peers/gsm_chat deleted file mode 100644 index d952a89..0000000 --- a/recipes-core/multitech/config/ppp/peers/gsm_chat +++ /dev/null @@ -1,47 +0,0 @@ -SAY "GSM chat\n" -ECHO OFF -ABORT 'NO DIAL TONE' -ABORT 'NO DIALTONE' -ABORT 'NO ANSWER' -ABORT 'NO CARRIER' -ABORT 'DELAYED' -ABORT 'VOICE' -ABORT 'BUSY' -'' 'AT' -OK 'ATZ' -OK 'AT+CSQ' -# ---------------------------------- -# Set the APN for your provider here -# Note that a comment starting with -# #MT AT+CGDCONT= -# will be interpretted by -# /usr/libexec/ppp/chat_wrapper -# as the intended context -# setting. Make the context number -# (after the =) match the -# dialer number context. -# If the context changes, ppp/chat_wrapper -# handles disconnecting the modem -# from the network during the update, -# which is required -# by some modem firmware. -# The chat script will be executed -# after the ppp/chat_wrapper script -# re-registers the modem. -# The context will only be set if the -# modem settings do not match the -# settings here. -# Lines starting with # MT are ignored. -# ---------------------------------- -# MT AT+CGDCONT=1,"IP","proxy" -# MT AT+CGDCONT=1,"IP","ISP.CINGULAR" -# MT AT+CGDCONT=1,"IP","internet2.voicestream.com" -#MT AT+CGDCONT=1,"IP","internet" -OK 'AT+CGDCONT?' -SAY "Dialing...\n" -#OK 'ATD*99#' -OK 'ATD*99***1#' -SAY "Waiting for CONNECT...\n" -TIMEOUT 120 -CONNECT '' -SAY "Connected\n" diff --git a/recipes-core/multitech/config/ppp/peers/l4e1 b/recipes-core/multitech/config/ppp/peers/l4e1 deleted file mode 100644 index 9638398..0000000 --- a/recipes-core/multitech/config/ppp/peers/l4e1 +++ /dev/null @@ -1,11 +0,0 @@ -linkname ppp0 -230400 -defaultroute -replacedefaultroute -usepeerdns -ipcp-max-failure 10 -ipcp-restart 10 -noauth -crtscts -novj -connect '/usr/libexec/ppp/chat_wrapper /usr/sbin/chat -v -t 90 -f /etc/ppp/peers/l4e1_chat' diff --git a/recipes-core/multitech/config/ppp/peers/l4e1_chat b/recipes-core/multitech/config/ppp/peers/l4e1_chat deleted file mode 100644 index bb95881..0000000 --- a/recipes-core/multitech/config/ppp/peers/l4e1_chat +++ /dev/null @@ -1,43 +0,0 @@ -SAY "L4E1 chat\n" -ECHO OFF -ABORT 'NO DIAL TONE' -ABORT 'NO DIALTONE' -ABORT 'NO ANSWER' -ABORT 'NO CARRIER' -ABORT 'DELAYED' -ABORT 'VOICE' -ABORT 'BUSY' -'' 'AT' -OK 'ATZ' -OK 'AT+CSQ' -# ---------------------------------- -# Set the APN for your provider here -# Note that a comment starting with -# #MT AT+CGDCONT= -# will be interpretted by -# /usr/libexec/ppp/chat_wrapper -# as the intended context -# setting. Make the context number -# (after the =) match the -# dialer number context. -# If the context changes, ppp/chat_wrapper -# handles disconnecting the modem -# from the network during the update, -# which is required -# by some modem firmware. -# The chat script will be executed -# after the ppp/chat_wrapper script -# re-registers the modem. -# The context will only be set if the -# modem settings do not match the -# settings here. -# Lines starting with # MT are ignored. -# ---------------------------------- -#MT AT+CGDCONT=1,"IP","internet" -OK 'AT+CGDCONT?' -SAY "Dialing...\n" -OK 'ATD*99***1#' -SAY "Waiting for CONNECT...\n" -TIMEOUT 120 -CONNECT '' -SAY "Connected\n" diff --git a/recipes-core/multitech/config/ppp/peers/l4n1 b/recipes-core/multitech/config/ppp/peers/l4n1 deleted file mode 100644 index 5c011e0..0000000 --- a/recipes-core/multitech/config/ppp/peers/l4n1 +++ /dev/null @@ -1,11 +0,0 @@ -linkname ppp0 -230400 -defaultroute -replacedefaultroute -usepeerdns -ipcp-max-failure 10 -ipcp-restart 10 -noauth -crtscts -novj -connect '/usr/libexec/ppp/chat_wrapper /usr/sbin/chat -v -t 90 -f /etc/ppp/peers/l4n1_chat' diff --git a/recipes-core/multitech/config/ppp/peers/l4n1_chat b/recipes-core/multitech/config/ppp/peers/l4n1_chat deleted file mode 120000 index 36db4e2..0000000 --- a/recipes-core/multitech/config/ppp/peers/l4n1_chat +++ /dev/null @@ -1 +0,0 @@ -l4n1_chat_non_vz \ No newline at end of file diff --git a/recipes-core/multitech/config/ppp/peers/l4n1_chat_non_vz b/recipes-core/multitech/config/ppp/peers/l4n1_chat_non_vz deleted file mode 100644 index 76f3aae..0000000 --- a/recipes-core/multitech/config/ppp/peers/l4n1_chat_non_vz +++ /dev/null @@ -1,67 +0,0 @@ -#---------------------------------------- -# Do NOT use this CHAT script with -# Verizon wireless. It will bind -# this SIM and device to the wrong -# APN. -# -# mlinux-set-apn can be used to set -# the APN. -# -# mlinux-switch-cell-fw can be used -# to switch the firmware settings -# and set the correct CHAT script. -# -# # mlinux-set-apn "APN" -# -# And to switch the firmware to Verizon: -# # mlinux-switch-cell-fw 1 -# -# And to switch to AT&T: -# # mlinux-switch-cell-fw 0 -#---------------------------------------- -SAY "L4N1 chat not for Verizon\n" -ECHO OFF -ABORT 'NO DIAL TONE' -ABORT 'NO DIALTONE' -ABORT 'NO ANSWER' -ABORT 'NO CARRIER' -ABORT 'DELAYED' -ABORT 'VOICE' -ABORT 'BUSY' -'' 'AT' -OK 'ATZ' -OK 'AT+CSQ' -# ---------------------------------- -# Set the APN for your provider here -# Note that a comment starting with -# #MT AT+CGDCONT= -# will be interpretted by -# /usr/libexec/ppp/chat_wrapper -# as the intended context -# setting. Make the context number -# (after the =) match the -# dialer number context. -# If the context changes, ppp/chat_wrapper -# handles disconnecting the modem -# from the network during the update, -# which is required -# by some modem firmware. -# The chat script will be executed -# after the ppp/chat_wrapper script -# re-registers the modem. -# The context will only be set if the -# modem settings do not match the -# settings here. -# Lines starting with # MT are ignored. -# ---------------------------------- -# MT AT+CGDCONT=1,"IP","proxy" -# MT AT+CGDCONT=1,"IP","ISP.CINGULAR" -# MT AT+CGDCONT=1,"IP","internet2.voicestream.com" -#MT AT+CGDCONT=1,"IP","phone" -OK 'AT+CGDCONT?' -SAY "Dialing...\n" -OK 'ATD*99***1#' -SAY "Waiting for CONNECT...\n" -TIMEOUT 120 -CONNECT '' -SAY "Connected\n" diff --git a/recipes-core/multitech/config/ppp/peers/l4n1_chat_vz b/recipes-core/multitech/config/ppp/peers/l4n1_chat_vz deleted file mode 100644 index 1bc3652..0000000 --- a/recipes-core/multitech/config/ppp/peers/l4n1_chat_vz +++ /dev/null @@ -1,44 +0,0 @@ -#---------------------------- -# This chat script has no -# APN because Verizon -# requires the chat script -# not set the APN. -# This is because Verizon -# pushes the APN from their -# network. Image 1 on an -# LNA3 product is used -# with a Verizon SIM. -#---------------------------- -SAY "L4N1 chat Verizon\n" -ECHO OFF -ABORT 'NO DIAL TONE' -ABORT 'NO DIALTONE' -ABORT 'NO ANSWER' -ABORT 'NO CARRIER' -ABORT 'DELAYED' -ABORT 'VOICE' -ABORT 'BUSY' -'' 'AT' -OK 'ATZ' -OK 'AT+CSQ' -# ----------------------------------------- -# Do not enter the AT+CGDCONT, because it -# will cause -# a fault for a Verizon SIM and will push -# the new APN to the network, which will -# cause failures. -# To switch the firmware to Verizon: -# mlinux-switch-cell-fw 1 -# And to switch to AT&T (non-Verizon): -# mlinux-switch-cell-fw 0 -# ----------------------------------------- -# Log APN (current context) for -# diagnostic purposes -#----------------------------------- -OK 'AT+CGDCONT?' -SAY "Dialing...\n" -OK 'ATD*99***3#' -SAY "Waiting for CONNECT...\n" -TIMEOUT 120 -CONNECT '' -SAY "Connected\n" diff --git a/recipes-core/multitech/config/ppp/peers/lap3 b/recipes-core/multitech/config/ppp/peers/lap3 deleted file mode 100644 index ddd75a5..0000000 --- a/recipes-core/multitech/config/ppp/peers/lap3 +++ /dev/null @@ -1,11 +0,0 @@ -linkname ppp0 -230400 -defaultroute -replacedefaultroute -usepeerdns -ipcp-max-failure 10 -ipcp-restart 10 -noauth -crtscts -novj -connect '/usr/libexec/ppp/chat_wrapper /usr/sbin/chat -v -t 90 -f /etc/ppp/peers/lap3_chat' diff --git a/recipes-core/multitech/config/ppp/peers/lap3_chat b/recipes-core/multitech/config/ppp/peers/lap3_chat deleted file mode 100644 index 0f7adf6..0000000 --- a/recipes-core/multitech/config/ppp/peers/lap3_chat +++ /dev/null @@ -1,43 +0,0 @@ -SAY "LAP3 chat\n" -ECHO OFF -ABORT 'NO DIAL TONE' -ABORT 'NO DIALTONE' -ABORT 'NO ANSWER' -ABORT 'NO CARRIER' -ABORT 'DELAYED' -ABORT 'VOICE' -ABORT 'BUSY' -'' 'AT' -OK 'ATZ' -OK 'AT+CSQ' -# ---------------------------------- -# Set the APN for your provider here -# Note that a comment starting with -# #MT AT+CGDCONT= -# will be interpretted by -# /usr/libexec/ppp/chat_wrapper -# as the intended context -# setting. Make the context number -# (after the =) match the -# dialer number context. -# If the context changes, ppp/chat_wrapper -# handles disconnecting the modem -# from the network during the update, -# which is required -# by some modem firmware. -# The chat script will be executed -# after the ppp/chat_wrapper script -# re-registers the modem. -# The context will only be set if the -# modem settings do not match the -# settings here. -# Lines starting with # MT are ignored. -# ---------------------------------- -#MT AT+CGDCONT=1,"IP","internet" -OK 'AT+CGDCONT?' -SAY "Dialing...\n" -OK 'ATD*99***1#' -SAY "Waiting for CONNECT...\n" -TIMEOUT 120 -CONNECT '' -SAY "Connected\n" diff --git a/recipes-core/multitech/config/ppp/peers/leu1 b/recipes-core/multitech/config/ppp/peers/leu1 deleted file mode 100644 index 5a3baec..0000000 --- a/recipes-core/multitech/config/ppp/peers/leu1 +++ /dev/null @@ -1,11 +0,0 @@ -linkname ppp0 -230400 -defaultroute -replacedefaultroute -usepeerdns -ipcp-max-failure 10 -ipcp-restart 10 -noauth -crtscts -novj -connect '/usr/libexec/ppp/chat_wrapper /usr/sbin/chat -v -t 90 -f /etc/ppp/peers/leu1_chat' diff --git a/recipes-core/multitech/config/ppp/peers/leu1_chat b/recipes-core/multitech/config/ppp/peers/leu1_chat deleted file mode 100644 index 6aef877..0000000 --- a/recipes-core/multitech/config/ppp/peers/leu1_chat +++ /dev/null @@ -1,43 +0,0 @@ -SAY "LEU1 chat\n" -ECHO OFF -ABORT 'NO DIAL TONE' -ABORT 'NO DIALTONE' -ABORT 'NO ANSWER' -ABORT 'NO CARRIER' -ABORT 'DELAYED' -ABORT 'VOICE' -ABORT 'BUSY' -'' 'AT' -OK 'ATZ' -OK 'AT+CSQ' -# ---------------------------------- -# Set the APN for your provider here -# Note that a comment starting with -# #MT AT+CGDCONT= -# will be interpretted by -# /usr/libexec/ppp/chat_wrapper -# as the intended context -# setting. Make the context number -# (after the =) match the -# dialer number context. -# If the context changes, ppp/chat_wrapper -# handles disconnecting the modem -# from the network during the update, -# which is required -# by some modem firmware. -# The chat script will be executed -# after the ppp/chat_wrapper script -# re-registers the modem. -# The context will only be set if the -# modem settings do not match the -# settings here. -# Lines starting with # MT are ignored. -# ---------------------------------- -#MT AT+CGDCONT=1,"IP","internet" -OK 'AT+CGDCONT?' -SAY "Dialing...\n" -OK 'ATD*99***1#' -SAY "Waiting for CONNECT...\n" -TIMEOUT 120 -CONNECT '' -SAY "Connected\n" diff --git a/recipes-core/multitech/config/ppp/peers/lna3 b/recipes-core/multitech/config/ppp/peers/lna3 deleted file mode 100644 index 4f6a628..0000000 --- a/recipes-core/multitech/config/ppp/peers/lna3 +++ /dev/null @@ -1,11 +0,0 @@ -linkname ppp0 -230400 -defaultroute -replacedefaultroute -usepeerdns -ipcp-max-failure 10 -ipcp-restart 10 -noauth -crtscts -novj -connect '/usr/libexec/ppp/chat_wrapper /usr/sbin/chat -v -t 90 -f /etc/ppp/peers/lna3_chat' diff --git a/recipes-core/multitech/config/ppp/peers/lna3_chat b/recipes-core/multitech/config/ppp/peers/lna3_chat deleted file mode 120000 index e736424..0000000 --- a/recipes-core/multitech/config/ppp/peers/lna3_chat +++ /dev/null @@ -1 +0,0 @@ -lna3_chat_non_vz \ No newline at end of file diff --git a/recipes-core/multitech/config/ppp/peers/lna3_chat_non_vz b/recipes-core/multitech/config/ppp/peers/lna3_chat_non_vz deleted file mode 100644 index a3da519..0000000 --- a/recipes-core/multitech/config/ppp/peers/lna3_chat_non_vz +++ /dev/null @@ -1,68 +0,0 @@ -#---------------------------------------- -# Do NOT use this CHAT script with -# Verizon wireless. It will bind -# this SIM and device to the wrong -# APN. -# -# mlinux-set-apn can be used to set -# the APN. -# -# mlinux-switch-cell-fw can be used -# to switch the firmware settings -# and set the correct CHAT script. -# -# # mlinux-set-apn "APN" -# -# And to switch the firmware to Verizon: -# # mlinux-switch-cell-fw 1 -# -# And to switch to AT&T: -# # mlinux-switch-cell-fw 0 -#---------------------------------------- -SAY "LNA3 chat not for Verizon\n" -ECHO OFF -ABORT 'NO DIAL TONE' -ABORT 'NO DIALTONE' -ABORT 'NO ANSWER' -ABORT 'NO CARRIER' -ABORT 'DELAYED' -ABORT 'VOICE' -ABORT 'BUSY' -'' 'AT' -OK 'ATZ' -OK 'AT+CSQ' -# ---------------------------------- -# Set the APN for your provider here -# Note that a comment starting with -# #MT AT+CGDCONT= -# will be interpretted by -# /usr/libexec/ppp/chat_wrapper -# as the intended context -# setting. Make the context number -# (after the =) match the -# dialer number context. -# If the context changes, ppp/chat_wrapper -# handles disconnecting the modem -# from the network during the update, -# which is required -# by some modem firmware. -# The chat script will be executed -# after the ppp/chat_wrapper script -# re-registers the modem. -# The context will only be set if the -# modem settings do not match the -# settings here. -# Lines starting with # MT are ignored. -# ---------------------------------- -# MT AT+CGDCONT=3,"IP","proxy" -# MT AT+CGDCONT=3,"IP","ISP.CINGULAR" -# MT AT+CGDCONT=3,"IP","internet2.voicestream.com" -#MT AT+CGDCONT=3,"IP","phone" -OK 'AT+CGDCONT?' -OK 'AT+COPS=0' -SAY "Dialing...\n" -OK 'ATD*99***3#' -SAY "Waiting for CONNECT...\n" -TIMEOUT 120 -CONNECT '' -SAY "Connected\n" diff --git a/recipes-core/multitech/config/ppp/peers/lna3_chat_vz b/recipes-core/multitech/config/ppp/peers/lna3_chat_vz deleted file mode 100644 index 1d2178d..0000000 --- a/recipes-core/multitech/config/ppp/peers/lna3_chat_vz +++ /dev/null @@ -1,44 +0,0 @@ -#---------------------------- -# This chat script has no -# APN because Verizon -# requires the chat script -# not set the APN. -# This is because Verizon -# pushes the APN from their -# network. Image 1 on an -# LNA3 product is used -# with a Verizon SIM. -#---------------------------- -SAY "LNA3 chat Verizon\n" -ECHO OFF -ABORT 'NO DIAL TONE' -ABORT 'NO DIALTONE' -ABORT 'NO ANSWER' -ABORT 'NO CARRIER' -ABORT 'DELAYED' -ABORT 'VOICE' -ABORT 'BUSY' -'' 'AT' -OK 'ATZ' -OK 'AT+CSQ' -# ----------------------------------------- -# Do not enter the AT+CGDCONT, because it -# will cause -# a fault for a Verizon SIM and will push -# the new APN to the network, which will -# cause failures. -# To switch the firmware to Verizon: -# mlinux-switch-cell-fw 1 -# And to switch to AT&T (non-Verizon): -# mlinux-switch-cell-fw 0 -# ----------------------------------------- -# Log APN (current context) for -# diagnostic purposes -#----------------------------------- -OK 'AT+CGDCONT?' -SAY "Dialing...\n" -OK 'ATD*99***3#' -SAY "Waiting for CONNECT...\n" -TIMEOUT 120 -CONNECT '' -SAY "Connected\n" diff --git a/recipes-core/multitech/config/ppp/peers/lsp3 b/recipes-core/multitech/config/ppp/peers/lsp3 deleted file mode 100644 index 50433ab..0000000 --- a/recipes-core/multitech/config/ppp/peers/lsp3 +++ /dev/null @@ -1,11 +0,0 @@ -linkname ppp0 -230400 -defaultroute -replacedefaultroute -usepeerdns -ipcp-max-failure 10 -ipcp-restart 10 -noauth -crtscts -novj -connect '/usr/libexec/ppp/chat_wrapper /usr/sbin/chat -v -t 90 -f /etc/ppp/peers/lsp3_chat' diff --git a/recipes-core/multitech/config/ppp/peers/lsp3_chat b/recipes-core/multitech/config/ppp/peers/lsp3_chat deleted file mode 100644 index 3fcdfc2..0000000 --- a/recipes-core/multitech/config/ppp/peers/lsp3_chat +++ /dev/null @@ -1,19 +0,0 @@ -SAY "LSP3 chat\n" -ECHO OFF -ABORT 'NO DIAL TONE' -ABORT 'NO DIALTONE' -ABORT 'NO ANSWER' -ABORT 'NO CARRIER' -ABORT 'DELAYED' -ABORT 'VOICE' -ABORT 'BUSY' -'' 'AT' -OK 'ATZ' -OK 'AT+CSQ' -OK 'AT+CGDCONT?' -SAY "Dialing...\n" -OK 'ATD*99***2#' -SAY "Waiting for CONNECT...\n" -TIMEOUT 120 -CONNECT '' -SAY "Connected\n" diff --git a/recipes-core/multitech/config/ppp/peers/lvw2 b/recipes-core/multitech/config/ppp/peers/lvw2 deleted file mode 100644 index 773f1dd..0000000 --- a/recipes-core/multitech/config/ppp/peers/lvw2 +++ /dev/null @@ -1,11 +0,0 @@ -linkname ppp0 -230400 -defaultroute -replacedefaultroute -usepeerdns -ipcp-max-failure 10 -ipcp-restart 10 -noauth -crtscts -novj -connect '/usr/sbin/chat -v -t 90 -f /etc/ppp/peers/lvw2_chat' diff --git a/recipes-core/multitech/config/ppp/peers/lvw2_chat b/recipes-core/multitech/config/ppp/peers/lvw2_chat deleted file mode 100644 index c7aede7..0000000 --- a/recipes-core/multitech/config/ppp/peers/lvw2_chat +++ /dev/null @@ -1,27 +0,0 @@ -SAY "LVW2 chat\n" -ECHO OFF -ABORT 'NO DIAL TONE' -ABORT 'NO DIALTONE' -ABORT 'NO ANSWER' -ABORT 'NO CARRIER' -ABORT 'DELAYED' -ABORT 'VOICE' -ABORT 'BUSY' -'' 'AT' -OK 'ATZ' -OK 'AT+CSQ' -# ---------------------------------- -# Do not set the APN for Verizon. -# It must be loaded dynamically -# from the network. -# ---------------------------------- -# Log APN (current context) for -# diagnostic purposes -#----------------------------------- -OK 'AT+CGDCONT?' -SAY "Dialing...\n" -OK 'ATD*99***3#' -SAY "Waiting for CONNECT...\n" -TIMEOUT 120 -CONNECT '' -SAY "Connected\n" diff --git a/recipes-core/multitech/config_2.3.bb b/recipes-core/multitech/config_2.3.bb deleted file mode 100644 index 629cd72..0000000 --- a/recipes-core/multitech/config_2.3.bb +++ /dev/null @@ -1,95 +0,0 @@ -DESCRIPTION = "Provides default system config files and /var/config fs" -SECTION = "base" -LICENSE = "MIT" -RDEPENDS_${PN} += "bash" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -PR = "r7" -PACKAGES =+ "${PN}-mths" -inherit update-rc.d -inherit allarch - -INITSCRIPT_NAME = "config" -INITSCRIPT_PARAMS = "start 31 S ." - -FILESEXTRAPATHS_prepend := "${THISDIR}/config:" -FILESEXTRAPATHS_prepend_${PN} := "${THISDIR}/mths_config:" - -SRC_URI = "\ - file://network \ - file://ppp \ - file://config.init \ - file://config-mths \ - file://chat_wrapper \ - file://chat_wrapper.default \ - file://99_radio \ -" - -RDEPENDS_${PN}-mths += "${PN}" - -CONFFILES_${PN} += "${sysconfdir}/defaults.tar.gz" -CONFIGFILES = "network/interfaces ppp" - -CONFIGFILES_MTHS = "config-mths" - -fakeroot do_install () { - cd ${WORKDIR} - - # default config files - rm -f defaults.tar.gz - chown root:root -R ${CONFIGFILES} - tar czf defaults.tar.gz ${CONFIGFILES} - install -d ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/defaults.tar.gz ${D}${sysconfdir}/defaults.tar.gz - - # save root password for resetting to defaults - echo -n '${ROOT_PASSWORD_HASH}' > ${D}${sysconfdir}/default_pass - chmod 400 ${D}${sysconfdir}/default_pass - - # init script - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/config.init ${D}${sysconfdir}/init.d/config - - # mths adjustments - tar -C ${CONFIGFILES_MTHS} -czf defaults-mths.tar.gz . - install -m 0644 ${WORKDIR}/defaults-mths.tar.gz ${D}${sysconfdir}/defaults-mths.tar.gz - - install -d ${D}${sysconfdir}/default - install -d ${D}${sysconfdir}/default/volatiles - install -d ${D}${libexecdir}/ppp - install -m 0755 ${WORKDIR}/chat_wrapper ${D}${libexecdir}/ppp/ - install -m 0644 ${WORKDIR}/chat_wrapper.default ${D}${sysconfdir}/default/chat_wrapper - install -m 0644 ${WORKDIR}/99_radio ${D}${sysconfdir}/default/volatiles -} - -FILES_${PN} = "${sysconfdir}/defaults.tar.gz ${sysconfdir}/default_pass" -FILES_${PN} += "${sysconfdir}/init.d/config ${sysconfdir}/default ${libexecdir}/ppp/chat_wrapper" -FILES_${PN} += "${sysconfdir}/default/volatiles" - -FILES_${PN}-mths = "${sysconfdir}/defaults-mths.tar.gz" - -# Create the hotspot version of defaults.tar.gz -pkg_postinst_${PN}-mths() { - X=$D/tmp/mths - mkdir -p $X - export X - ( - - set -x - if tar -tf $D${sysconfdir}/defaults.tar.gz | grep dnsmasq ; then - : - else - tb=$X/tarball # Tarball directory - mkdir $tb - tar -C $tb -xf $D/etc/defaults.tar.gz - tar -C $tb -xf $D/etc/defaults-mths.tar.gz - if ! grep '^auto wifi1' $tb/network/interfaces ; then - cat $tb/network/interfaces $tb/network/interfaces.mths >$tb/network/interfaces.new - mv $tb/network/interfaces $tb/network/interfaces.old - mv $tb/network/interfaces.new $tb/network/interfaces - fi - tar -C $tb -cf $D/etc/defaults.tar.gz . - fi - ) >$X/postinsttrace.txt 2>&1 - # Comment out the final line for a trace. - rm -rf $X -} diff --git a/recipes-core/multitech/reset-handler/reset-handler.default b/recipes-core/multitech/reset-handler/reset-handler.default deleted file mode 100644 index 71b3e24..0000000 --- a/recipes-core/multitech/reset-handler/reset-handler.default +++ /dev/null @@ -1,2 +0,0 @@ -# set to "no" to disable reset-handler starting on boot -ENABLED="yes" diff --git a/recipes-core/multitech/reset-handler/reset-handler.init b/recipes-core/multitech/reset-handler/reset-handler.init deleted file mode 100644 index b50e7b8..0000000 --- a/recipes-core/multitech/reset-handler/reset-handler.init +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -DAEMON=/usr/sbin/reset-handler -PIDFILE=/var/run/reset-handler.pid -ENABLED="yes" - -[ -r /etc/default/reset-handler ] && . /etc/default/reset-handler -[ -x $DAEMON ] || exit 0 -[ "$ENABLED" = "yes" ] || exit 0 - -case "$1" in - start) - if [ -f $PIDFILE ]; then - echo "reset-handler pid file exists, not starting" - exit 1 - else - echo "Starting reset-handler" - start-stop-daemon --start --background --make-pidfile --pidfile $PIDFILE --exec $DAEMON - fi - ;; - stop) - echo "Stopping reset-handler" - start-stop-daemon --stop --oknodo --pidfile $PIDFILE - rm -f $PIDFILE - ;; - *) - echo "Usage: $0 {start|stop}" - exit 2 - ;; -esac diff --git a/recipes-core/multitech/reset-handler/reset-handler.sh b/recipes-core/multitech/reset-handler/reset-handler.sh deleted file mode 100755 index 50a6783..0000000 --- a/recipes-core/multitech/reset-handler/reset-handler.sh +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/bash - -# Copyright (C) 2014 Multi-Tech Systems - -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: - -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. - -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -name="reset-handler" -log="logger -t $name -s" -pid="$$" - -short_signal=10 # SIGUSR1 -long_signal=12 # SIGUSR2 -extralong_signal=1 # SIGHUP - -do_reboot() { - $log "Rebooting on button press" - sleep 1 - reboot -} - -do_restore_defaults() { - $log "Removing /var/config contents" - rm -rf /var/config/* - $log "Setting restore defaults on reboot" - touch /var/config/force_defaults - $log "Rebooting" - sleep 1 - reboot -} - -log_exit() { - $log "Exiting on SIGTERM" - exit 0 -} - -idle_wait() { - pipe=/var/tmp/$name.fifo - rm -f $pipe - mkfifo -m 400 $pipe - - # sneaky way to do nothing forever - while true; do - read < $pipe - done -} - -trap do_reboot $short_signal -trap do_restore_defaults $long_signal -trap do_restore_defaults $extralong_signal -trap log_exit TERM - -$log "Enabling reset-monitor for pid $pid" -mts-io-sysfs store reset-monitor "$pid $short_signal $long_signal $extralong_signal" -# set long press to 5 seconds for reset to defaults -mts-io-sysfs store reset-monitor-intervals "5 30" - -# wait for signals -idle_wait diff --git a/recipes-core/multitech/reset-handler_1.0.bb b/recipes-core/multitech/reset-handler_1.0.bb deleted file mode 100644 index 39abaab..0000000 --- a/recipes-core/multitech/reset-handler_1.0.bb +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "Default reset button handler" -SECTION = "base" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -PR = "r1" -RDEPENDS_${PN} += "bash" - -inherit update-rc.d - -INITSCRIPT_NAME = "reset-handler" -INITSCRIPT_PARAMS = "start 95 2 3 4 5 ." -CONFFILES_${PN} = "${sysconfdir}/default/reset-handler" - -SRC_URI = "\ - file://reset-handler.sh \ - file://reset-handler.init \ - file://reset-handler.default \ -" - -do_install () { - install -d ${D}${sbindir} - install -m 0755 ${WORKDIR}/reset-handler.sh ${D}${sbindir}/reset-handler - - # init script - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/reset-handler.init ${D}${sysconfdir}/init.d/reset-handler - - install -d ${D}${sysconfdir}/default - install -m 0644 ${WORKDIR}/reset-handler.default ${D}${sysconfdir}/default/reset-handler -} diff --git a/recipes-core/multitech/upgrade-reboot_1.0.0.bb b/recipes-core/multitech/upgrade-reboot_1.0.0.bb deleted file mode 100644 index c506db3..0000000 --- a/recipes-core/multitech/upgrade-reboot_1.0.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "Reboot command to run after firmware upgrade" -HOMEPAGE = "http://www.multitech.net/" -SECTION = "console/utils" -PRIORITY = "optional" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -PR = "r0" - -# tag 1.0.0 -SRCREV = "6b917d88f41a4694a85b86cd047e10ddbd8c691f" - -SRC_URI = "git://git.multitech.net/upgrade-reboot.git;protocol=git" -S = "${WORKDIR}/git" - -inherit autotools - -PARALLEL_MAKE = "" diff --git a/recipes-core/sysvinit/files/bootlogd b/recipes-core/sysvinit/files/bootlogd deleted file mode 100644 index 5780724..0000000 --- a/recipes-core/sysvinit/files/bootlogd +++ /dev/null @@ -1 +0,0 @@ -BOOTLOGD_ENABLE=No diff --git a/recipes-core/sysvinit/files/rc b/recipes-core/sysvinit/files/rc deleted file mode 100755 index 16f1c9c..0000000 --- a/recipes-core/sysvinit/files/rc +++ /dev/null @@ -1,193 +0,0 @@ -#!/bin/sh -# -# rc This file is responsible for starting/stopping -# services when the runlevel changes. -# -# Optimization feature: -# A startup script is _not_ run when the service was -# running in the previous runlevel and it wasn't stopped -# in the runlevel transition (most Debian services don't -# have K?? links in rc{1,2,3,4,5} ) -# -# Author: Miquel van Smoorenburg -# Bruce Perens -# -# Version: @(#)rc 2.78 07-Nov-1999 miquels@cistron.nl -# - -. /etc/default/rcS -export VERBOSE - -startup_progress() { - step=$(($step + $step_change)) - if [ "$num_steps" != "0" ]; then - progress=$((($step * $progress_size / $num_steps) + $first_step)) - else - progress=$progress_size - fi - #echo "PROGRESS is $progress $runlevel $first_step + ($step of $num_steps) $step_change $progress_size" - #if type psplash-write >/dev/null 2>&1; then - # TMPDIR=/mnt/.psplash psplash-write "PROGRESS $progress" || true - #fi - if [ -e /mnt/.psplash/psplash_fifo ]; then - echo "PROGRESS $progress" > /mnt/.psplash/psplash_fifo - fi -} - - -# -# Start script or program. -# -startup() { - # Handle verbosity - [ "$VERBOSE" = very ] && echo "INIT: Running $@..." - - case "$1" in - *.sh) - # Source shell script for speed. - ( - trap - INT QUIT TSTP - scriptname=$1 - shift - . $scriptname - ) - ;; - *) - "$@" - ;; - esac - startup_progress -} - - # Ignore CTRL-C only in this shell, so we can interrupt subprocesses. - trap ":" INT QUIT TSTP - - # Set onlcr to avoid staircase effect. - stty onlcr 0>&1 - - # Limit stack size for startup scripts - [ "$STACK_SIZE" == "" ] || ulimit -S -s $STACK_SIZE - - # Now find out what the current and what the previous runlevel are. - - runlevel=$RUNLEVEL - # Get first argument. Set new runlevel to this argument. - [ "$1" != "" ] && runlevel=$1 - if [ "$runlevel" = "" ] - then - echo "Usage: $0 " >&2 - exit 1 - fi - previous=$PREVLEVEL - [ "$previous" = "" ] && previous=N - - export runlevel previous - - # Is there an rc directory for this new runlevel? - if [ -d /etc/rc$runlevel.d ] - then - # Find out where in the progress bar the initramfs got to. - PROGRESS_STATE=0 - #if [ -f /dev/.initramfs/progress_state ]; then - # . /dev/.initramfs/progress_state - #fi - - # Split the remaining portion of the progress bar into thirds - progress_size=$(((100 - $PROGRESS_STATE) / 3)) - - case "$runlevel" in - 0|6) - # Count down from -100 to 0 and use the entire bar - first_step=-100 - progress_size=100 - step_change=1 - ;; - S) - # Begin where the initramfs left off and use 2/3 - # of the remaining space - first_step=$PROGRESS_STATE - progress_size=$(($progress_size * 2)) - step_change=1 - ;; - *) - # Begin where rcS left off and use the final 1/3 of - # the space (by leaving progress_size unchanged) - first_step=$(($progress_size * 2 + $PROGRESS_STATE)) - step_change=1 - ;; - esac - - num_steps=0 - for s in /etc/rc$runlevel.d/[SK]*; do - case "${s##/etc/rc$runlevel.d/S??}" in - gdm|xdm|kdm|reboot|halt) - break - ;; - esac - num_steps=$(($num_steps + 1)) - done - step=0 - - # First, run the KILL scripts. - if [ $previous != N ] - then - for i in /etc/rc$runlevel.d/K[0-9][0-9]* - do - # Check if the script is there. - [ ! -f $i ] && continue - - # Stop the service. - startup $i stop - done - fi - - # Now run the START scripts for this runlevel. - case "$runlevel" in - 0|6) - pararg="stop" - ;; - *) - pararg="start" - ;; - esac - - for pri in $(seq -w 99) - do - prilist="" - for i in /etc/rc$runlevel.d/S$pri* - do - [ ! -f $i ] && continue - - if [ $previous != N ] && [ $previous != S ] - then - # - # Find start script in previous runlevel and - # stop script in this runlevel. - # - suffix=${i#/etc/rc$runlevel.d/S[0-9][0-9]} - stop=/etc/rc$runlevel.d/K[0-9][0-9]$suffix - previous_start=/etc/rc$previous.d/S[0-9][0-9]$suffix - # - # If there is a start script in the previous level - # and _no_ stop script in this level, we don't - # have to re-start the service. - # - [ -f $previous_start ] && [ ! -f $stop ] && continue - fi - - file=$(readlink -f -n $i) - [ -f "$file" ] && prilist+="$file " - done - if [ -n "$prilist" ]; then - startpar -a $pararg ${prilist[@]} - fi - done - fi - -#Uncomment to cause psplash to exit manually, otherwise it exits when it sees a VC switch -if [ "x$runlevel" != "xS" ] && [ ! -x /etc/rc${runlevel}.d/S??xserver-nodm ]; then - if type psplash-write >/dev/null 2>&1; then - TMPDIR=/mnt/.psplash psplash-write "QUIT" || true - umount -l /mnt/.psplash - fi -fi diff --git a/recipes-core/sysvinit/files/start_getty_open b/recipes-core/sysvinit/files/start_getty_open deleted file mode 100644 index 3afce00..0000000 --- a/recipes-core/sysvinit/files/start_getty_open +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -# Open console for testing -if [ -c /dev/$2 ] -then - /sbin/getty -L $1 $2 xterm -n -l /bin/bash -fi diff --git a/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend b/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend deleted file mode 100644 index 9b7e787..0000000 --- a/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend +++ /dev/null @@ -1,29 +0,0 @@ -# enable gadget serial console for supported hardware -SUMMARY_${PN}-start-open = "Open debug console for development only" -SUMMARY_${PN}-start = "Production console" -SERIAL_CONSOLES_append_mtcdt = " 115200;ttyGS0" -PACKAGES =+ "${PN}-start ${PN}-start-open" -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -SRC_URI += "file://start_getty_open \ - file://bootlogd \ - " - -FILES_${PN} = "${sysconfdir}/inittab ${sysconfdir}/default/bootlogd" -FILES_${PN}-start = "${base_bindir}/start_getty" -FILES_${PN}-start-open = "${base_bindir}/start_getty_open" -RCONFLICTS_${PN}-start = "${PN}-start-open" -RCONFLICTS_${PN}-start-open = "${PN}-start" -RDEPENDS_${PN}-start-open = "${PN}" - -do_install_append() { - install -m 0755 ${WORKDIR}/start_getty_open ${D}${base_bindir}/start_getty_open - install -d ${D}{sysconfdir}/default - install -m 0644 ${WORKDIR}/bootlogd ${D}{sysconfdir}/default/ -} -pkg_postinst_${PN}-start-open() { - sed -i 's?^S0:.*?S0:12345:respawn:/bin/start_getty_open 115200 ttyS0?' $D/etc/inittab -} - -pkg_prerm_${PN}-start-open() { - sed -i 's?^S0:.*?S0:12345:respawn:/bin/start_getty 115200 ttyS0?' $D/etc/inittab -} diff --git a/recipes-navigation/gpsd/gpsd-3.16/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch b/recipes-navigation/gpsd/gpsd-3.16/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch deleted file mode 100644 index 2ea3226..0000000 --- a/recipes-navigation/gpsd/gpsd-3.16/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 1e2cea8945bc2183fbe1a012dcd633a352125952 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -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 -Signed-off-by: Peter A. Bigot ---- - 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/0001-include-sys-ttydefaults.h.patch b/recipes-navigation/gpsd/gpsd-3.16/0001-include-sys-ttydefaults.h.patch deleted file mode 100644 index b27c671..0000000 --- a/recipes-navigation/gpsd/gpsd-3.16/0001-include-sys-ttydefaults.h.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 543f79222520cc6ab65d20f9fa356dac5c848e3b Mon Sep 17 00:00:00 2001 -From: Khem Raj -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 ---- -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 - #include - #include -+#include - #include - #ifndef S_SPLINT_S - #include --- -1.8.3.1 - diff --git a/recipes-navigation/gpsd/gpsd-3.16/0002-SConstruct-remove-rpath.patch b/recipes-navigation/gpsd/gpsd-3.16/0002-SConstruct-remove-rpath.patch deleted file mode 100644 index 083a662..0000000 --- a/recipes-navigation/gpsd/gpsd-3.16/0002-SConstruct-remove-rpath.patch +++ /dev/null @@ -1,45 +0,0 @@ -From d090638ff983e509162d5e3b62aa4918de4aa5fa Mon Sep 17 00:00:00 2001 -From: Martin Jansa -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 -Signed-off-by: Denis 'GNUtoo' Carikli -Signed-off-by: Peter A. Bigot ---- - 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/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch b/recipes-navigation/gpsd/gpsd-3.16/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch deleted file mode 100644 index 8527f0d..0000000 --- a/recipes-navigation/gpsd/gpsd-3.16/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 697e2e9ff97487266d817cdd41bacc83f681e3d7 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -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 -Signed-off-by: Peter A. Bigot ---- - 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/0005-suppress-text-in-binary.patch b/recipes-navigation/gpsd/gpsd-3.16/0005-suppress-text-in-binary.patch deleted file mode 100644 index f338126..0000000 --- a/recipes-navigation/gpsd/gpsd-3.16/0005-suppress-text-in-binary.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -u old/gpsctl.c new/gpsctl.c ---- old/gpsctl.c 2017-01-03 15:57:50.517120891 -0600 -+++ new/gpsctl.c 2017-01-03 18:31:21.421101434 -0600 -@@ -175,7 +175,7 @@ - int option, status; - char *device = NULL, *devtype = NULL; - char *speed = NULL, *control = NULL, *rate = NULL; -- bool to_binary = false, to_nmea = false, reset = false; -+ bool to_binary = false, to_nmea = false, reset = false, control_string = false; - bool lowlevel=false, echo=false; - struct gps_data_t gpsdata; - const struct gps_type_t *forcetype = NULL; -@@ -205,6 +205,7 @@ - #ifdef CONTROLSEND_ENABLE - control = optarg; - lowlevel = true; -+ control_string = true; - if ((cooklen = hex_escapes(cooked, control)) <= 0) { - gpsd_log(&context.errout, LOG_ERROR, - "invalid escape string (error %d)\n", (int)cooklen); -@@ -704,7 +705,8 @@ - } - } - -- (void)printf("%s identified as a %s at %u baud.\n", -+ if(!control_string) -+ (void)printf("%s identified as a %s at %u baud.\n", - device, gpsd_id(&session), - session.gpsdata.dev.baudrate); - diff --git a/recipes-navigation/gpsd/gpsd-3.16/0006-itu_r_tf_460_6.patch b/recipes-navigation/gpsd/gpsd-3.16/0006-itu_r_tf_460_6.patch deleted file mode 100644 index 8e8d814..0000000 --- a/recipes-navigation/gpsd/gpsd-3.16/0006-itu_r_tf_460_6.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur old/ntpshmwrite.c new/ntpshmwrite.c ---- old/ntpshmwrite.c 2017-01-23 10:00:05.497129473 -0600 -+++ new/ntpshmwrite.c 2017-01-23 09:47:58.881627772 -0600 -@@ -32,11 +32,18 @@ - * NTP expects leap pending for only 1 month prior to insertion - * Per http://bugs.ntp.org/1090 */ - (void)gmtime_r( &(td->real.tv_sec), &tm); -+/* This code contradicts page 3 section 2.1 of ITU-R RV.460-6 that -+ * leap second may occur at the last second of a month, with -+ * preference for December and June, 2nd preference to March and -+ * September. -+ * https://www.itu.int/dms_pubrec/itu-r/rec/tf/R-REC-TF.460-6-200202-I!!PDF-E.pdf -+ */ -+#ifdef NOTITU_R_TF_460_6 - if ( 5 != tm.tm_mon && 11 != tm.tm_mon ) { - /* Not june, not December, no way */ - leap_notify = LEAP_NOWARNING; - } -- -+#endif /* NOTITU_R_TF_460_6 */ - /* we use the shmTime mode 1 protocol - * - * ntpd does this: diff --git a/recipes-navigation/gpsd/gpsd-3.16/0006-sysclockcrash.patch b/recipes-navigation/gpsd/gpsd-3.16/0006-sysclockcrash.patch deleted file mode 100644 index e6b90f0..0000000 --- a/recipes-navigation/gpsd/gpsd-3.16/0006-sysclockcrash.patch +++ /dev/null @@ -1,48 +0,0 @@ -Before the fix, sample PPS Logs: -gpsd:PROG: KPPS:/dev/pps0 Clear cycle: -1236963952, duration: 1000000 @ (null) -gpsd:PROG: PPS:/dev/pps0 Clear cycle: 0, duration: 1000000 @ (null) - -With this fix, we see logs like this: -gpsd:PROG: KPPS:/dev/pps0 Clear cycle: 1000010, duration: 100003 @ 1577729345.554599378 -gpsd:PROG: PPS:/dev/pps0 Clear cycle: 1000010, duration: 100003 @ 1577729345.554599378 - -When the system clock changes without this fix, and the -debug level is 4 or greater, GPSD crashes on 32 bit ARM. -This fix prevents strlen() in vfprintf() from being given -a garbage pointer. cycle, cycle_kpps, duration and -duration_kpps are defined as long long, so by the C -standard, the format string is %lld. -======================================================================= -diff -Naur old/ppsthread.c new/ppsthread.c ---- old/ppsthread.c 2017-02-01 11:36:31.575212221 -0600 -+++ new/ppsthread.c 2017-02-01 11:44:48.269536679 -0600 -@@ -770,10 +770,9 @@ - edge_str = edge ? "Assert" : "Clear"; - cycle = cycle_tio; - duration = duration_tio; -- - timespec_str( &clock_ts, ts_str1, sizeof(ts_str1) ); - thread_context->log_hook(thread_context, THREAD_PROG, -- "TPPS:%s %.10s cycle: %d, duration: %d @ %s\n", -+ "TPPS:%s %.10s cycle: %lld, duration: %lld @ %s\n", - thread_context->devicename, edge_str, cycle, duration, - ts_str1); - -@@ -840,7 +839,7 @@ - - timespec_str( &clock_ts_kpps, ts_str1, sizeof(ts_str1) ); - thread_context->log_hook(thread_context, THREAD_PROG, -- "KPPS:%s %.10s cycle: %7d, duration: %7d @ %s\n", -+ "KPPS:%s %.10s cycle: %7lld, duration: %7lld @ %s\n", - thread_context->devicename, - edge_str, - cycle_kpps, duration_kpps, ts_str1); -@@ -898,7 +897,7 @@ - state_last = state; - timespec_str( &clock_ts, ts_str1, sizeof(ts_str1) ); - thread_context->log_hook(thread_context, THREAD_PROG, -- "PPS:%s %.10s cycle: %7d, duration: %7d @ %s\n", -+ "PPS:%s %.10s cycle: %7lld, duration: %7lld @ %s\n", - thread_context->devicename, - edge_str, - cycle, duration, ts_str1); diff --git a/recipes-navigation/gpsd/gpsd-3.16/0006-ubxtimelps.patch b/recipes-navigation/gpsd/gpsd-3.16/0006-ubxtimelps.patch deleted file mode 100644 index e715847..0000000 --- a/recipes-navigation/gpsd/gpsd-3.16/0006-ubxtimelps.patch +++ /dev/null @@ -1,200 +0,0 @@ -diff -Naur old/driver_ubx.c new/driver_ubx.c ---- old/driver_ubx.c 2017-01-19 14:12:25.099231346 -0600 -+++ new/driver_ubx.c 2017-01-19 15:13:58.552152991 -0600 -@@ -57,6 +57,29 @@ - #define UBX_CFG_LEN 20 - #define outProtoMask 14 - -+#ifdef UBLOXTIMELS_ENABLE -+/* UBX-NAV-TIMELS support */ -+static char *srcOfCurrLs[] = { -+ "firmware", -+ "GPS GLONASS difference", -+ "GPS", -+ "SBAS", -+ "BeiDou", -+ "Galileo", -+ "Aided data", -+ "Configured" -+}; -+static char *srcOfLsChange[] = { -+ "No Source", -+ "Undefined", -+ "GPS", -+ "SBAS", -+ "BeiDou", -+ "Galileo", -+ "GLONOSS", -+}; -+#endif /* UBLOXTIMELS_ENABLE */ -+ - static gps_mask_t ubx_parse(struct gps_device_t *session, unsigned char *buf, - size_t len); - static gps_mask_t ubx_msg_nav_dop(struct gps_device_t *session, -@@ -237,6 +260,89 @@ - return mask; - } - -+#ifdef UBLOXTIMELS_ENABLE -+/** -+ * Navigation time to leap second -+ * -+ * Sets leap_notify if leap second is < 23 hours away. -+ */ -+static void -+ubx_msg_nav_timels(struct gps_device_t *session, unsigned char *buf, -+ size_t data_len) -+{ -+ int version; -+ unsigned int flags; -+ int valid_curr_ls; -+ int valid_time_to_ls_event; -+ -+ if (data_len != 24) { -+ gpsd_log(&session->context->errout, LOG_WARN, -+ "UBX-NAV-TIMELS: unexpected length %d, expecting 24\n", -+ data_len); -+ return; -+ } -+ version = getsb(buf,4); -+ /* Only version 0 is defined so far. */ -+ flags = (unsigned int)getub(buf, 23); -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX-NAV-TIMELS: flags 0x%x message version %d\n",flags, version); -+ valid_curr_ls = flags & UBX_TIMELS_VALID_CURR_LS; -+ valid_time_to_ls_event = flags & UBX_TIMELS_VALID_TIME_LS_EVT; -+ if(valid_curr_ls) { -+ unsigned int src_of_curr_ls = getub(buf,8); -+ int curr_ls = getsb(buf,9); -+ char *src = "Unknown"; -+ -+ if(src_of_curr_ls < (sizeof srcOfCurrLs/(sizeof srcOfCurrLs[0]))) -+ src = srcOfCurrLs[src_of_curr_ls]; -+ -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX-NAV-TIMELS: source_of_current_leapsecond=%u:%s curr_ls=%d\n", -+ src_of_curr_ls,src,curr_ls); -+ session->context->leap_seconds = curr_ls; -+ session->context->valid |= LEAP_SECOND_VALID; -+ } /* Valid current leap second */ -+ if(valid_time_to_ls_event) { -+ char *src="Unknown"; -+ unsigned int src_of_ls_change; -+ unsigned short dateOfLSGpsWn, dateOfLSGpsDn; -+ int lsChange = getsb(buf,11); -+ int timeToLsEvent = getles32(buf,12); -+ src_of_ls_change = getub(buf,10); -+ if(src_of_ls_change < (sizeof srcOfLsChange/(sizeof srcOfLsChange[0]))) -+ src = srcOfLsChange[src_of_ls_change]; -+ dateOfLSGpsWn = getles16(buf,16); -+ dateOfLSGpsDn = getles16(buf,18); -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX_NAV_TIMELS: source_of_leapsecond_change=%u:%s " -+ "leapSecondChage=%d timeToLsEvent=%d\n", -+ src_of_ls_change,src,lsChange,timeToLsEvent); -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX_NAV_TIMELS: dateOfLSGpsWn=%d dateOfLSGpsDn=%d\n", -+ dateOfLSGpsWn,dateOfLSGpsDn); -+ if(timeToLsEvent < 60*60*23 && timeToLsEvent > 0) { -+ if(lsChange == 0) -+ session->context->leap_notify = LEAP_NOWARNING; -+ else if (lsChange == 1) -+ session->context->leap_notify = LEAP_ADDSECOND; -+ else if (lsChange == -1) -+ session->context->leap_notify = LEAP_DELSECOND; -+ } else -+ session->context->leap_notify = LEAP_NOWARNING; -+ -+ if (session->context->leap_notify == LEAP_ADDSECOND) -+ gpsd_log(&session->context->errout,LOG_INF, -+ "UBX_NAV_TIMELS: Add leap second today\n"); -+ else if (session->context->leap_notify == LEAP_DELSECOND) -+ gpsd_log(&session->context->errout,LOG_INF, -+ "UBX_NAV_TIMELS: Remove leap second today\n"); -+ -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX_NAV_TIMELS: leaving: leap_notify=%d\n", -+ session->context->leap_notify); -+ } -+} -+#endif /* UBLOXTIMELS_ENABLE */ - /** - * Geodetic position solution message - */ -@@ -523,13 +629,22 @@ - case UBX_NAV_EKFSTATUS: - gpsd_log(&session->context->errout, LOG_DATA, "UBX_NAV_EKFSTATUS\n"); - break; -- -+ case UBX_NAV_TIMELS: -+ gpsd_log(&session->context->errout, LOG_DATA, "UBX_NAV_TIMELS\n"); -+#ifdef UBLOXTIMELS_ENABLE -+ ubx_msg_nav_timels(session, &buf[UBX_PREFIX_LEN],data_len); -+#endif // UBLOXTIMELS_ENABLE -+ break; - case UBX_RXM_RAW: - gpsd_log(&session->context->errout, LOG_DATA, "UBX_RXM_RAW\n"); - break; - case UBX_RXM_SFRB: -+ gpsd_log(&session->context->errout, LOG_DATA, "UBX_RXM_SFRB\n"); - mask = ubx_msg_sfrb(session, &buf[UBX_PREFIX_LEN]); - break; -+ case UBX_RXM_SFRBX: -+ gpsd_log(&session->context->errout, LOG_DATA, "UBX_RXM_SFRBX\n"); -+ break; - case UBX_RXM_SVSI: - gpsd_log(&session->context->errout, LOG_PROG, "UBX_RXM_SVSI\n"); - break; -@@ -955,6 +1070,12 @@ - msg[1] = 0x20; /* msg id = UBX_NAV_TIMEGPS */ - msg[2] = 0x01; /* rate */ - (void)ubx_write(session, 0x06u, 0x01, msg, 3); -+#ifdef UBLOXTIMELS_ENABLE -+ msg[0] = 0x01; /* class */ -+ msg[1] = 0x26; /* msg id = UBX_NAV_TIMELS */ -+ msg[2] = 0xff; /* rate */ -+#endif /* UBLOXTIMELS_ENABLE */ -+ (void)ubx_write(session, 0x06u, 0x01, msg, 3); - msg[0] = 0x01; /* class */ - msg[1] = 0x30; /* msg id = NAV-SVINFO */ - msg[2] = 0x0a; /* rate */ -diff -Naur old/driver_ubx.h new/driver_ubx.h ---- old/driver_ubx.h 2017-01-19 14:12:25.099231346 -0600 -+++ new/driver_ubx.h 2017-01-19 14:01:48.177653001 -0600 -@@ -35,6 +35,7 @@ - UBX_NAV_TIMEGPS = UBX_MSGID(UBX_CLASS_NAV, 0x20), - UBX_NAV_TIMEUTC = UBX_MSGID(UBX_CLASS_NAV, 0x21), - UBX_NAV_CLOCK = UBX_MSGID(UBX_CLASS_NAV, 0x22), -+ UBX_NAV_TIMELS = UBX_MSGID(UBX_CLASS_NAV, 0x26), - UBX_NAV_SVINFO = UBX_MSGID(UBX_CLASS_NAV, 0x30), - UBX_NAV_DGPS = UBX_MSGID(UBX_CLASS_NAV, 0x31), - UBX_NAV_SBAS = UBX_MSGID(UBX_CLASS_NAV, 0x32), -@@ -42,6 +43,7 @@ - - UBX_RXM_RAW = UBX_MSGID(UBX_CLASS_RXM, 0x10), - UBX_RXM_SFRB = UBX_MSGID(UBX_CLASS_RXM, 0x11), -+ UBX_RXM_SFRBX = UBX_MSGID(UBX_CLASS_RXM, 0x13), - UBX_RXM_SVSI = UBX_MSGID(UBX_CLASS_RXM, 0x20), - UBX_RXM_ALM = UBX_MSGID(UBX_CLASS_RXM, 0x30), - UBX_RXM_EPH = UBX_MSGID(UBX_CLASS_RXM, 0x31), -@@ -102,6 +104,9 @@ - #define UBX_SOL_VALID_WEEK 0x04 - #define UBX_SOL_VALID_TIME 0x08 - -+#define UBX_TIMELS_VALID_CURR_LS 0x01 -+#define UBX_TIMELS_VALID_TIME_LS_EVT 0x01 -+ - /* from UBX_NAV_SVINFO */ - #define UBX_SAT_USED 0x01 - #define UBX_SAT_DGPS 0x02 -diff -Naur old/SConstruct new/SConstruct ---- old/SConstruct 2017-01-19 14:51:35.638466569 -0600 -+++ new/SConstruct 2017-01-19 15:20:02.488159765 -0600 -@@ -113,6 +113,7 @@ - ("tripmate", True, "DeLorme TripMate support"), - ("tsip", True, "Trimble TSIP support"), - ("ublox", True, "u-blox Protocol support"), -+ ("ubloxtimels", False, "u-blox UBX-NAV-TIMELS support (leap second)"), - ("fury", True, "Jackson Labs Fury and Firefly support"), - ("nmea2000", True, "NMEA2000/CAN support"), - # Non-GPS protocols diff --git a/recipes-navigation/gpsd/gpsd-3.16/0008-major_gnu.patch b/recipes-navigation/gpsd/gpsd-3.16/0008-major_gnu.patch deleted file mode 100644 index 8582712..0000000 --- a/recipes-navigation/gpsd/gpsd-3.16/0008-major_gnu.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naru orig/serial.c new/serial.c ---- orig/serial.c 2019-07-26 18:01:44.178086824 -0500 -+++ new/serial.c 2019-07-26 18:02:49.742084883 -0500 -@@ -64,7 +64,7 @@ - * stable and architecture-independent. It is *not* a good model - * for other Unixes where either or both assumptions may break. - */ -- int devmajor = major(sb.st_rdev); -+ int devmajor = gnu_dev_major(sb.st_rdev); - /* 207 are Freescale i.MX UARTs (ttymxc*) */ - if (devmajor == 4 || devmajor == 204 || devmajor == 207) - devtype = source_rs232; diff --git a/recipes-navigation/gpsd/gpsd-3.16/leap2017Aug31.patch b/recipes-navigation/gpsd/gpsd-3.16/leap2017Aug31.patch deleted file mode 100644 index 658b757..0000000 --- a/recipes-navigation/gpsd/gpsd-3.16/leap2017Aug31.patch +++ /dev/null @@ -1,167 +0,0 @@ -diff -Naur old/driver_ubx.c new/driver_ubx.c ---- old/driver_ubx.c 2017-08-01 10:56:05.757282801 -0500 -+++ new/driver_ubx.c 2017-08-01 10:53:49.785286827 -0500 -@@ -57,6 +57,29 @@ - #define UBX_CFG_LEN 20 - #define outProtoMask 14 - -+#ifdef UBLOXTIMELS_ENABLE -+/* UBX-NAV-TIMELS support */ -+static char *srcOfCurrLs[] = { -+ "firmware", -+ "GPS GLONASS difference", -+ "GPS", -+ "SBAS", -+ "BeiDou", -+ "Galileo", -+ "Aided data", -+ "Configured" -+}; -+static char *srcOfLsChange[] = { -+ "No Source", -+ "Undefined", -+ "GPS", -+ "SBAS", -+ "BeiDou", -+ "Galileo", -+ "GLONOSS", -+}; -+#endif /* UBLOXTIMELS_ENABLE */ -+ - static gps_mask_t ubx_parse(struct gps_device_t *session, unsigned char *buf, - size_t len); - static gps_mask_t ubx_msg_nav_dop(struct gps_device_t *session, -@@ -237,6 +260,96 @@ - return mask; - } - -+#ifdef UBLOXTIMELS_ENABLE -+/** -+ * Navigation time to leap second -+ * -+ * Sets leap_notify if leap second is < 23 hours away. -+ */ -+static void -+ubx_msg_nav_timels(struct gps_device_t *session, unsigned char *buf, -+ size_t data_len) -+{ -+ int version; -+ unsigned int flags; -+ int valid_curr_ls; -+ int valid_time_to_ls_event; -+ -+ if (data_len != 24) { -+ gpsd_log(&session->context->errout, LOG_WARN, -+ "UBX-NAV-TIMELS: unexpected length %d, expecting 24\n", -+ data_len); -+ return; -+ } -+ version = getsb(buf,4); -+ /* Only version 0 is defined so far. */ -+ flags = (unsigned int)getub(buf, 23); -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX-NAV-TIMELS: flags 0x%x message version %d\n",flags, version); -+ valid_curr_ls = flags & UBX_TIMELS_VALID_CURR_LS; -+ valid_time_to_ls_event = flags & UBX_TIMELS_VALID_TIME_LS_EVT; -+ if(valid_curr_ls) { -+ unsigned int src_of_curr_ls = getub(buf,8); -+ int curr_ls = getsb(buf,9); -+ char *src = "Unknown"; -+ -+ if(src_of_curr_ls < (sizeof srcOfCurrLs/(sizeof srcOfCurrLs[0]))) -+ src = srcOfCurrLs[src_of_curr_ls]; -+ -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX-NAV-TIMELS: source_of_current_leapsecond=%u:%s curr_ls=%d\n", -+ src_of_curr_ls,src,curr_ls); -+ session->context->leap_seconds = curr_ls; -+ session->context->valid |= LEAP_SECOND_VALID; -+ } /* Valid current leap second */ -+ if(valid_time_to_ls_event) { -+ char *src="Unknown"; -+ unsigned int src_of_ls_change; -+ unsigned short dateOfLSGpsWn, dateOfLSGpsDn; -+ int lsChange = getsb(buf,11); -+ int timeToLsEvent = getles32(buf,12); -+int secondsperday=24*60*60; -+lsChange = 1; /* JAK Forward one second */ -+ src_of_ls_change = getub(buf,10); -+ if(src_of_ls_change < (sizeof srcOfLsChange/(sizeof srcOfLsChange[0]))) -+ src = srcOfLsChange[src_of_ls_change]; -+ dateOfLSGpsWn = getles16(buf,16); -+ dateOfLSGpsDn = getles16(buf,18); -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX_NAV_TIMELS: source_of_leapsecond_change=%u:%s " -+ "leapSecondChage=%d timeToLsEvent=%d\n", -+ src_of_ls_change,src,lsChange,timeToLsEvent); -+timeToLsEvent += 212*secondsperday; /* JAK Jul 31 Leap second for test */ -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX_NAV_TIMELS2: source_of_leapsecond_change=%u:%s " -+ "leapSecondChage=%d timeToLsEvent=%d\n", -+ src_of_ls_change,src,lsChange,timeToLsEvent); /* JAK */ -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX_NAV_TIMELS: dateOfLSGpsWn=%d dateOfLSGpsDn=%d\n", -+ dateOfLSGpsWn,dateOfLSGpsDn); -+ if(timeToLsEvent < 60*60*23 && timeToLsEvent > 0) { -+ if(lsChange == 0) -+ session->context->leap_notify = LEAP_NOWARNING; -+ else if (lsChange == 1) -+ session->context->leap_notify = LEAP_ADDSECOND; -+ else if (lsChange == -1) -+ session->context->leap_notify = LEAP_DELSECOND; -+ } else -+ session->context->leap_notify = LEAP_NOWARNING; -+ -+ if (session->context->leap_notify == LEAP_ADDSECOND) -+ gpsd_log(&session->context->errout,LOG_INF, -+ "UBX_NAV_TIMELS: Add leap second today\n"); -+ else if (session->context->leap_notify == LEAP_DELSECOND) -+ gpsd_log(&session->context->errout,LOG_INF, -+ "UBX_NAV_TIMELS: Remove leap second today\n"); -+ -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX_NAV_TIMELS: leaving: leap_notify=%d\n", -+ session->context->leap_notify); -+ } -+} -+#endif /* UBLOXTIMELS_ENABLE */ - /** - * Geodetic position solution message - */ -@@ -523,13 +636,22 @@ - case UBX_NAV_EKFSTATUS: - gpsd_log(&session->context->errout, LOG_DATA, "UBX_NAV_EKFSTATUS\n"); - break; -- -+ case UBX_NAV_TIMELS: -+ gpsd_log(&session->context->errout, LOG_DATA, "UBX_NAV_TIMELS\n"); -+#ifdef UBLOXTIMELS_ENABLE -+ ubx_msg_nav_timels(session, &buf[UBX_PREFIX_LEN],data_len); -+#endif // UBLOXTIMELS_ENABLE -+ break; - case UBX_RXM_RAW: - gpsd_log(&session->context->errout, LOG_DATA, "UBX_RXM_RAW\n"); - break; - case UBX_RXM_SFRB: -+ gpsd_log(&session->context->errout, LOG_DATA, "UBX_RXM_SFRB\n"); - mask = ubx_msg_sfrb(session, &buf[UBX_PREFIX_LEN]); - break; -+ case UBX_RXM_SFRBX: -+ gpsd_log(&session->context->errout, LOG_DATA, "UBX_RXM_SFRBX\n"); -+ break; - case UBX_RXM_SVSI: - gpsd_log(&session->context->errout, LOG_PROG, "UBX_RXM_SVSI\n"); - break; -@@ -955,6 +1077,12 @@ - msg[1] = 0x20; /* msg id = UBX_NAV_TIMEGPS */ - msg[2] = 0x01; /* rate */ - (void)ubx_write(session, 0x06u, 0x01, msg, 3); -+#ifdef UBLOXTIMELS_ENABLE -+ msg[0] = 0x01; /* class */ -+ msg[1] = 0x26; /* msg id = UBX_NAV_TIMELS */ -+ msg[2] = 0xff; /* rate */ -+#endif /* UBLOXTIMELS_ENABLE */ -+ (void)ubx_write(session, 0x06u, 0x01, msg, 3); - msg[0] = 0x01; /* class */ - msg[1] = 0x30; /* msg id = NAV-SVINFO */ - msg[2] = 0x0a; /* rate */ diff --git a/recipes-navigation/gpsd/gpsd-3.16/leap2017Aug31.readme.txt b/recipes-navigation/gpsd/gpsd-3.16/leap2017Aug31.readme.txt deleted file mode 100644 index d9bf4b1..0000000 --- a/recipes-navigation/gpsd/gpsd-3.16/leap2017Aug31.readme.txt +++ /dev/null @@ -1,169 +0,0 @@ -The purpose of this test is to verify leap second operation with ntp. This is done -by artificially setting the leap second offset in gpsd. ntp is not modified. -Software levels: - gpsd - 3.16-m2.9 + the Aug 31 test patch - ntp - 4.2.8p9-r0.mlinux3.0. Release candidate for mLinux 4.0 - -ntpd leap second test gpsd artificially causes a leap second on Aug 31, 2017 23:59:59 UTC. - -The patch for this test is leap2017Aug31.patch. This patch replaces 0006-ubxtimelps.patch. - - -Kernel Log: - -2017-07-31T18:50:02.012018-05:00 leaptest CROND[5205]: (root) CMD (/usr/sbin/logrotate /etc/logrotate.conf) -2017-07-31T18:55:01.119140-05:00 leaptest CROND[5223]: (root) CMD (/usr/sbin/logrotate /etc/logrotate.conf) -2017-07-31T18:59:59.016393-05:00 leaptest kernel: Clock: inserting leap second 23:59:60 UTC -2017-07-31T19:00:01.215873-05:00 leaptest CROND[5240]: (root) CMD (/usr/sbin/logrotate /etc/logrotate.conf) -2017-07-31T19:00:07.381218-05:00 leaptest ntpd[501]: kernel reports leap second has occurred -2017-07-31T19:00:07.381528-05:00 leaptest ntpd[501]: kernel reports leap second has occurred -2017-07-31T19:05:01.313170-05:00 leaptest CROND[5258]: (root) CMD (/usr/sbin/logrotate /etc/logrotate.conf) - - -Time log from user space. 18:59:59 repeats twice 19:00:00 appears only once.: - -2017-07-31T18:59:57.855895-05:00 leaptest CTST: epoch: 1501545597.855 boot: 442607.123 -2017-07-31T18:59:58.106318-05:00 leaptest CTST: epoch: 1501545598.106 boot: 442607.373 -2017-07-31T18:59:58.356758-05:00 leaptest CTST: epoch: 1501545598.356 boot: 442607.624 -2017-07-31T18:59:58.607171-05:00 leaptest CTST: epoch: 1501545598.606 boot: 442607.874 -2017-07-31T18:59:58.857621-05:00 leaptest CTST: epoch: 1501545598.857 boot: 442608.124 -2017-07-31T18:59:59.108072-05:00 leaptest CTST: epoch: 1501545599.107 boot: 442608.375 -2017-07-31T18:59:59.358506-05:00 leaptest CTST: epoch: 1501545599.358 boot: 442608.625 -2017-07-31T18:59:59.608952-05:00 leaptest CTST: epoch: 1501545599.608 boot: 442608.876 -2017-07-31T18:59:59.859364-05:00 leaptest CTST: epoch: 1501545599.859 boot: 442609.126 -2017-07-31T18:59:59.109780-05:00 leaptest CTST: epoch: 1501545599.109 boot: 442609.377 -2017-07-31T18:59:59.360195-05:00 leaptest CTST: epoch: 1501545599.359 boot: 442609.627 -2017-07-31T18:59:59.610608-05:00 leaptest CTST: epoch: 1501545599.610 boot: 442609.877 -2017-07-31T18:59:59.861023-05:00 leaptest CTST: epoch: 1501545599.860 boot: 442610.128 -2017-07-31T19:00:00.111461-05:00 leaptest CTST: epoch: 1501545600.111 boot: 442610.378 -2017-07-31T19:00:00.361916-05:00 leaptest CTST: epoch: 1501545600.361 boot: 442610.629 -2017-07-31T19:00:00.612329-05:00 leaptest CTST: epoch: 1501545600.612 boot: 442610.879 -2017-07-31T19:00:00.862825-05:00 leaptest CTST: epoch: 1501545600.862 boot: 442611.130 -2017-07-31T19:00:01.113251-05:00 leaptest CTST: epoch: 1501545601.112 boot: 442611.380 -2017-07-31T19:00:01.363695-05:00 leaptest CTST: epoch: 1501545601.363 boot: 442611.630 -2017-07-31T19:00:01.614114-05:00 leaptest CTST: epoch: 1501545601.613 boot: 442611.881 -2017-07-31T19:00:01.864524-05:00 leaptest CTST: epoch: 1501545601.864 boot: 442612.131 - - - -Leap second flag set artifically by gpsd, and noticed by ntp (leap=01 for SHM(0) and SHM(2) and leap_armed): -2017-07-31T18:59:22.952281-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T18:59:22.962756-05:00 leaptest ntpstatus.sh: ntpq -c lassoc -c mrv &1 &999 leap,srcadr,stratum -2017-07-31T18:59:22.964152-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T18:59:23.130829-05:00 leaptest ntpstatus.sh: ind assid status conf reach auth condition last_event cnt -2017-07-31T18:59:23.131062-05:00 leaptest ntpstatus.sh: =========================================================== -2017-07-31T18:59:23.131258-05:00 leaptest ntpstatus.sh: 1 18654 943a yes yes none candidate sys_peer 3 -2017-07-31T18:59:23.131451-05:00 leaptest ntpstatus.sh: 2 18655 9649 yes yes none sys.peer leap_armed 4 -2017-07-31T18:59:23.131647-05:00 leaptest ntpstatus.sh: 3 18656 8011 yes no none reject mobilize 1 -2017-07-31T18:59:23.131840-05:00 leaptest ntpstatus.sh: srcadr=SHM(0), leap=01, stratum=0 -2017-07-31T18:59:23.132031-05:00 leaptest ntpstatus.sh: srcadr=SHM(2), leap=01, stratum=0 -2017-07-31T18:59:23.132220-05:00 leaptest ntpstatus.sh: srcadr=LOCAL(0), leap=11, stratum=14 -2017-07-31T18:59:23.138000-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T18:59:23.138206-05:00 leaptest ntpstatus.sh: ntpq -p -2017-07-31T18:59:23.138404-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T18:59:23.434429-05:00 leaptest ntpstatus.sh: remote refid st t when poll reach delay offset jitter -2017-07-31T18:59:23.434666-05:00 leaptest ntpstatus.sh: ============================================================================== -2017-07-31T18:59:23.434863-05:00 leaptest ntpstatus.sh: +SHM(0) .GPS. 0 l 20 64 377 0.000 6.410 1.265 -2017-07-31T18:59:23.435055-05:00 leaptest ntpstatus.sh: *SHM(2) .PPS. 0 l 19 64 377 0.000 0.062 0.008 -2017-07-31T18:59:23.435249-05:00 leaptest ntpstatus.sh: LOCAL(0) .LOCL. 14 l - 32 0 0.000 0.000 0.000 -2017-07-31T19:00:22.459905-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:00:22.460141-05:00 leaptest ntpstatus.sh: ntpq -c lassoc -c mrv &1 &999 leap,srcadr,stratum - - - -2017-07-31T19:00:22.460343-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:00:22.618627-05:00 leaptest ntpstatus.sh: ind assid status conf reach auth condition last_event cnt -2017-07-31T19:00:22.618857-05:00 leaptest ntpstatus.sh: =========================================================== -2017-07-31T19:00:22.619057-05:00 leaptest ntpstatus.sh: 1 18654 943a yes yes none candidate sys_peer 3 -2017-07-31T19:00:22.619252-05:00 leaptest ntpstatus.sh: 2 18655 9649 yes yes none sys.peer leap_armed 4 -2017-07-31T19:00:22.619444-05:00 leaptest ntpstatus.sh: 3 18656 8011 yes no none reject mobilize 1 -2017-07-31T19:00:22.619634-05:00 leaptest ntpstatus.sh: srcadr=SHM(0), leap=01, stratum=0 -2017-07-31T19:00:22.619824-05:00 leaptest ntpstatus.sh: srcadr=SHM(2), leap=01, stratum=0 -2017-07-31T19:00:22.620016-05:00 leaptest ntpstatus.sh: srcadr=LOCAL(0), leap=11, stratum=14 -2017-07-31T19:00:22.628414-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:00:22.628654-05:00 leaptest ntpstatus.sh: ntpq -p -2017-07-31T19:00:22.628868-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:00:22.922779-05:00 leaptest ntpstatus.sh: remote refid st t when poll reach delay offset jitter -2017-07-31T19:00:22.924191-05:00 leaptest ntpstatus.sh: ============================================================================== -2017-07-31T19:00:22.925595-05:00 leaptest ntpstatus.sh: +SHM(0) .GPS. 0 l 16 64 377 0.000 7.369 0.661 -2017-07-31T19:00:22.927000-05:00 leaptest ntpstatus.sh: *SHM(2) .PPS. 0 l 15 64 377 0.000 0.059 0.008 -2017-07-31T19:00:22.928402-05:00 leaptest ntpstatus.sh: LOCAL(0) .LOCL. 14 l - 32 0 0.000 0.000 0.000 -2017-07-31T19:01:22.942937-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:01:22.943171-05:00 leaptest ntpstatus.sh: ntpq -c lassoc -c mrv &1 &999 leap,srcadr,stratum -2017-07-31T19:01:22.943371-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:01:23.118319-05:00 leaptest ntpstatus.sh: ind assid status conf reach auth condition last_event cnt -2017-07-31T19:01:23.118551-05:00 leaptest ntpstatus.sh: =========================================================== -2017-07-31T19:01:23.118750-05:00 leaptest ntpstatus.sh: 1 18654 943a yes yes none candidate sys_peer 3 -2017-07-31T19:01:23.118943-05:00 leaptest ntpstatus.sh: 2 18655 9649 yes yes none sys.peer leap_armed 4 -2017-07-31T19:01:23.119137-05:00 leaptest ntpstatus.sh: 3 18656 8011 yes no none reject mobilize 1 -2017-07-31T19:01:23.119330-05:00 leaptest ntpstatus.sh: srcadr=SHM(0), leap=01, stratum=0 -2017-07-31T19:01:23.119520-05:00 leaptest ntpstatus.sh: srcadr=SHM(2), leap=01, stratum=0 -2017-07-31T19:01:23.119710-05:00 leaptest ntpstatus.sh: srcadr=LOCAL(0), leap=11, stratum=14 -2017-07-31T19:01:23.128565-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:01:23.128809-05:00 leaptest ntpstatus.sh: ntpq -p -2017-07-31T19:01:23.129026-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:01:23.417707-05:00 leaptest ntpstatus.sh: remote refid st t when poll reach delay offset jitter -2017-07-31T19:01:23.417942-05:00 leaptest ntpstatus.sh: ============================================================================== -2017-07-31T19:01:23.418140-05:00 leaptest ntpstatus.sh: +SHM(0) .GPS. 0 l 13 64 377 0.000 1007.48 1000.36 -2017-07-31T19:01:23.418337-05:00 leaptest ntpstatus.sh: *SHM(2) .PPS. 0 l 12 64 377 0.000 1000.05 999.994 -2017-07-31T19:01:23.418529-05:00 leaptest ntpstatus.sh: LOCAL(0) .LOCL. 14 l - 32 0 0.000 0.000 0.000 -2017-07-31T19:02:23.442898-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:02:23.443131-05:00 leaptest ntpstatus.sh: ntpq -c lassoc -c mrv &1 &999 leap,srcadr,stratum -2017-07-31T19:02:23.443332-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:02:23.617413-05:00 leaptest ntpstatus.sh: ind assid status conf reach auth condition last_event cnt - - -Offset goes to one second, because there was no leap second: -2017-07-31T19:00:22.618857-05:00 leaptest ntpstatus.sh: =========================================================== -2017-07-31T19:00:22.619057-05:00 leaptest ntpstatus.sh: 1 18654 943a yes yes none candidate sys_peer 3 -2017-07-31T19:00:22.619252-05:00 leaptest ntpstatus.sh: 2 18655 9649 yes yes none sys.peer leap_armed 4 -2017-07-31T19:00:22.619444-05:00 leaptest ntpstatus.sh: 3 18656 8011 yes no none reject mobilize 1 -2017-07-31T19:00:22.619634-05:00 leaptest ntpstatus.sh: srcadr=SHM(0), leap=01, stratum=0 -2017-07-31T19:00:22.619824-05:00 leaptest ntpstatus.sh: srcadr=SHM(2), leap=01, stratum=0 -2017-07-31T19:00:22.620016-05:00 leaptest ntpstatus.sh: srcadr=LOCAL(0), leap=11, stratum=14 -2017-07-31T19:00:22.628414-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:00:22.628654-05:00 leaptest ntpstatus.sh: ntpq -p -2017-07-31T19:00:22.628868-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:00:22.922779-05:00 leaptest ntpstatus.sh: remote refid st t when poll reach delay offset jitter -2017-07-31T19:00:22.924191-05:00 leaptest ntpstatus.sh: ============================================================================== -2017-07-31T19:00:22.925595-05:00 leaptest ntpstatus.sh: +SHM(0) .GPS. 0 l 16 64 377 0.000 7.369 0.661 -2017-07-31T19:00:22.927000-05:00 leaptest ntpstatus.sh: *SHM(2) .PPS. 0 l 15 64 377 0.000 0.059 0.008 -2017-07-31T19:00:22.928402-05:00 leaptest ntpstatus.sh: LOCAL(0) .LOCL. 14 l - 32 0 0.000 0.000 0.000 -2017-07-31T19:01:22.942937-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:01:22.943171-05:00 leaptest ntpstatus.sh: ntpq -c lassoc -c mrv &1 &999 leap,srcadr,stratum -2017-07-31T19:01:22.943371-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:01:23.118319-05:00 leaptest ntpstatus.sh: ind assid status conf reach auth condition last_event cnt -2017-07-31T19:01:23.118551-05:00 leaptest ntpstatus.sh: =========================================================== -2017-07-31T19:01:23.118750-05:00 leaptest ntpstatus.sh: 1 18654 943a yes yes none candidate sys_peer 3 -2017-07-31T19:01:23.118943-05:00 leaptest ntpstatus.sh: 2 18655 9649 yes yes none sys.peer leap_armed 4 -2017-07-31T19:01:23.119137-05:00 leaptest ntpstatus.sh: 3 18656 8011 yes no none reject mobilize 1 -2017-07-31T19:01:23.119330-05:00 leaptest ntpstatus.sh: srcadr=SHM(0), leap=01, stratum=0 -2017-07-31T19:01:23.119520-05:00 leaptest ntpstatus.sh: srcadr=SHM(2), leap=01, stratum=0 -2017-07-31T19:01:23.119710-05:00 leaptest ntpstatus.sh: srcadr=LOCAL(0), leap=11, stratum=14 -2017-07-31T19:01:23.128565-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:01:23.128809-05:00 leaptest ntpstatus.sh: ntpq -p -2017-07-31T19:01:23.129026-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:01:23.417707-05:00 leaptest ntpstatus.sh: remote refid st t when poll reach delay offset jitter -2017-07-31T19:01:23.417942-05:00 leaptest ntpstatus.sh: ============================================================================== -2017-07-31T19:01:23.418140-05:00 leaptest ntpstatus.sh: +SHM(0) .GPS. 0 l 13 64 377 0.000 1007.48 1000.36 -2017-07-31T19:01:23.418337-05:00 leaptest ntpstatus.sh: *SHM(2) .PPS. 0 l 12 64 377 0.000 1000.05 999.994 -2017-07-31T19:01:23.418529-05:00 leaptest ntpstatus.sh: LOCAL(0) .LOCL. 14 l - 32 0 0.000 0.000 0.000 -2017-07-31T19:02:23.442898-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:02:23.443131-05:00 leaptest ntpstatus.sh: ntpq -c lassoc -c mrv &1 &999 leap,srcadr,stratum -2017-07-31T19:02:23.443332-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:02:23.617413-05:00 leaptest ntpstatus.sh: ind assid status conf reach auth condition last_event cnt - - -Leap second flag is clear, leap_armed is removed so no leap second on Aug 1, 2017: -2017-07-31T19:38:42.630432-05:00 leaptest ntpstatus.sh: ntpq -c lassoc -c mrv &1 &999 leap,srcadr,stratum -2017-07-31T19:38:42.630636-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:38:42.791369-05:00 leaptest ntpstatus.sh: ind assid status conf reach auth condition last_event cnt -2017-07-31T19:38:42.791605-05:00 leaptest ntpstatus.sh: =========================================================== -2017-07-31T19:38:42.791803-05:00 leaptest ntpstatus.sh: 1 18654 945a yes yes none candidate sys_peer 5 -2017-07-31T19:38:42.791994-05:00 leaptest ntpstatus.sh: 2 18655 966a yes yes none sys.peer sys_peer 6 -2017-07-31T19:38:42.792189-05:00 leaptest ntpstatus.sh: 3 18656 8033 yes no none reject unreachable 3 -2017-07-31T19:38:42.792379-05:00 leaptest ntpstatus.sh: srcadr=SHM(0), leap=00, stratum=0 -2017-07-31T19:38:42.802875-05:00 leaptest ntpstatus.sh: srcadr=SHM(2), leap=00, stratum=0 -2017-07-31T19:38:42.804254-05:00 leaptest ntpstatus.sh: srcadr=LOCAL(0), leap=00, stratum=14 - - diff --git a/recipes-navigation/gpsd/gpsd-3.18.1/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch b/recipes-navigation/gpsd/gpsd-3.18.1/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch deleted file mode 100644 index a1e71cf..0000000 --- a/recipes-navigation/gpsd/gpsd-3.18.1/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 1e2cea8945bc2183fbe1a012dcd633a352125952 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -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 -Signed-off-by: Peter A. Bigot ---- - SConstruct | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff -Naru gpsd-3.18.1.orig/SConstruct gpsd-3.18.1/SConstruct ---- gpsd-3.18.1.orig/SConstruct 2018-10-26 15:31:33.890410700 -0500 -+++ gpsd-3.18.1/SConstruct 2018-10-26 17:25:45.202207869 -0500 -@@ -980,7 +980,7 @@ - - # 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'] -@@ -1034,8 +1034,8 @@ - # follow FHS, put in /usr/local/libXX, not /usr/libXX - # may be lib, lib32 or lib64 - python_libdir = polystr(python_libdir) -- python_libdir = python_libdir.replace("/usr/lib", -- "/usr/local/lib") -+# python_libdir = python_libdir.replace("/usr/lib", -+# "/usr/local/lib") - - py_config_text = config.GetPythonValue('config vars', - PYTHON_SYSCONFIG_IMPORT, -@@ -1506,7 +1506,7 @@ - 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']) -@@ -1808,12 +1808,15 @@ - env.AddPostAction(binaryinstall, '$STRIP $TARGET') - - if env['python']: -+ python_libdir = python_libdir.replace(env['sysroot'], '') - python_module_dir = str(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_libdir, )) - - python_modules_install = python_env.Install(DESTDIR + python_module_dir, - python_modules) diff --git a/recipes-navigation/gpsd/gpsd-3.18.1/0001-include-sys-ttydefaults.h.patch b/recipes-navigation/gpsd/gpsd-3.18.1/0001-include-sys-ttydefaults.h.patch deleted file mode 100644 index e91e4e9..0000000 --- a/recipes-navigation/gpsd/gpsd-3.18.1/0001-include-sys-ttydefaults.h.patch +++ /dev/null @@ -1,35 +0,0 @@ -From f221fa959c80b43c65426500a6836a1b5cf6fe0c Mon Sep 17 00:00:00 2001 -From: Khem Raj -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 - -Foreward port to gpsd 3.16 -Signed-off-by: Max Krummenacher ---- - gpsmon.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/gpsmon.c b/gpsmon.c -index 89c43ee2..5cc0dabd 100644 ---- a/gpsmon.c -+++ b/gpsmon.c -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - #include - #include - --- -2.12.0 - diff --git a/recipes-navigation/gpsd/gpsd-3.18.1/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch b/recipes-navigation/gpsd/gpsd-3.18.1/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch deleted file mode 100644 index ad690ce..0000000 --- a/recipes-navigation/gpsd/gpsd-3.18.1/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 697e2e9ff97487266d817cdd41bacc83f681e3d7 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -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 -Signed-off-by: Peter A. Bigot ---- - SConstruct | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff -Naru gpsd-3.18.1.orig/SConstruct gpsd-3.18.1/SConstruct ---- gpsd-3.18.1.orig/SConstruct 2018-10-26 18:17:17.102116334 -0500 -+++ gpsd-3.18.1/SConstruct 2018-10-26 18:18:40.102113877 -0500 -@@ -935,11 +935,11 @@ - - manbuilder = htmlbuilder = None - if env['manbuild']: -- if config.CheckXsltproc(): -+ if False and config.CheckXsltproc(): - build = "xsltproc --nonet %s $SOURCE >$TARGET" - htmlbuilder = build % docbook_html_uri - manbuilder = build % docbook_man_uri -- elif WhereIs("xmlto"): -+ elif False and WhereIs("xmlto"): - xmlto = "xmlto %s $SOURCE || mv `basename $TARGET` " \ - "`dirname $TARGET`" - htmlbuilder = xmlto % "html-nochunks" diff --git a/recipes-navigation/gpsd/gpsd-3.18.1/0006-itu_r_tf_460_6.patch b/recipes-navigation/gpsd/gpsd-3.18.1/0006-itu_r_tf_460_6.patch deleted file mode 100644 index 8e8d814..0000000 --- a/recipes-navigation/gpsd/gpsd-3.18.1/0006-itu_r_tf_460_6.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur old/ntpshmwrite.c new/ntpshmwrite.c ---- old/ntpshmwrite.c 2017-01-23 10:00:05.497129473 -0600 -+++ new/ntpshmwrite.c 2017-01-23 09:47:58.881627772 -0600 -@@ -32,11 +32,18 @@ - * NTP expects leap pending for only 1 month prior to insertion - * Per http://bugs.ntp.org/1090 */ - (void)gmtime_r( &(td->real.tv_sec), &tm); -+/* This code contradicts page 3 section 2.1 of ITU-R RV.460-6 that -+ * leap second may occur at the last second of a month, with -+ * preference for December and June, 2nd preference to March and -+ * September. -+ * https://www.itu.int/dms_pubrec/itu-r/rec/tf/R-REC-TF.460-6-200202-I!!PDF-E.pdf -+ */ -+#ifdef NOTITU_R_TF_460_6 - if ( 5 != tm.tm_mon && 11 != tm.tm_mon ) { - /* Not june, not December, no way */ - leap_notify = LEAP_NOWARNING; - } -- -+#endif /* NOTITU_R_TF_460_6 */ - /* we use the shmTime mode 1 protocol - * - * ntpd does this: diff --git a/recipes-navigation/gpsd/gpsd-3.18.1/0006-ubxtimelps.patch b/recipes-navigation/gpsd/gpsd-3.18.1/0006-ubxtimelps.patch deleted file mode 100644 index 030001c..0000000 --- a/recipes-navigation/gpsd/gpsd-3.18.1/0006-ubxtimelps.patch +++ /dev/null @@ -1,192 +0,0 @@ -diff -Naru gpsd-3.18.1.orig/driver_ubx.c gpsd-3.18.1/driver_ubx.c ---- gpsd-3.18.1.orig/driver_ubx.c 2018-10-26 16:01:08.010358178 -0500 -+++ gpsd-3.18.1/driver_ubx.c 2018-10-29 17:30:18.354526227 -0500 -@@ -57,6 +57,29 @@ - #define UBX_CFG_LEN 20 - #define outProtoMask 14 - -+#ifdef UBLOXTIMELS_ENABLE -+/* UBX-NAV-TIMELS support */ -+static char *srcOfCurrLs[] = { -+ "firmware", -+ "GPS GLONASS difference", -+ "GPS", -+ "SBAS", -+ "BeiDou", -+ "Galileo", -+ "Aided data", -+ "Configured" -+}; -+static char *srcOfLsChange[] = { -+ "No Source", -+ "Undefined", -+ "GPS", -+ "SBAS", -+ "BeiDou", -+ "Galileo", -+ "GLONOSS", -+}; -+#endif /* UBLOXTIMELS_ENABLE */ -+ - static gps_mask_t ubx_parse(struct gps_device_t *session, unsigned char *buf, - size_t len); - static gps_mask_t ubx_msg_nav_eoe(struct gps_device_t *session, -@@ -397,6 +420,90 @@ - return mask; - } - -+#ifdef UBLOXTIMELS_ENABLE -+/** -+ * Navigation time to leap second -+ * -+ * Sets leap_notify if leap second is < 23 hours away. -+ */ -+static void -+ubx_msg_nav_timels(struct gps_device_t *session, unsigned char *buf, -+ size_t data_len) -+{ -+ int version; -+ unsigned int flags; -+ int valid_curr_ls; -+ int valid_time_to_ls_event; -+ -+ if (data_len != 24) { -+ gpsd_log(&session->context->errout, LOG_WARN, -+ "UBX-NAV-TIMELS: unexpected length %d, expecting 24\n", -+ data_len); -+ return; -+ } -+ version = getsb(buf,4); -+ /* Only version 0 is defined so far. */ -+ flags = (unsigned int)getub(buf, 23); -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX-NAV-TIMELS: flags 0x%x message version %d\n",flags, version); -+ valid_curr_ls = flags & UBX_TIMELS_VALID_CURR_LS; -+ valid_time_to_ls_event = flags & UBX_TIMELS_VALID_TIME_LS_EVT; -+ if(valid_curr_ls) { -+ unsigned int src_of_curr_ls = getub(buf,8); -+ int curr_ls = getsb(buf,9); -+ char *src = "Unknown"; -+ -+ if(src_of_curr_ls < (sizeof srcOfCurrLs/(sizeof srcOfCurrLs[0]))) -+ src = srcOfCurrLs[src_of_curr_ls]; -+ -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX-NAV-TIMELS: source_of_current_leapsecond=%u:%s curr_ls=%d\n", -+ src_of_curr_ls,src,curr_ls); -+ session->context->leap_seconds = curr_ls; -+ session->context->valid |= LEAP_SECOND_VALID; -+ } /* Valid current leap second */ -+ if(valid_time_to_ls_event) { -+ char *src="Unknown"; -+ unsigned int src_of_ls_change; -+ unsigned short dateOfLSGpsWn, dateOfLSGpsDn; -+ int lsChange = getsb(buf,11); -+ int timeToLsEvent = getles32(buf,12); -+ src_of_ls_change = getub(buf,10); -+ if(src_of_ls_change < (sizeof srcOfLsChange/(sizeof srcOfLsChange[0]))) -+ src = srcOfLsChange[src_of_ls_change]; -+ dateOfLSGpsWn = getles16(buf,16); -+ dateOfLSGpsDn = getles16(buf,18); -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX_NAV_TIMELS: source_of_leapsecond_change=%u:%s " -+ "leapSecondChage=%d timeToLsEvent=%d\n", -+ src_of_ls_change,src,lsChange,timeToLsEvent); -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX_NAV_TIMELS: dateOfLSGpsWn=%d dateOfLSGpsDn=%d\n", -+ dateOfLSGpsWn,dateOfLSGpsDn); -+ if(timeToLsEvent < 60*60*23 && timeToLsEvent > 0) { -+ if(lsChange == 0) -+ session->context->leap_notify = LEAP_NOWARNING; -+ else if (lsChange == 1) -+ session->context->leap_notify = LEAP_ADDSECOND; -+ else if (lsChange == -1) -+ session->context->leap_notify = LEAP_DELSECOND; -+ } else -+ session->context->leap_notify = LEAP_NOWARNING; -+ -+ if (session->context->leap_notify == LEAP_ADDSECOND) -+ gpsd_log(&session->context->errout,LOG_INF, -+ "UBX_NAV_TIMELS: Add leap second today\n"); -+ else if (session->context->leap_notify == LEAP_DELSECOND) -+ gpsd_log(&session->context->errout,LOG_INF, -+ "UBX_NAV_TIMELS: Remove leap second today\n"); -+ -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX_NAV_TIMELS: leaving: leap_notify=%d\n", -+ session->context->leap_notify); -+ } -+} -+#endif /* UBLOXTIMELS_ENABLE */ -+ - /** - * Geodetic position solution message - */ -@@ -1129,6 +1236,9 @@ - break; - case UBX_NAV_TIMELS: - gpsd_log(&session->context->errout, LOG_DATA, "UBX_NAV_TIMELS\n"); -+#ifdef UBLOXTIMELS_ENABLE -+ ubx_msg_nav_timels(session, &buf[UBX_PREFIX_LEN],data_len); -+#endif // UBLOXTIMELS_ENABLE - break; - case UBX_NAV_TIMEUTC: - gpsd_log(&session->context->errout, LOG_DATA, "UBX_NAV_TIMEUTC\n"); -@@ -1172,6 +1282,7 @@ - gpsd_log(&session->context->errout, LOG_DATA, "UBX_RXM_RTCM\n"); - break; - case UBX_RXM_SFRB: -+ gpsd_log(&session->context->errout, LOG_DATA, "UBX_RXM_SFRB\n"); - mask = ubx_rxm_sfrb(session, &buf[UBX_PREFIX_LEN]); - break; - case UBX_RXM_SFRBX: -@@ -1474,6 +1585,12 @@ - msg[1] = 0x20; /* msg id = UBX_NAV_TIMEGPS */ - msg[2] = 0x00; /* rate */ - (void)ubx_write(session, 0x06u, 0x01, msg, 3); -+#ifdef UBLOXTIMELS_ENABLE -+ msg[0] = 0x01; /* class */ -+ msg[1] = 0x26; /* msg id = UBX_NAV_TIMELS */ -+ msg[2] = 0xff; /* rate */ -+#endif /* UBLOXTIMELS_ENABLE */ -+ (void)ubx_write(session, 0x06u, 0x01, msg, 3); - msg[0] = 0x01; /* class */ - msg[1] = 0x30; /* msg id = NAV-SVINFO */ - msg[2] = 0x00; /* rate */ -@@ -1558,6 +1675,12 @@ - msg[1] = 0x20; /* msg id = UBX_NAV_TIMEGPS */ - msg[2] = 0x01; /* rate */ - (void)ubx_write(session, 0x06u, 0x01, msg, 3); -+#ifdef UBLOXTIMELS_ENABLE -+ msg[0] = 0x01; /* class */ -+ msg[1] = 0x26; /* msg id = UBX_NAV_TIMELS */ -+ msg[2] = 0xff; /* rate */ -+ (void)ubx_write(session, 0x06u, 0x01, msg, 3); -+#endif /* UBLOXTIMELS_ENABLE */ - msg[0] = 0x01; /* class */ - msg[1] = 0x30; /* msg id = NAV-SVINFO */ - msg[2] = 0x0a; /* rate */ -diff -Naru gpsd-3.18.1.orig/driver_ubx.h gpsd-3.18.1/driver_ubx.h ---- gpsd-3.18.1.orig/driver_ubx.h 2018-10-26 16:01:08.010358178 -0500 -+++ gpsd-3.18.1/driver_ubx.h 2018-10-26 16:26:09.114313738 -0500 -@@ -210,6 +210,9 @@ - #define UBX_SOL_VALID_WEEK 0x04 - #define UBX_SOL_VALID_TIME 0x08 - -+#define UBX_TIMELS_VALID_CURR_LS 0x01 -+#define UBX_TIMELS_VALID_TIME_LS_EVT 0x01 -+ - #define UBX_TIMEGPS_VALID_TIME 0x01 - #define UBX_TIMEGPS_VALID_WEEK 0x02 - #define UBX_TIMEGPS_VALID_LEAP_SECOND 0x04 -diff -Naru gpsd-3.18.1.orig/SConstruct gpsd-3.18.1/SConstruct ---- gpsd-3.18.1.orig/SConstruct 2018-10-26 15:53:30.174371732 -0500 -+++ gpsd-3.18.1/SConstruct 2018-10-26 15:55:33.726368074 -0500 -@@ -178,6 +178,7 @@ - ("tripmate", True, "DeLorme TripMate support"), - ("tsip", True, "Trimble TSIP support"), - ("ublox", True, "u-blox Protocol support"), -+ ("ubloxtimels", False, "u-blox UBX-NAV-TIMELS support (leap second)"), - # Non-GPS protocols - ("aivdm", True, "AIVDM support"), - ("gpsclock", True, "GPSClock support"), diff --git a/recipes-navigation/gpsd/gpsd-3.18.1/leap2017Aug31.patch b/recipes-navigation/gpsd/gpsd-3.18.1/leap2017Aug31.patch deleted file mode 100644 index 658b757..0000000 --- a/recipes-navigation/gpsd/gpsd-3.18.1/leap2017Aug31.patch +++ /dev/null @@ -1,167 +0,0 @@ -diff -Naur old/driver_ubx.c new/driver_ubx.c ---- old/driver_ubx.c 2017-08-01 10:56:05.757282801 -0500 -+++ new/driver_ubx.c 2017-08-01 10:53:49.785286827 -0500 -@@ -57,6 +57,29 @@ - #define UBX_CFG_LEN 20 - #define outProtoMask 14 - -+#ifdef UBLOXTIMELS_ENABLE -+/* UBX-NAV-TIMELS support */ -+static char *srcOfCurrLs[] = { -+ "firmware", -+ "GPS GLONASS difference", -+ "GPS", -+ "SBAS", -+ "BeiDou", -+ "Galileo", -+ "Aided data", -+ "Configured" -+}; -+static char *srcOfLsChange[] = { -+ "No Source", -+ "Undefined", -+ "GPS", -+ "SBAS", -+ "BeiDou", -+ "Galileo", -+ "GLONOSS", -+}; -+#endif /* UBLOXTIMELS_ENABLE */ -+ - static gps_mask_t ubx_parse(struct gps_device_t *session, unsigned char *buf, - size_t len); - static gps_mask_t ubx_msg_nav_dop(struct gps_device_t *session, -@@ -237,6 +260,96 @@ - return mask; - } - -+#ifdef UBLOXTIMELS_ENABLE -+/** -+ * Navigation time to leap second -+ * -+ * Sets leap_notify if leap second is < 23 hours away. -+ */ -+static void -+ubx_msg_nav_timels(struct gps_device_t *session, unsigned char *buf, -+ size_t data_len) -+{ -+ int version; -+ unsigned int flags; -+ int valid_curr_ls; -+ int valid_time_to_ls_event; -+ -+ if (data_len != 24) { -+ gpsd_log(&session->context->errout, LOG_WARN, -+ "UBX-NAV-TIMELS: unexpected length %d, expecting 24\n", -+ data_len); -+ return; -+ } -+ version = getsb(buf,4); -+ /* Only version 0 is defined so far. */ -+ flags = (unsigned int)getub(buf, 23); -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX-NAV-TIMELS: flags 0x%x message version %d\n",flags, version); -+ valid_curr_ls = flags & UBX_TIMELS_VALID_CURR_LS; -+ valid_time_to_ls_event = flags & UBX_TIMELS_VALID_TIME_LS_EVT; -+ if(valid_curr_ls) { -+ unsigned int src_of_curr_ls = getub(buf,8); -+ int curr_ls = getsb(buf,9); -+ char *src = "Unknown"; -+ -+ if(src_of_curr_ls < (sizeof srcOfCurrLs/(sizeof srcOfCurrLs[0]))) -+ src = srcOfCurrLs[src_of_curr_ls]; -+ -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX-NAV-TIMELS: source_of_current_leapsecond=%u:%s curr_ls=%d\n", -+ src_of_curr_ls,src,curr_ls); -+ session->context->leap_seconds = curr_ls; -+ session->context->valid |= LEAP_SECOND_VALID; -+ } /* Valid current leap second */ -+ if(valid_time_to_ls_event) { -+ char *src="Unknown"; -+ unsigned int src_of_ls_change; -+ unsigned short dateOfLSGpsWn, dateOfLSGpsDn; -+ int lsChange = getsb(buf,11); -+ int timeToLsEvent = getles32(buf,12); -+int secondsperday=24*60*60; -+lsChange = 1; /* JAK Forward one second */ -+ src_of_ls_change = getub(buf,10); -+ if(src_of_ls_change < (sizeof srcOfLsChange/(sizeof srcOfLsChange[0]))) -+ src = srcOfLsChange[src_of_ls_change]; -+ dateOfLSGpsWn = getles16(buf,16); -+ dateOfLSGpsDn = getles16(buf,18); -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX_NAV_TIMELS: source_of_leapsecond_change=%u:%s " -+ "leapSecondChage=%d timeToLsEvent=%d\n", -+ src_of_ls_change,src,lsChange,timeToLsEvent); -+timeToLsEvent += 212*secondsperday; /* JAK Jul 31 Leap second for test */ -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX_NAV_TIMELS2: source_of_leapsecond_change=%u:%s " -+ "leapSecondChage=%d timeToLsEvent=%d\n", -+ src_of_ls_change,src,lsChange,timeToLsEvent); /* JAK */ -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX_NAV_TIMELS: dateOfLSGpsWn=%d dateOfLSGpsDn=%d\n", -+ dateOfLSGpsWn,dateOfLSGpsDn); -+ if(timeToLsEvent < 60*60*23 && timeToLsEvent > 0) { -+ if(lsChange == 0) -+ session->context->leap_notify = LEAP_NOWARNING; -+ else if (lsChange == 1) -+ session->context->leap_notify = LEAP_ADDSECOND; -+ else if (lsChange == -1) -+ session->context->leap_notify = LEAP_DELSECOND; -+ } else -+ session->context->leap_notify = LEAP_NOWARNING; -+ -+ if (session->context->leap_notify == LEAP_ADDSECOND) -+ gpsd_log(&session->context->errout,LOG_INF, -+ "UBX_NAV_TIMELS: Add leap second today\n"); -+ else if (session->context->leap_notify == LEAP_DELSECOND) -+ gpsd_log(&session->context->errout,LOG_INF, -+ "UBX_NAV_TIMELS: Remove leap second today\n"); -+ -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX_NAV_TIMELS: leaving: leap_notify=%d\n", -+ session->context->leap_notify); -+ } -+} -+#endif /* UBLOXTIMELS_ENABLE */ - /** - * Geodetic position solution message - */ -@@ -523,13 +636,22 @@ - case UBX_NAV_EKFSTATUS: - gpsd_log(&session->context->errout, LOG_DATA, "UBX_NAV_EKFSTATUS\n"); - break; -- -+ case UBX_NAV_TIMELS: -+ gpsd_log(&session->context->errout, LOG_DATA, "UBX_NAV_TIMELS\n"); -+#ifdef UBLOXTIMELS_ENABLE -+ ubx_msg_nav_timels(session, &buf[UBX_PREFIX_LEN],data_len); -+#endif // UBLOXTIMELS_ENABLE -+ break; - case UBX_RXM_RAW: - gpsd_log(&session->context->errout, LOG_DATA, "UBX_RXM_RAW\n"); - break; - case UBX_RXM_SFRB: -+ gpsd_log(&session->context->errout, LOG_DATA, "UBX_RXM_SFRB\n"); - mask = ubx_msg_sfrb(session, &buf[UBX_PREFIX_LEN]); - break; -+ case UBX_RXM_SFRBX: -+ gpsd_log(&session->context->errout, LOG_DATA, "UBX_RXM_SFRBX\n"); -+ break; - case UBX_RXM_SVSI: - gpsd_log(&session->context->errout, LOG_PROG, "UBX_RXM_SVSI\n"); - break; -@@ -955,6 +1077,12 @@ - msg[1] = 0x20; /* msg id = UBX_NAV_TIMEGPS */ - msg[2] = 0x01; /* rate */ - (void)ubx_write(session, 0x06u, 0x01, msg, 3); -+#ifdef UBLOXTIMELS_ENABLE -+ msg[0] = 0x01; /* class */ -+ msg[1] = 0x26; /* msg id = UBX_NAV_TIMELS */ -+ msg[2] = 0xff; /* rate */ -+#endif /* UBLOXTIMELS_ENABLE */ -+ (void)ubx_write(session, 0x06u, 0x01, msg, 3); - msg[0] = 0x01; /* class */ - msg[1] = 0x30; /* msg id = NAV-SVINFO */ - msg[2] = 0x0a; /* rate */ diff --git a/recipes-navigation/gpsd/gpsd-3.18.1/leap2017Aug31.readme.txt b/recipes-navigation/gpsd/gpsd-3.18.1/leap2017Aug31.readme.txt deleted file mode 100644 index d9bf4b1..0000000 --- a/recipes-navigation/gpsd/gpsd-3.18.1/leap2017Aug31.readme.txt +++ /dev/null @@ -1,169 +0,0 @@ -The purpose of this test is to verify leap second operation with ntp. This is done -by artificially setting the leap second offset in gpsd. ntp is not modified. -Software levels: - gpsd - 3.16-m2.9 + the Aug 31 test patch - ntp - 4.2.8p9-r0.mlinux3.0. Release candidate for mLinux 4.0 - -ntpd leap second test gpsd artificially causes a leap second on Aug 31, 2017 23:59:59 UTC. - -The patch for this test is leap2017Aug31.patch. This patch replaces 0006-ubxtimelps.patch. - - -Kernel Log: - -2017-07-31T18:50:02.012018-05:00 leaptest CROND[5205]: (root) CMD (/usr/sbin/logrotate /etc/logrotate.conf) -2017-07-31T18:55:01.119140-05:00 leaptest CROND[5223]: (root) CMD (/usr/sbin/logrotate /etc/logrotate.conf) -2017-07-31T18:59:59.016393-05:00 leaptest kernel: Clock: inserting leap second 23:59:60 UTC -2017-07-31T19:00:01.215873-05:00 leaptest CROND[5240]: (root) CMD (/usr/sbin/logrotate /etc/logrotate.conf) -2017-07-31T19:00:07.381218-05:00 leaptest ntpd[501]: kernel reports leap second has occurred -2017-07-31T19:00:07.381528-05:00 leaptest ntpd[501]: kernel reports leap second has occurred -2017-07-31T19:05:01.313170-05:00 leaptest CROND[5258]: (root) CMD (/usr/sbin/logrotate /etc/logrotate.conf) - - -Time log from user space. 18:59:59 repeats twice 19:00:00 appears only once.: - -2017-07-31T18:59:57.855895-05:00 leaptest CTST: epoch: 1501545597.855 boot: 442607.123 -2017-07-31T18:59:58.106318-05:00 leaptest CTST: epoch: 1501545598.106 boot: 442607.373 -2017-07-31T18:59:58.356758-05:00 leaptest CTST: epoch: 1501545598.356 boot: 442607.624 -2017-07-31T18:59:58.607171-05:00 leaptest CTST: epoch: 1501545598.606 boot: 442607.874 -2017-07-31T18:59:58.857621-05:00 leaptest CTST: epoch: 1501545598.857 boot: 442608.124 -2017-07-31T18:59:59.108072-05:00 leaptest CTST: epoch: 1501545599.107 boot: 442608.375 -2017-07-31T18:59:59.358506-05:00 leaptest CTST: epoch: 1501545599.358 boot: 442608.625 -2017-07-31T18:59:59.608952-05:00 leaptest CTST: epoch: 1501545599.608 boot: 442608.876 -2017-07-31T18:59:59.859364-05:00 leaptest CTST: epoch: 1501545599.859 boot: 442609.126 -2017-07-31T18:59:59.109780-05:00 leaptest CTST: epoch: 1501545599.109 boot: 442609.377 -2017-07-31T18:59:59.360195-05:00 leaptest CTST: epoch: 1501545599.359 boot: 442609.627 -2017-07-31T18:59:59.610608-05:00 leaptest CTST: epoch: 1501545599.610 boot: 442609.877 -2017-07-31T18:59:59.861023-05:00 leaptest CTST: epoch: 1501545599.860 boot: 442610.128 -2017-07-31T19:00:00.111461-05:00 leaptest CTST: epoch: 1501545600.111 boot: 442610.378 -2017-07-31T19:00:00.361916-05:00 leaptest CTST: epoch: 1501545600.361 boot: 442610.629 -2017-07-31T19:00:00.612329-05:00 leaptest CTST: epoch: 1501545600.612 boot: 442610.879 -2017-07-31T19:00:00.862825-05:00 leaptest CTST: epoch: 1501545600.862 boot: 442611.130 -2017-07-31T19:00:01.113251-05:00 leaptest CTST: epoch: 1501545601.112 boot: 442611.380 -2017-07-31T19:00:01.363695-05:00 leaptest CTST: epoch: 1501545601.363 boot: 442611.630 -2017-07-31T19:00:01.614114-05:00 leaptest CTST: epoch: 1501545601.613 boot: 442611.881 -2017-07-31T19:00:01.864524-05:00 leaptest CTST: epoch: 1501545601.864 boot: 442612.131 - - - -Leap second flag set artifically by gpsd, and noticed by ntp (leap=01 for SHM(0) and SHM(2) and leap_armed): -2017-07-31T18:59:22.952281-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T18:59:22.962756-05:00 leaptest ntpstatus.sh: ntpq -c lassoc -c mrv &1 &999 leap,srcadr,stratum -2017-07-31T18:59:22.964152-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T18:59:23.130829-05:00 leaptest ntpstatus.sh: ind assid status conf reach auth condition last_event cnt -2017-07-31T18:59:23.131062-05:00 leaptest ntpstatus.sh: =========================================================== -2017-07-31T18:59:23.131258-05:00 leaptest ntpstatus.sh: 1 18654 943a yes yes none candidate sys_peer 3 -2017-07-31T18:59:23.131451-05:00 leaptest ntpstatus.sh: 2 18655 9649 yes yes none sys.peer leap_armed 4 -2017-07-31T18:59:23.131647-05:00 leaptest ntpstatus.sh: 3 18656 8011 yes no none reject mobilize 1 -2017-07-31T18:59:23.131840-05:00 leaptest ntpstatus.sh: srcadr=SHM(0), leap=01, stratum=0 -2017-07-31T18:59:23.132031-05:00 leaptest ntpstatus.sh: srcadr=SHM(2), leap=01, stratum=0 -2017-07-31T18:59:23.132220-05:00 leaptest ntpstatus.sh: srcadr=LOCAL(0), leap=11, stratum=14 -2017-07-31T18:59:23.138000-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T18:59:23.138206-05:00 leaptest ntpstatus.sh: ntpq -p -2017-07-31T18:59:23.138404-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T18:59:23.434429-05:00 leaptest ntpstatus.sh: remote refid st t when poll reach delay offset jitter -2017-07-31T18:59:23.434666-05:00 leaptest ntpstatus.sh: ============================================================================== -2017-07-31T18:59:23.434863-05:00 leaptest ntpstatus.sh: +SHM(0) .GPS. 0 l 20 64 377 0.000 6.410 1.265 -2017-07-31T18:59:23.435055-05:00 leaptest ntpstatus.sh: *SHM(2) .PPS. 0 l 19 64 377 0.000 0.062 0.008 -2017-07-31T18:59:23.435249-05:00 leaptest ntpstatus.sh: LOCAL(0) .LOCL. 14 l - 32 0 0.000 0.000 0.000 -2017-07-31T19:00:22.459905-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:00:22.460141-05:00 leaptest ntpstatus.sh: ntpq -c lassoc -c mrv &1 &999 leap,srcadr,stratum - - - -2017-07-31T19:00:22.460343-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:00:22.618627-05:00 leaptest ntpstatus.sh: ind assid status conf reach auth condition last_event cnt -2017-07-31T19:00:22.618857-05:00 leaptest ntpstatus.sh: =========================================================== -2017-07-31T19:00:22.619057-05:00 leaptest ntpstatus.sh: 1 18654 943a yes yes none candidate sys_peer 3 -2017-07-31T19:00:22.619252-05:00 leaptest ntpstatus.sh: 2 18655 9649 yes yes none sys.peer leap_armed 4 -2017-07-31T19:00:22.619444-05:00 leaptest ntpstatus.sh: 3 18656 8011 yes no none reject mobilize 1 -2017-07-31T19:00:22.619634-05:00 leaptest ntpstatus.sh: srcadr=SHM(0), leap=01, stratum=0 -2017-07-31T19:00:22.619824-05:00 leaptest ntpstatus.sh: srcadr=SHM(2), leap=01, stratum=0 -2017-07-31T19:00:22.620016-05:00 leaptest ntpstatus.sh: srcadr=LOCAL(0), leap=11, stratum=14 -2017-07-31T19:00:22.628414-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:00:22.628654-05:00 leaptest ntpstatus.sh: ntpq -p -2017-07-31T19:00:22.628868-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:00:22.922779-05:00 leaptest ntpstatus.sh: remote refid st t when poll reach delay offset jitter -2017-07-31T19:00:22.924191-05:00 leaptest ntpstatus.sh: ============================================================================== -2017-07-31T19:00:22.925595-05:00 leaptest ntpstatus.sh: +SHM(0) .GPS. 0 l 16 64 377 0.000 7.369 0.661 -2017-07-31T19:00:22.927000-05:00 leaptest ntpstatus.sh: *SHM(2) .PPS. 0 l 15 64 377 0.000 0.059 0.008 -2017-07-31T19:00:22.928402-05:00 leaptest ntpstatus.sh: LOCAL(0) .LOCL. 14 l - 32 0 0.000 0.000 0.000 -2017-07-31T19:01:22.942937-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:01:22.943171-05:00 leaptest ntpstatus.sh: ntpq -c lassoc -c mrv &1 &999 leap,srcadr,stratum -2017-07-31T19:01:22.943371-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:01:23.118319-05:00 leaptest ntpstatus.sh: ind assid status conf reach auth condition last_event cnt -2017-07-31T19:01:23.118551-05:00 leaptest ntpstatus.sh: =========================================================== -2017-07-31T19:01:23.118750-05:00 leaptest ntpstatus.sh: 1 18654 943a yes yes none candidate sys_peer 3 -2017-07-31T19:01:23.118943-05:00 leaptest ntpstatus.sh: 2 18655 9649 yes yes none sys.peer leap_armed 4 -2017-07-31T19:01:23.119137-05:00 leaptest ntpstatus.sh: 3 18656 8011 yes no none reject mobilize 1 -2017-07-31T19:01:23.119330-05:00 leaptest ntpstatus.sh: srcadr=SHM(0), leap=01, stratum=0 -2017-07-31T19:01:23.119520-05:00 leaptest ntpstatus.sh: srcadr=SHM(2), leap=01, stratum=0 -2017-07-31T19:01:23.119710-05:00 leaptest ntpstatus.sh: srcadr=LOCAL(0), leap=11, stratum=14 -2017-07-31T19:01:23.128565-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:01:23.128809-05:00 leaptest ntpstatus.sh: ntpq -p -2017-07-31T19:01:23.129026-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:01:23.417707-05:00 leaptest ntpstatus.sh: remote refid st t when poll reach delay offset jitter -2017-07-31T19:01:23.417942-05:00 leaptest ntpstatus.sh: ============================================================================== -2017-07-31T19:01:23.418140-05:00 leaptest ntpstatus.sh: +SHM(0) .GPS. 0 l 13 64 377 0.000 1007.48 1000.36 -2017-07-31T19:01:23.418337-05:00 leaptest ntpstatus.sh: *SHM(2) .PPS. 0 l 12 64 377 0.000 1000.05 999.994 -2017-07-31T19:01:23.418529-05:00 leaptest ntpstatus.sh: LOCAL(0) .LOCL. 14 l - 32 0 0.000 0.000 0.000 -2017-07-31T19:02:23.442898-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:02:23.443131-05:00 leaptest ntpstatus.sh: ntpq -c lassoc -c mrv &1 &999 leap,srcadr,stratum -2017-07-31T19:02:23.443332-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:02:23.617413-05:00 leaptest ntpstatus.sh: ind assid status conf reach auth condition last_event cnt - - -Offset goes to one second, because there was no leap second: -2017-07-31T19:00:22.618857-05:00 leaptest ntpstatus.sh: =========================================================== -2017-07-31T19:00:22.619057-05:00 leaptest ntpstatus.sh: 1 18654 943a yes yes none candidate sys_peer 3 -2017-07-31T19:00:22.619252-05:00 leaptest ntpstatus.sh: 2 18655 9649 yes yes none sys.peer leap_armed 4 -2017-07-31T19:00:22.619444-05:00 leaptest ntpstatus.sh: 3 18656 8011 yes no none reject mobilize 1 -2017-07-31T19:00:22.619634-05:00 leaptest ntpstatus.sh: srcadr=SHM(0), leap=01, stratum=0 -2017-07-31T19:00:22.619824-05:00 leaptest ntpstatus.sh: srcadr=SHM(2), leap=01, stratum=0 -2017-07-31T19:00:22.620016-05:00 leaptest ntpstatus.sh: srcadr=LOCAL(0), leap=11, stratum=14 -2017-07-31T19:00:22.628414-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:00:22.628654-05:00 leaptest ntpstatus.sh: ntpq -p -2017-07-31T19:00:22.628868-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:00:22.922779-05:00 leaptest ntpstatus.sh: remote refid st t when poll reach delay offset jitter -2017-07-31T19:00:22.924191-05:00 leaptest ntpstatus.sh: ============================================================================== -2017-07-31T19:00:22.925595-05:00 leaptest ntpstatus.sh: +SHM(0) .GPS. 0 l 16 64 377 0.000 7.369 0.661 -2017-07-31T19:00:22.927000-05:00 leaptest ntpstatus.sh: *SHM(2) .PPS. 0 l 15 64 377 0.000 0.059 0.008 -2017-07-31T19:00:22.928402-05:00 leaptest ntpstatus.sh: LOCAL(0) .LOCL. 14 l - 32 0 0.000 0.000 0.000 -2017-07-31T19:01:22.942937-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:01:22.943171-05:00 leaptest ntpstatus.sh: ntpq -c lassoc -c mrv &1 &999 leap,srcadr,stratum -2017-07-31T19:01:22.943371-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:01:23.118319-05:00 leaptest ntpstatus.sh: ind assid status conf reach auth condition last_event cnt -2017-07-31T19:01:23.118551-05:00 leaptest ntpstatus.sh: =========================================================== -2017-07-31T19:01:23.118750-05:00 leaptest ntpstatus.sh: 1 18654 943a yes yes none candidate sys_peer 3 -2017-07-31T19:01:23.118943-05:00 leaptest ntpstatus.sh: 2 18655 9649 yes yes none sys.peer leap_armed 4 -2017-07-31T19:01:23.119137-05:00 leaptest ntpstatus.sh: 3 18656 8011 yes no none reject mobilize 1 -2017-07-31T19:01:23.119330-05:00 leaptest ntpstatus.sh: srcadr=SHM(0), leap=01, stratum=0 -2017-07-31T19:01:23.119520-05:00 leaptest ntpstatus.sh: srcadr=SHM(2), leap=01, stratum=0 -2017-07-31T19:01:23.119710-05:00 leaptest ntpstatus.sh: srcadr=LOCAL(0), leap=11, stratum=14 -2017-07-31T19:01:23.128565-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:01:23.128809-05:00 leaptest ntpstatus.sh: ntpq -p -2017-07-31T19:01:23.129026-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:01:23.417707-05:00 leaptest ntpstatus.sh: remote refid st t when poll reach delay offset jitter -2017-07-31T19:01:23.417942-05:00 leaptest ntpstatus.sh: ============================================================================== -2017-07-31T19:01:23.418140-05:00 leaptest ntpstatus.sh: +SHM(0) .GPS. 0 l 13 64 377 0.000 1007.48 1000.36 -2017-07-31T19:01:23.418337-05:00 leaptest ntpstatus.sh: *SHM(2) .PPS. 0 l 12 64 377 0.000 1000.05 999.994 -2017-07-31T19:01:23.418529-05:00 leaptest ntpstatus.sh: LOCAL(0) .LOCL. 14 l - 32 0 0.000 0.000 0.000 -2017-07-31T19:02:23.442898-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:02:23.443131-05:00 leaptest ntpstatus.sh: ntpq -c lassoc -c mrv &1 &999 leap,srcadr,stratum -2017-07-31T19:02:23.443332-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:02:23.617413-05:00 leaptest ntpstatus.sh: ind assid status conf reach auth condition last_event cnt - - -Leap second flag is clear, leap_armed is removed so no leap second on Aug 1, 2017: -2017-07-31T19:38:42.630432-05:00 leaptest ntpstatus.sh: ntpq -c lassoc -c mrv &1 &999 leap,srcadr,stratum -2017-07-31T19:38:42.630636-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:38:42.791369-05:00 leaptest ntpstatus.sh: ind assid status conf reach auth condition last_event cnt -2017-07-31T19:38:42.791605-05:00 leaptest ntpstatus.sh: =========================================================== -2017-07-31T19:38:42.791803-05:00 leaptest ntpstatus.sh: 1 18654 945a yes yes none candidate sys_peer 5 -2017-07-31T19:38:42.791994-05:00 leaptest ntpstatus.sh: 2 18655 966a yes yes none sys.peer sys_peer 6 -2017-07-31T19:38:42.792189-05:00 leaptest ntpstatus.sh: 3 18656 8033 yes no none reject unreachable 3 -2017-07-31T19:38:42.792379-05:00 leaptest ntpstatus.sh: srcadr=SHM(0), leap=00, stratum=0 -2017-07-31T19:38:42.802875-05:00 leaptest ntpstatus.sh: srcadr=SHM(2), leap=00, stratum=0 -2017-07-31T19:38:42.804254-05:00 leaptest ntpstatus.sh: srcadr=LOCAL(0), leap=00, stratum=14 - - diff --git a/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb b/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb deleted file mode 100644 index d2058ba..0000000 --- a/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb +++ /dev/null @@ -1,7 +0,0 @@ -SUMMARY = "Machine specific gpsd config" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD;md5=3775480a712fc46a69647678acb234cb" - -# empty by default -# BSP layers can add stuff like meta-openmoko example: -# diff --git a/recipes-navigation/gpsd/gpsd/gpsd b/recipes-navigation/gpsd/gpsd/gpsd deleted file mode 100755 index b4068c9..0000000 --- a/recipes-navigation/gpsd/gpsd/gpsd +++ /dev/null @@ -1,184 +0,0 @@ -#!/bin/bash -### 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 -# -# 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 -CAPABILITY=/sys/devices/platform/mts-io/capability/gps - -# Read configuration, if present -[ -r /etc/default/$NAME ] && . /etc/default/$NAME - -# Exit if we have no GPS capability -( [[ -f $CAPABILITY ]] && (($(cat $CAPABILITY) == 1)) ) || exit 0 - -# Exit if no gps found -([[ -n $GPS_LINE ]] && [[ -c $GPS_LINE ]]) || exit 0 - -# Assemble the GPS devices -# PPS device is needed so GPSD finds the PPS. -if [[ -c $GPS_PPS ]] ; then - : ${GPS_DEVICES:="$GPS_LINE $GPS_PPS"} -else - : ${GPS_DEVICES:="$GPS_LINE"} -fi - - -# Exit if the package is not installed -[ -x "$DAEMON" ] || exit 0 - -if [ -z "$GPSD_SOCKET" ] && [ -z "$GPS_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() -{ - /usr/sbin/start-stop-daemon -N -20 --start --quiet --pidfile $PIDFILE --exec $DAEMON --test \ - -- $GPSD_OPTIONS -P $PIDFILE $GPS_DEVICES > /dev/null \ - || return 1 - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started - - # If the SET_GPS_SPEED function exists, call it to set the GPS Speed. - what=$(type SET_GPS_SPEED 2>/dev/null) - if [[ $what =~ SET_GPS_SPEED[[:space:]]is[[:space:]]a[[:space:]]function ]] ; then - SET_GPS_SPEED - fi - - /usr/sbin/start-stop-daemon -N -20 --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 - /usr/sbin/start-stop-daemon --stop --quiet --signal KILL --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. - # - /usr/sbin/start-stop-daemon -N -20 --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME - return 0 -} - -do_status() { - NAME=$1 - PIDFILE=$2 - # -t: test only but not stop - start-stop-daemon -K -t --quiet --pidfile $PIDFILE --name $NAME - # exit with status 0 if process is found - if [ "$?" = "0" ]; then - return 0 - else - return 1 - fi -} - -case "$1" in - start) - if ! [[ $ENABLED =~ ^[yY][eE][sS]$ ]] ; then - exit 0 - fi - echo "Starting $DESC" "$NAME" - do_start - exit $? - ;; - stop) - echo "Stopping $DESC" "$NAME" - do_stop - exit $? - ;; - status) - echo -n "status $NAME ... " - do_status "$NAME" "$PIDFILE" - if [ "$?" = "0" ]; then - echo "running" - exit 0 - else - echo "stopped" - exit 1 - fi - ;; - 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/recipes-navigation/gpsd/gpsd/gpsd-default b/recipes-navigation/gpsd/gpsd/gpsd-default deleted file mode 100644 index fa67fd1..0000000 --- a/recipes-navigation/gpsd/gpsd/gpsd-default +++ /dev/null @@ -1,76 +0,0 @@ -ENABLED="yes" - -# GPSD control socket for sending GPSD commands. -# GPSD_SOCKET="/var/run/gpsd.sock" - -GPSD_OPTIONS="-n -D 1" - -# Conduit 0.1 GPS devices -GPS_LINE=/dev/gps0 -GPS_PPS=/dev/pps0 - -# Highest speed permitted by uBlox. -GPS_BAUD=115200 - -# Use this if you must use a specific pps -# that does not exist prior to gpsd running. -# GPS_DEVICES="/dev/gps1 /dev/pps1" - -GPS_FIXFILE=/var/run/gpsfix - -# GPSD Json TPV object, mode field. -# See: http://www.catb.org/gpsd/gpsd_json.html -# -# 0 Unknown -# 1 No fix -# 2 2D fix -# 3 3D fix -GPSFIX="3" - -# U-Blox defaults to 9600. If the -# default speed is not set before changing -# the baud rate, this does not work -# except right after a boot when the speed -# is 9600 baud. -# -# 115200 baud is preferred to reduce the CPU -# load. Also, u-blox mode is preferred to -# nmea, as it is more efficient. -# -# We check for U-Blox first, because -# we do not set the baud rate of other -# GPS types. -# -# This gpsctl does not always work, because -# the line speed might be wrong, so if we -# fail, we change the baud rate and try again. -# -# There should only be two speeds, 115200 -# or 9600. -# -# If the line speed is already 115200, we -# should not need to change the baud rate. -# -function SET_GPS_SPEED { -if [[ $(mts-io-sysfs show hw-version) =~ ^MTHS- ]] ; then - if gpsctl -t 'u-blox' -D 5 -x '\x06\x41\x00\x00\x03\x1F\x90\x47\x4F\xB1\xFF\xFF\xEA\xFF' $GPS_LINE ; then - logger -s -t 'gpsd info' -p daemon.info "GPS LNA set high" - else - logger -s -t 'gpsd info' -p daemon.alert "ERROR: GPS LNA not set" - fi -fi - -if [[ $(cat /run/config/gpstype) == u-blox ]] ; then - # Set the baud rate. Works better with ntp at a higher baud rate. - if ! gpsctl -T 20 -t 'u-blox' -s $GPS_BAUD -b -f $GPS_LINE ; then - echo 'WARNING: Unable to set GPS serial port speed.' - else - # The next line is needed due to a bug in gpsctl. - # We will go back to the default baud rate if we don't do this step. - echo Expect a timeout error here. Need this error. - gpsctl -T 2 -f $GPS_LINE - stty -F $GPS_LINE $GPS_BAUD - fi -fi # End of U-Blox GPS type -} - diff --git a/recipes-navigation/gpsd/gpsd/gpsd.rules b/recipes-navigation/gpsd/gpsd/gpsd.rules deleted file mode 100644 index dc90ad6..0000000 --- a/recipes-navigation/gpsd/gpsd/gpsd.rules +++ /dev/null @@ -1,50 +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" - -# mLinux does not come with gpsd.hotplug.wrapper -# ACTION=="remove", RUN+="/lib/udev/gpsd.hotplug.wrapper" - -KERNEL=="ttyXRUSB2", SYMLINK+="gps0" -KERNEL=="pps0", OWNER="root", GROUP="tty", MODE="0660", SYMLINK+="gpspps0" -LABEL="gpsd_rules_end" diff --git a/recipes-navigation/gpsd/gpsd/gpsd.service b/recipes-navigation/gpsd/gpsd/gpsd.service deleted file mode 100644 index 7131a58..0000000 --- a/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/recipes-navigation/gpsd/gpsd/gpsd_fixed.sh b/recipes-navigation/gpsd/gpsd/gpsd_fixed.sh deleted file mode 100644 index 915c7be..0000000 --- a/recipes-navigation/gpsd/gpsd/gpsd_fixed.sh +++ /dev/null @@ -1,125 +0,0 @@ -#!/bin/bash -# This script filters the gpspipe -w -# (json) output from GPSD. The GPS fix -# is taken from the mode parameter of -# the GPSD TPV object in the json output. -# Values are: -# -# 0 Unseen -# 1 No fix -# 2 2D -# 3 3D -# -# Fix file creation for GPS. -# If GPS reaches expected -# fix level, file GSP_FIXFILE is created. -# This is to know when to set the system -# and hardware clock, and when -# it is safe to start ntp. -# DEBUG=1 to set debug -NAME=gpsd_ubx_fixed -shopt -s expand_aliases -alias LG="logger -t ${NAME}" -if [[ -r /etc/default/gpsd ]] ; then - . /etc/default/gpsd -else - echo "Must configure GPSD requirements" - exit 1 -fi - -function rm_gps_file -{ - if [[ -n "${GPS_FIXFILE}" ]] && [[ -f ${GPS_FIXFILE} ]] ; then - rm -f "${GPS_FIXFILE}" - fi -} -function kill_it -{ - cmd=$1 - pid=$2 - sig=$3 - ((DEBUG)) && LG -p user.info "terminating $cmd(${pid}) with SIG${sig}" - kill -SIG${sig} ${pid} >/dev/null 2>&1 - result=$? - ((DEBUG)) && LG -p user.info "kill -SIG${sig} ${pid} result is $result" -} - -# Most exits are errors, so remove the GPS fix file. -trap rm_gps_file EXIT - -if ! [[ -x /usr/bin/gpspipe ]] ; then - LG -p user.err "Please install gpspipe" - exit 0 -fi - -# Terminate gpspipe after 10 seconds if it is our child -# gpspipe has issues with terminals and stalling on terminal -# read of the console. -( - sleep 10 - # We use BASHPID because our parent, $$, may have already exited, and - # then ps will not work. BASHPID is the current subshell. - ppid=$BASHPID - pgid=$(ps --no-heading -o pgid -p $ppid) - - if ((${#pgid} == 0)) ; then - LG -p user.err "Could not find a pgid for $ppid" - ps -fjp $ppid | LG -p user.error - fi - - # pgrep does not work during boot. - pgrpmemb=$(ps --no-heading -o pgid,pid,comm -e | grep '^ *'"${pgid}"' *' | sed -r 's/^ *[0-9]+ *//') - gpspipepid=$(echo "${pgrpmemb}" | egrep '[[:space:]]gpspipe$' | sed 's/[[:space:]].*//') - - ((DEBUG)) && LG -p user.info "$pgid is pgid $gpspipepid is gpspipepid" - # Find the gpspipepid that is our grandchild - ((didkill=0)) - - # for loop is in case gpspipepid has children. - for p in ${gpspipepid} ; do - if ((${#p})) ; then - kill_it gpspipe $p TERM - ((didkill=p)) - break - fi - done - if ((didkill == 0)) ; then - exit 0 - fi - # Do a sigkill to be sure. - sleep 2 - kill_it gpspipe $didkill KILL -) & - -fix="" -status="" - -# egrep in busybox has a horrible buffering issue. -# echo My shell pid is $$ -# echo Place data fix, status -fix="$(gpspipe -w | grep -m1 '{"class":"TPV","device":"/dev/gps0",.*"mode":' | sed -e 's/.*"mode"://' -e 's/[},].*//')" - -if ((${#fix} == 0)) ; then - LG -p user.err "No data from GPS" - exit 1 -fi - - -# echo "status is $status. fixOK is $fixOK" - - -# echo "fix is $fix. Is it in $GPSFIX?" -# Test the GPS fixOK -for x in $GPSFIX ; do - # echo test $x with $fix - if [[ $x == $fix ]] ; then - LG -p user.info "GPS has fix $fix found in list GPSFIX: $GPSFIX" - echo $x >"${GPS_FIXFILE}" - GPS_FIXFILE="" - exit 0 - fi -done - -LG -p user.info "GPS fix is bad: $fix and should be one of: $GPSFIX" -# Start later -exit 1 diff --git a/recipes-navigation/gpsd/gpsd/gpsd_settime.sh b/recipes-navigation/gpsd/gpsd/gpsd_settime.sh deleted file mode 100755 index e8e8f26..0000000 --- a/recipes-navigation/gpsd/gpsd/gpsd_settime.sh +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/bash -# Get the time from gpspipe, and if present, set the time. -# DEBUG=1 to set debug -NAME=gpsd_ubx_settime -shopt -s expand_aliases -alias LG="logger -t $NAME" -function kill_it -{ - cmd=$1 - pid=$2 - sig=$3 - ((DEBUG)) && LG -p user.info "terminating $cmd(${pid}) with SIG${sig}" - kill -SIG${sig} ${pid} - result=$? - ((DEBUG)) && LG -p user.info "kill -SIG${sig} ${pid} result is $result" -} - -trap "stty echo icanon" exit - -OIFS=$IFS -IFS=$'\n' -if ! /usr/sbin/gpsd_fixed 18 )) ; then - LG -p user.warn "Updating time to time, ${ISO8601}." - [[ $ISO8601 =~ ([^-]*)-([^-]*)-([^T]*)T([^:]*):([^:]*):([^\.]*)\. ]] - Y=${BASH_REMATCH[1]} - M=${BASH_REMATCH[2]} - D=${BASH_REMATCH[3]} - h=${BASH_REMATCH[4]} - m=${BASH_REMATCH[5]} - s=${BASH_REMATCH[6]} -fi -if ((${#Y} == 4 )) && ((${#M} > 0)) && ((${#D} > 0)) && ((${#h} > 0)) && ((${#m} > 0)) && ((${#s} > 0)) ; then - date -u "${Y}.${M}.${D}-${h}:${m}:${s}" >/dev/null -else - LG -p user.err "gpspipe output is bad or missing" - exit 1 -fi -exit 0 diff --git a/recipes-navigation/gpsd/gpsd/gpsd_ubx_fixed.sh b/recipes-navigation/gpsd/gpsd/gpsd_ubx_fixed.sh deleted file mode 100755 index 82254c2..0000000 --- a/recipes-navigation/gpsd/gpsd/gpsd_ubx_fixed.sh +++ /dev/null @@ -1,176 +0,0 @@ -#!/bin/bash -# This script is deprecated. -# Use gpsd_fixed instead. -# Fix file creation for U-Blox GPS. -# If GPS reaches expected -# fix level, file GSP_FIXFILE is created. -# This is to know when to set the system -# and hardware clock, and when -# it is safe to start ntp. -# DEBUG=1 to set debug -# -NAME=gpsd_ubx_fixed -shopt -s expand_aliases -alias LG=logger\ -t\ ${NAME} -if [[ -r /etc/default/gpsd ]] ; then - . /etc/default/gpsd -else - echo "Must configure GPSD requirements" - exit 1 -fi -UBXNAVSOL='b56201063400' -UBXNAVSOLLEN=60 - -function rm_gps_file -{ - if [[ -n "${GPS_FIXFILE}" ]] && [[ -f ${GPS_FIXFILE} ]] ; then - rm -f "${GPS_FIXFILE}" - fi -} -function kill_it -{ - cmd=$1 - pid=$2 - sig=$3 - ((DEBUG)) && LG -p user.info "terminating $cmd(${pid}) with SIG${sig}" - kill -SIG${sig} ${pid} >/dev/null 2>&1 - result=$? - ((DEBUG)) && LG -p user.info "kill -SIG${sig} ${pid} result is $result" -} - - -# Most exits are errors, so remove the GPS fix file. -trap rm_gps_file EXIT - -if ! [[ -x /usr/bin/gpsmon ]] ; then - LG -p user.err "Please install gpsmon" - exit 0 -fi - -# Terminate gpsmon after 10 seconds if it is our child -# gpsmon has issues with terminals and stalling on terminal -# read of the console. -( - sleep 10 - # We use BASHPID because our parent, $$, may have already exited, and - # then ps will not work. BASHPID is the current subshell. - ppid=$BASHPID - pgid=$(ps --no-heading -o pgid -p $ppid) - - if ((${#pgid} == 0)) ; then - LG -p user.err "Could not find a pgid for $ppid" - ps -fjp $ppid | LG -p user.error - fi - - # pgrep does not work during boot. - pgrpmemb=$(ps --no-heading -o pgid,pid,comm -e | grep '^ *'"${pgid}"' *' | sed -r 's/^ *[0-9]+ *//') - gpsmonpid=$(echo "${pgrpmemb}" | egrep '[[:space:]]gpsmon$' | sed 's/[[:space:]].*//') - - ((DEBUG)) && LG -p user.info "$pgid is pgid $gpsmonpid is gpsmonpid" - # Find the gpsmonpid that is our grandchild - ((didkill=0)) - - # for loop is in case gpsmonpid has children. - for p in ${gpsmonpid} ; do - if ((${#p})) ; then - kill_it gpsmon $p TERM - ((didkill=p)) - break - fi - done - if ((didkill == 0)) ; then - exit 0 - fi - # Do a sigkill to be sure. - sleep 2 - kill_it gpsmon $didkill KILL -) & - -fix="" -status="" - -# egrep in busybox has a horrible buffering issue. -# echo My shell pid is $$ -# echo Place data fix, status -stuff="$(gpsmon -a 2>&1 | { - OIFS=${IFS} - IFS=$'\n' - while read ln ; do - if [[ $ln =~ ^[[:space:]]*\(${UBXNAVSOLLEN}\)[[:space:]]*${UBXNAVSOL}....................(..)(.) ]] ; then - IFS=${OIFS} - fix="${BASH_REMATCH[1]}" - if ((${#fix} == 0)) ; then - fix="unknown" - fi - status=$(echo "${BASH_REMATCH[2]}") - if ((${#status} == 0)) ; then - status="unknown" - fi - break; - fi - oldln="${ln}" - done - if ((${#fix})) && ((${#status})) ; then - echo "$fix,$status" - else - echo "${oldln}" - fi -})" - -if ((${#stuff} == 0)) ; then - LG -p user.err "No data from GPS" - exit 1 -fi - -if [[ -t 1 ]] ; then - stty echo icanon 2>/dev/null -fi - -OIFS=${IFS} -IFS=, -set $stuff -fix="$1" -status="$2" -IFS=${OIFS} - -# fixOK is the least significant bit of a hex single digit -case $status in - [13579bBdDfF]) - ((fixOK=1)) - ;; - [02468aAcCeE]) - ((fixOK=0)) - ;; - *) - LG -p user.err "Is GPSD running?" - LG -p user.err "FIX OK field should be single hex digit: gpsmon data: $stuff" - exit 1 - break - ;; -esac - -# echo "status is $status. fixOK is $fixOK" - - -if ((fixOK == 0)) ; then - LG -p user.err "Problem with the GPS fix. The fix is an even value, \"$status\", and should be an odd value. fixOK=${fixOK}" - exit 1 - # Retry later. How? -fi - -# echo "fix is $fix. Is it in $GPSFIX?" -# Test the GPS fixOK -for x in $GPSFIX ; do - # echo test $x with $fix - if [[ $x == $fix ]] ; then - LG -p user.info "GPS has fix $fix found in list GPSFIX: $GPSFIX" - echo $x >"${GPS_FIXFILE}" - GPS_FIXFILE="" - exit 0 - fi -done - -LG -p user.info "GPS fix is bad: $fix and should be one of: $GPSFIX" -# Start later -exit 1 - diff --git a/recipes-navigation/gpsd/gpsd/gpsd_ubx_settime.sh b/recipes-navigation/gpsd/gpsd/gpsd_ubx_settime.sh deleted file mode 100755 index b497138..0000000 --- a/recipes-navigation/gpsd/gpsd/gpsd_ubx_settime.sh +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/bash -# This function is deprecated. -# Use gpsd_settime instead. -# PPS= 1484247472.29561104 clock= 1484247990.00000000 offset= 517.704388959 -# DEBUG=1 to set debug -NAME=gpsd_ubx_settime -shopt -s expand_aliases -alias LG="logger -t $NAME" -function kill_it -{ - cmd=$1 - pid=$2 - sig=$3 - ((DEBUG)) && LG -p user.info "terminating $cmd(${pid}) with SIG${sig}" - kill -SIG${sig} ${pid} - result=$? - ((DEBUG)) && LG -p user.info "kill -SIG${sig} ${pid} result is $result" -} - -trap "stty echo icanon" exit - -OIFS=$IFS -IFS=$'\n' -if ! /usr/sbin/gpsd_ubx_fixed &1 | ( while read ln ; do - if [[ $ln =~ ^[[:space:]]*PPS=.*clock=[[:space:]]*([0-9]*)\. ]] ; then - echo ${BASH_REMATCH[1]} - break - fi -done )) -if [[ $epoch =~ ^[0-9]+$ ]] ; then - LG -p user.warn "Updating time to epoch time, ${epoch}." - date +%s -s @${epoch} >/dev/null -else - LG -p user.err "gpsmon output is bad." - exit 1 -fi -exit 0 diff --git a/recipes-navigation/gpsd/gpsd_3.16.bb b/recipes-navigation/gpsd/gpsd_3.16.bb deleted file mode 100644 index 26a8963..0000000 --- a/recipes-navigation/gpsd/gpsd_3.16.bb +++ /dev/null @@ -1,221 +0,0 @@ -SUMMARY = "A TCP/IP Daemon simplifying the communication with GPS devices" -SECTION = "console/network" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800" -DEPENDS = "dbus dbus-glib ncurses python libusb1 chrpath-replacement-native pps-tools" -PROVIDES = "virtual/gpsd" -PR="m14" - -EXTRANATIVEPATH += "chrpath-native" - -# file://0002-SConstruct-remove-rpath.patch -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://0005-suppress-text-in-binary.patch \ - file://0006-ubxtimelps.patch \ - file://0006-itu_r_tf_460_6.patch \ - file://0006-sysclockcrash.patch \ - file://0008-major_gnu.patch \ - file://gpsd-default \ - file://gpsd \ - file://gpsd_ubx_fixed.sh \ - file://gpsd_ubx_settime.sh \ - file://gpsd_settime.sh \ - file://gpsd_fixed.sh \ - file://gpsd.rules \ - file://gpsd.service \ -" -# 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 10" - -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}' \ - ashtech='no' \ - earthmate='no' \ - evermore='no' \ - fury='no' \ - fv18='no' \ - garmin='no' \ - garmintxt='no' \ - geostar='no' \ - greis='no' \ - itrax='no' \ - mtk3301='no' \ - navcom='no' \ - nmea0183='yes' \ - nmea2000='no' \ - oncore='no' \ - sirf='no' \ - skytraq='yes' \ - superstar2='no' \ - tnt='no' \ - tripmate='no' \ - tsip='no' \ - ublox='yes' \ - ubloxtimels='yes' \ - aivdm='no' \ - gpsclock='no' \ - oceanserver='no' \ - fixed_stop_bits='1' \ - 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 - install -d ${D}${sbindir} - install -m 0755 ${WORKDIR}/gpsd_ubx_fixed.sh ${D}${sbindir}/gpsd_ubx_fixed - install -m 0755 ${WORKDIR}/gpsd_ubx_settime.sh ${D}${sbindir}/gpsd_ubx_settime - install -m 0755 ${WORKDIR}/gpsd_fixed.sh ${D}${sbindir}/gpsd_fixed - install -m 0755 ${WORKDIR}/gpsd_settime.sh ${D}${sbindir}/gpsd_settime - - #support for udev - install -d ${D}/${sysconfdir}/udev/rules.d - install -m 0644 ${WORKDIR}/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 - - # support for dev (development) - mkdir -p -m 0644 ${D}/${includedir}/gps - install -m 0644 ${S}/gpsd.h ${D}/${includedir}/gps - install -m 0644 ${S}/revision.h ${D}/${includedir}/gps - install -m 0644 ${S}/gpsdclient.h ${D}/${includedir}/gps - install -m 0644 ${S}/gpsd_config.h ${D}/${includedir}/gps - install -m 0644 ${S}/compiler.h ${D}/${includedir}/gps - install -m 0644 ${S}/ppsthread.h ${D}/${includedir}/gps -} - -# Use libgps recipe for sysroot. -do_populate_sysroot() { -} - -RDEPENDS_${PN}-conf += "bash" - -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 gpspipe gps-utils" - -# File does not exist: ${libdir}/libQgpsmm.prl -# FILES_${PN}-dev += "${libdir}/pkgconfdir/libgpsd.pc ${libdir}/pkgconfdir/libgps.pc \ -# ${includedir}/gps.h ${includedir}/libgpsmm.h ${includedir}/gps" - -FILES_${PN} += "${sbindir}/gpsd_*" - -FILES_python-pygps-dbg += " ${libdir}/python*/site-packages/gps/.debug" - -RDEPENDS_${PN} = "gpsd-gpsctl bash" -RRECOMMENDS_${PN} = "gpsd-conf gpsd-machine-conf" - -SUMMARY_${PN}-udev = "udev relevant files to use gpsd hotplugging" -FILES_${PN}-udev = "${base_libdir}/udev ${sysconfdir}/udev/*" -RDEPENDS_${PN}-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_${PN}-conf = "gpsd configuration files and init scripts" -FILES_${PN}-conf = "${sysconfdir}" -CONFFILES_${PN}-conf = "${sysconfdir}/default/gpsd.default" - -SUMMARY_${PN}-gpsctl = "Tool for tweaking GPS modes" -FILES_${PN}-gpsctl = "${bindir}/gpsctl" - -SUMMARY_gpspipe = "Tool to connectg to gpsd and retrieve sentences" -FILES_gpspipe = "${bindir}/gpspipe" - -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-io \ - python-threading \ - python-terminal \ - python-curses \ - gpsd \ - python-json" - -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "${PN}.socket" diff --git a/recipes-navigation/gpsd/gpsd_3.16.bb.old b/recipes-navigation/gpsd/gpsd_3.16.bb.old deleted file mode 100644 index 1464981..0000000 --- a/recipes-navigation/gpsd/gpsd_3.16.bb.old +++ /dev/null @@ -1,217 +0,0 @@ -SUMMARY = "A TCP/IP Daemon simplifying the communication with GPS devices" -SECTION = "console/network" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800" -DEPENDS = "dbus dbus-glib ncurses python libusb1 chrpath-replacement-native pps-tools" -PROVIDES = "virtual/gpsd" -PR="m12" - -EXTRANATIVEPATH += "chrpath-native" - -# file://0002-SConstruct-remove-rpath.patch -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://0005-suppress-text-in-binary.patch \ - file://0006-ubxtimelps.patch \ - file://0006-itu_r_tf_460_6.patch \ - file://0006-sysclockcrash.patch \ - file://0008-major_gnu.patch \ - file://gpsd-default \ - file://gpsd \ - file://gpsd_ubx_fixed.sh \ - file://gpsd_ubx_settime.sh \ - file://gpsd.rules \ - file://gpsd.service \ -" -# 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 10" - -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}' \ - ashtech='no' \ - earthmate='no' \ - evermore='no' \ - fury='no' \ - fv18='no' \ - garmin='no' \ - garmintxt='no' \ - geostar='no' \ - greis='no' \ - itrax='no' \ - mtk3301='no' \ - navcom='no' \ - nmea0183='yes' \ - nmea2000='no' \ - oncore='no' \ - sirf='no' \ - skytraq='yes' \ - superstar2='no' \ - tnt='no' \ - tripmate='no' \ - tsip='no' \ - ublox='yes' \ - ubloxtimels='yes' \ - aivdm='no' \ - gpsclock='no' \ - oceanserver='no' \ - fixed_stop_bits='1' \ - 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 - install -d ${D}${sbindir} - install -m 0755 ${WORKDIR}/gpsd_ubx_fixed.sh ${D}${sbindir}/gpsd_ubx_fixed - install -m 0755 ${WORKDIR}/gpsd_ubx_settime.sh ${D}${sbindir}/gpsd_ubx_settime - - #support for udev - install -d ${D}/${sysconfdir}/udev/rules.d - install -m 0644 ${WORKDIR}/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 - - # support for dev (development) - mkdir -p -m 0644 ${D}/${includedir}/gps - install -m 0644 ${S}/gpsd.h ${D}/${includedir}/gps - install -m 0644 ${S}/revision.h ${D}/${includedir}/gps - install -m 0644 ${S}/gpsdclient.h ${D}/${includedir}/gps - install -m 0644 ${S}/gpsd_config.h ${D}/${includedir}/gps - install -m 0644 ${S}/compiler.h ${D}/${includedir}/gps - install -m 0644 ${S}/ppsthread.h ${D}/${includedir}/gps -} - -# Use libgps recipe for sysroot. -do_populate_sysroot() { -} - -RDEPENDS_${PN}-conf += "bash" - -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 gpspipe gps-utils" - -# File does not exist: ${libdir}/libQgpsmm.prl -# FILES_${PN}-dev += "${libdir}/pkgconfdir/libgpsd.pc ${libdir}/pkgconfdir/libgps.pc \ -# ${includedir}/gps.h ${includedir}/libgpsmm.h ${includedir}/gps" - -FILES_${PN} += "${sbindir}/gpsd_ubx_fixed ${sbindir}/gpsd_ubx_settime" - -FILES_python-pygps-dbg += " ${libdir}/python*/site-packages/gps/.debug" - -RDEPENDS_${PN} = "gpsd-gpsctl bash" -RRECOMMENDS_${PN} = "gpsd-conf gpsd-machine-conf" - -SUMMARY_${PN}-udev = "udev relevant files to use gpsd hotplugging" -FILES_${PN}-udev = "${base_libdir}/udev ${sysconfdir}/udev/*" -RDEPENDS_${PN}-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_${PN}-conf = "gpsd configuration files and init scripts" -FILES_${PN}-conf = "${sysconfdir}" -CONFFILES_${PN}-conf = "${sysconfdir}/default/gpsd.default" - -SUMMARY_${PN}-gpsctl = "Tool for tweaking GPS modes" -FILES_${PN}-gpsctl = "${bindir}/gpsctl" - -SUMMARY_gpspipe = "Tool to connectg to gpsd and retrieve sentences" -FILES_gpspipe = "${bindir}/gpspipe" - -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-io \ - python-threading \ - python-terminal \ - python-curses \ - gpsd \ - python-json" - -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "${PN}.socket" diff --git a/recipes-navigation/gpsd/gpsd_3.18.1.bb b/recipes-navigation/gpsd/gpsd_3.18.1.bb deleted file mode 100644 index 0b0a287..0000000 --- a/recipes-navigation/gpsd/gpsd_3.18.1.bb +++ /dev/null @@ -1,237 +0,0 @@ -SUMMARY = "A TCP/IP Daemon simplifying the communication with GPS devices" -SECTION = "console/network" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800" -DEPENDS = "dbus dbus-glib ncurses python libusb1 chrpath-replacement-native pps-tools" -PROVIDES = "virtual/gpsd" -PR="m7" - -EXTRANATIVEPATH += "chrpath-native" - -# sysclockcrash is fixed for gpsd -# suppress text in binary is fixed for gpsctl - -SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \ - ${SAVANNAH_GNU_MIRROR}/gpsd/gpsd-${PV}.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://0006-ubxtimelps.patch \ - file://0006-itu_r_tf_460_6.patch \ - file://gpsd-default \ - file://gpsd \ - file://gpsd_ubx_fixed.sh \ - file://gpsd_ubx_settime.sh \ - file://gpsd_fixed.sh \ - file://gpsd_settime.sh \ - file://gpsd.rules \ - file://gpsd.service \ -" -SRC_URI[md5sum] = "3b11f26b295010666b1767b308f90bc5" -SRC_URI[sha256sum] = "5cb1e6d880ec9a52c62492dd0e3d77451b7c7ad625895bd652f6354215aec23e" - -inherit scons update-rc.d python-dir pythonnative systemd - -INITSCRIPT_NAME = "gpsd" -INITSCRIPT_PARAMS = "defaults 10" - -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" - -# Remove unneeded features. netfeed is needed by gpsmon -EXTRA_OESCONS = " \ - sysroot=${STAGING_DIR_TARGET} \ - libQgpsmm='false' \ - debug='true' \ - strip='false' \ - chrpath='yes' \ - systemd='${SYSTEMD_OESCONS}' \ - libdir='${libdir}' \ - ublox='yes' \ - ubloxtimels='yes' \ - pps='yes' \ - gpsd_group='gps' \ - ntpshm='yes' \ - prefix='usr' \ - control_socket='false' \ - nofloats='yes' \ - ashtech='false' \ - earthmate='false' \ - evermore='false' \ - fury='false' \ - fv18='false' \ - garmin='false' \ - garmintxt='false' \ - geostar='false' \ - greis='false' \ - itrax='false' \ - mtk3301='false' \ - navcom='false' \ - nmea0183='true' \ - nmea2000='false' \ - oncore='false' \ - sirf='false' \ - skytraq='false' \ - superstar2='false' \ - tnt='false' \ - tripmate='false' \ - tsip='false' \ - ublox='true' \ - aivdm='false' \ - gpsclock='false' \ - isync='false' \ - ntrip='false' \ - oceanserver='false' \ - passthrough='false' \ - rtcm104v2='false' \ - rtcm104v3='false' \ - bluez='false' \ - ipv6='false' \ - netfeed='true' \ - usb='false' \ - ${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 - install -d ${D}${sbindir} - install -m 0755 ${WORKDIR}/gpsd_ubx_fixed.sh ${D}${sbindir}/gpsd_ubx_fixed - install -m 0755 ${WORKDIR}/gpsd_ubx_settime.sh ${D}${sbindir}/gpsd_ubx_settime - install -m 0755 ${WORKDIR}/gpsd_fixed.sh ${D}${sbindir}/gpsd_fixed - install -m 0755 ${WORKDIR}/gpsd_settime.sh ${D}${sbindir}/gpsd_settime - - - #support for udev - install -d ${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/ - - #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 - - # support for dev (development) - mkdir -p -m 0644 ${D}/${includedir}/gps - install -m 0644 ${S}/gpsd.h ${D}/${includedir}/gps - install -m 0644 ${S}/os_compat.h ${D}/${includedir}/gps - install -m 0644 ${S}/revision.h ${D}/${includedir}/gps - install -m 0644 ${S}/gpsdclient.h ${D}/${includedir}/gps - install -m 0644 ${S}/gpsd_config.h ${D}/${includedir}/gps - install -m 0644 ${S}/compiler.h ${D}/${includedir}/gps - install -m 0644 ${S}/ppsthread.h ${D}/${includedir}/gps - - # New ubxtool - install -m 0755 ${S}/ubxtool ${D}/${bindir} - install -m 0644 ${S}/ubxtool.1 ${D}/${mandir}/man1 -} - -RDEPENDS_${PN}-conf += "bash" - -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 gpspipe gps-utils" - -# File does not exist: ${libdir}/libQgpsmm.prl -FILES_${PN}-dev += "${libdir}/pkgconfdir/libgpsd.pc ${libdir}/pkgconfdir/libgps.pc \ - ${libdir}/libQgpsmm.prl \ - ${includedir}/gps.h ${includedir}/libgpsmm.h ${includedir}/gps" - -FILES_${PN} += "${sbindir}/gpsd_*" - -FILES_python-pygps-dbg += " ${libdir}/python*/site-packages/gps/.debug" - -RDEPENDS_${PN} = "gpsd-gpsctl bash" - -# gpsd-udev is for USB, which we are not using -RRECOMMENDS_${PN} = "gpsd-conf gpsd-machine-conf" - -SUMMARY_${PN}-udev = "udev relevant files to use gpsd hotplugging" -FILES_${PN}-udev = "${base_libdir}/udev ${sysconfdir}/udev/*" -RDEPENDS_${PN}-udev += "eudev 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_${PN}-conf = "gpsd configuration files and init scripts" -FILES_${PN}-conf = "${sysconfdir}" -CONFFILES_${PN}-conf = "${sysconfdir}/default/gpsd.default" - -SUMMARY_${PN}-gpsctl = "Tool for tweaking GPS modes" -FILES_${PN}-gpsctl = "${bindir}/gpsctl" - -SUMMARY_gpspipe = "Tool to connectg to gpsd and retrieve sentences" -FILES_gpspipe = "${bindir}/gpspipe" - -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-io \ - python-threading \ - python-terminal \ - python-curses \ - gpsd \ - python-json" - -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "${BPN}.socket ${BPN}ctl@.service" - - -ALTERNATIVE_${PN} = "gpsd-defaults" -ALTERNATIVE_LINK_NAME[gpsd-defaults] = "${sysconfdir}/default/gpsd" -ALTERNATIVE_TARGET[gpsd-defaults] = "${sysconfdir}/default/gpsd.default" diff --git a/recipes-navigation/gpsd/gpsd_3.18.1.bb.save b/recipes-navigation/gpsd/gpsd_3.18.1.bb.save deleted file mode 100644 index bbc1f88..0000000 --- a/recipes-navigation/gpsd/gpsd_3.18.1.bb.save +++ /dev/null @@ -1,236 +0,0 @@ -SUMMARY = "A TCP/IP Daemon simplifying the communication with GPS devices" -SECTION = "console/network" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800" -DEPENDS = "dbus dbus-glib ncurses python libusb1 chrpath-replacement-native pps-tools" -PROVIDES = "virtual/gpsd" -PR="m7" - -EXTRANATIVEPATH += "chrpath-native" - -# sysclockcrash is fixed for gpsd -# suppress text in binary is fixed for gpsctl - -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://0006-ubxtimelps.patch \ - file://0006-itu_r_tf_460_6.patch \ - file://gpsd-default \ - file://gpsd \ - file://gpsd_ubx_fixed.sh \ - file://gpsd_ubx_settime.sh \ - file://gpsd_fixed.sh \ - file://gpsd_settime.sh \ - file://gpsd.rules \ - file://gpsd.service \ -" -SRC_URI[md5sum] = "3b11f26b295010666b1767b308f90bc5" -SRC_URI[sha256sum] = "5cb1e6d880ec9a52c62492dd0e3d77451b7c7ad625895bd652f6354215aec23e" - -inherit scons update-rc.d python-dir pythonnative systemd - -INITSCRIPT_NAME = "gpsd" -INITSCRIPT_PARAMS = "defaults 10" - -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" - -# Remove unneeded features. netfeed is needed by gpsmon -EXTRA_OESCONS = " \ - sysroot=${STAGING_DIR_TARGET} \ - libQgpsmm='false' \ - debug='true' \ - strip='false' \ - chrpath='yes' \ - systemd='${SYSTEMD_OESCONS}' \ - libdir='${libdir}' \ - ublox='yes' \ - ubloxtimels='yes' \ - pps='yes' \ - gpsd_group='gps' \ - ntpshm='yes' \ - prefix='usr' \ - control_socket='false' \ - nofloats='yes' \ - ashtech='false' \ - earthmate='false' \ - evermore='false' \ - fury='false' \ - fv18='false' \ - garmin='false' \ - garmintxt='false' \ - geostar='false' \ - greis='false' \ - itrax='false' \ - mtk3301='false' \ - navcom='false' \ - nmea0183='true' \ - nmea2000='false' \ - oncore='false' \ - sirf='false' \ - skytraq='false' \ - superstar2='false' \ - tnt='false' \ - tripmate='false' \ - tsip='false' \ - ublox='true' \ - aivdm='false' \ - gpsclock='false' \ - isync='false' \ - ntrip='false' \ - oceanserver='false' \ - passthrough='false' \ - rtcm104v2='false' \ - rtcm104v3='false' \ - bluez='false' \ - ipv6='false' \ - netfeed='true' \ - usb='false' \ - ${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 - install -d ${D}${sbindir} - install -m 0755 ${WORKDIR}/gpsd_ubx_fixed.sh ${D}${sbindir}/gpsd_ubx_fixed - install -m 0755 ${WORKDIR}/gpsd_ubx_settime.sh ${D}${sbindir}/gpsd_ubx_settime - install -m 0755 ${WORKDIR}/gpsd_fixed.sh ${D}${sbindir}/gpsd_fixed - install -m 0755 ${WORKDIR}/gpsd_settime.sh ${D}${sbindir}/gpsd_settime - - - #support for udev - install -d ${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/ - - #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 - - # support for dev (development) - mkdir -p -m 0644 ${D}/${includedir}/gps - install -m 0644 ${S}/gpsd.h ${D}/${includedir}/gps - install -m 0644 ${S}/os_compat.h ${D}/${includedir}/gps - install -m 0644 ${S}/revision.h ${D}/${includedir}/gps - install -m 0644 ${S}/gpsdclient.h ${D}/${includedir}/gps - install -m 0644 ${S}/gpsd_config.h ${D}/${includedir}/gps - install -m 0644 ${S}/compiler.h ${D}/${includedir}/gps - install -m 0644 ${S}/ppsthread.h ${D}/${includedir}/gps - - # New ubxtool - install -m 0755 ${S}/ubxtool ${D}/${bindir} - install -m 0644 ${S}/ubxtool.1 ${D}/${mandir}/man1 -} - -RDEPENDS_${PN}-conf += "bash" - -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 gpspipe gps-utils" - -# File does not exist: ${libdir}/libQgpsmm.prl -FILES_${PN}-dev += "${libdir}/pkgconfdir/libgpsd.pc ${libdir}/pkgconfdir/libgps.pc \ - ${libdir}/libQgpsmm.prl \ - ${includedir}/gps.h ${includedir}/libgpsmm.h ${includedir}/gps" - -FILES_${PN} += "${sbindir}/gpsd_*" - -FILES_python-pygps-dbg += " ${libdir}/python*/site-packages/gps/.debug" - -RDEPENDS_${PN} = "gpsd-gpsctl bash" - -# gpsd-udev is for USB, which we are not using -RRECOMMENDS_${PN} = "gpsd-conf gpsd-machine-conf" - -SUMMARY_${PN}-udev = "udev relevant files to use gpsd hotplugging" -FILES_${PN}-udev = "${base_libdir}/udev ${sysconfdir}/udev/*" -RDEPENDS_${PN}-udev += "eudev 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_${PN}-conf = "gpsd configuration files and init scripts" -FILES_${PN}-conf = "${sysconfdir}" -CONFFILES_${PN}-conf = "${sysconfdir}/default/gpsd.default" - -SUMMARY_${PN}-gpsctl = "Tool for tweaking GPS modes" -FILES_${PN}-gpsctl = "${bindir}/gpsctl" - -SUMMARY_gpspipe = "Tool to connectg to gpsd and retrieve sentences" -FILES_gpspipe = "${bindir}/gpspipe" - -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-io \ - python-threading \ - python-terminal \ - python-curses \ - gpsd \ - python-json" - -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "${BPN}.socket ${BPN}ctl@.service" - - -ALTERNATIVE_${PN} = "gpsd-defaults" -ALTERNATIVE_LINK_NAME[gpsd-defaults] = "${sysconfdir}/default/gpsd" -ALTERNATIVE_TARGET[gpsd-defaults] = "${sysconfdir}/default/gpsd.default" diff --git a/recipes-navigation/gpsd/gpsdupdater/bin/bldgpsd.sh b/recipes-navigation/gpsd/gpsdupdater/bin/bldgpsd.sh deleted file mode 100755 index aeedf67..0000000 --- a/recipes-navigation/gpsd/gpsdupdater/bin/bldgpsd.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/bash -# This program creates an installer bash script. -# To install you execute: -# bash gpsdipk.sh -# Files needed -# ~/lib/opkginstall.sh -# ~/lib/bashinstaller.sh -# -function usage -{ - echo 'bldgpsd [mlinuxdir]' 2>&1 - exit -} -function cleanup -{ - if [[ $tmpdir =~ ^/var/tmp/gpsdbld ]] ; then - rm -rf $tmpdir - fi -} -if (($# != 1)) ; then - usage -fi -trap cleanup exit -mlpath="$1" - - -fullpath=$(readlink ${mlpath}) -tmpdirtemplate=/var/tmp/gpsdbld.XXXXX -tmpdir=$(mktemp -d $tmpdirtemplate) -FLIST=\ -" -libpanelw5_*_arm926ejste.ipk -python-curses_*_arm926ejste.ipk -python-json_*_arm926ejste.ipk -libgps22_0*_arm926ejste.ipk -gpsd_*_arm926ejste.ipk -gpsd-conf_*_arm926ejste.ipk -gpsd-gpsctl_*_arm926ejste.ipk -gpsd-udev_*_arm926ejste.ipk -gps-utils_*_arm926ejste.ipk -python-pygps_*_arm926ejste.ipk -ntp_*_arm926ejste.ipk -ntp-utils_*_arm926ejste.ipk -ntp-tickadj_*_arm926ejste.ipk -busybox_*_arm926ejste.ipk -" -armpath=${mlpath}/build/tmp/deploy/ipk/arm926ejste -if ! [[ -d $armpath ]] ; then - echo $armpath does not exist. No files to save - exit 1 -fi -mkdir ${tmpdir}/packages -cp ~/lib/bashinstaller.sh $tmpdir/packages/gpsdipk.sh - -echo directory is $armpath -echo list is $FLIST -chmod +x ~/lib/bashinstaller.sh -(cd $armpath; cp ~/lib/opkginstall.sh . ; echo opkginstall.sh $FLIST | tr ' ' '\n' | cpio -ov -Hcrc >>${tmpdir}/packages/gpsdipk.sh ; rm opkginstall.sh) -mv ${tmpdir}/packages/gpsdipk.sh /var/tmp -echo installer is /var/tmp/gpsdipk.sh - diff --git a/recipes-navigation/gpsd/gpsdupdater/lib/bashinstaller.sh b/recipes-navigation/gpsd/gpsdupdater/lib/bashinstaller.sh deleted file mode 100755 index 8b04288..0000000 --- a/recipes-navigation/gpsd/gpsdupdater/lib/bashinstaller.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -echo "" -echo "Self Extracting Installer" -echo "" - -export TMPDIR=`mktemp -d /tmp/selfextract.XXXXXX` - -ARCHIVE=`awk '/^__ARCHIVE_BELOW__/ {print NR + 1; exit 0; }' $0` - -tail -n+$ARCHIVE $0 | (cd $TMPDIR; pwd; ls; cpio -ivdum) - -CDIR=`pwd` -cd $TMPDIR -./opkginstall.sh - -cd $CDIR - -#rm -rf $TMPDIR - -exit 0 - -__ARCHIVE_BELOW__ diff --git a/recipes-navigation/gpsd/gpsdupdater/lib/opkginstall.sh b/recipes-navigation/gpsd/gpsdupdater/lib/opkginstall.sh deleted file mode 100755 index d1c17ba..0000000 --- a/recipes-navigation/gpsd/gpsdupdater/lib/opkginstall.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -list="" -for f in *.ipk ; do - if [[ $f =~ ^busybox ]] ; then - continue - fi - [[ $f =~ ([^_]*) ]] && true - list+="${BASH_REMATCH[1]} " -done -list=$(echo $list | xargs) -echo $list -set -x -opkg --force-depends --force-remove --force-removal-of-dependent-packages remove $list -opkg install *.ipk -set +x diff --git a/recipes-navigation/gpsd/libgps24_3.18.1.bb b/recipes-navigation/gpsd/libgps24_3.18.1.bb deleted file mode 100644 index 8f1b811..0000000 --- a/recipes-navigation/gpsd/libgps24_3.18.1.bb +++ /dev/null @@ -1,142 +0,0 @@ -SUMMARY = "A TCP/IP Daemon simplifying the communication with GPS devices" -SECTION = "console/network" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800" -DEPENDS = "dbus dbus-glib ncurses python libusb1 chrpath-replacement-native pps-tools" -PROVIDES = "${PN} ${PN}-dbg ${PN}-dev" -PR="m5" -#BPN="gpsd" -#BP="${BPN}-${PV}" - -EXTRANATIVEPATH += "chrpath-native" -FILESEXTRAPATHS_prepend = "${THISDIR}/gpsd-${PV}:" -# sysclockcrash is fixed for gpsd -# suppress text in binary is fixed for gpsctl - -S = "${WORKDIR}/gpsd-${PV}" - -SRC_URI = "${SAVANNAH_GNU_MIRROR}/gpsd/gpsd-${PV}.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://0006-ubxtimelps.patch \ - file://0006-itu_r_tf_460_6.patch \ -" -SRC_URI[md5sum] = "3b11f26b295010666b1767b308f90bc5" -SRC_URI[sha256sum] = "5cb1e6d880ec9a52c62492dd0e3d77451b7c7ad625895bd652f6354215aec23e" - -inherit scons python-dir pythonnative systemd - -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}' \ - ashtech='no' \ - earthmate='no' \ - evermore='no' \ - fury='no' \ - fv18='no' \ - garmin='no' \ - garmintxt='no' \ - geostar='no' \ - greis='no' \ - itrax='no' \ - mtk3301='no' \ - navcom='no' \ - nmea0183='yes' \ - nmea2000='no' \ - oncore='no' \ - sirf='no' \ - skytraq='no' \ - superstar2='no' \ - tnt='no' \ - tripmate='no' \ - tsip='no' \ - ublox='yes' \ - ubloxtimels='yes' \ - aivdm='no' \ - gpsclock='no' \ - oceanserver='no' \ - libdir='${libdir}' \ - fixed_stop_bits='1' \ - pps='yes' \ - gpsd_group='gps' \ - ntpshm='yes' \ - prefix='usr' \ - ${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}" - install -d 755 ${D}${libdir} - install libgps.so.24.* ${D}${libdir} - cp -a libgps.so.24 ${D}${libdir} - (cd ${D}${libdir};ln -sf libgps.so.24.* libgps.so) - - # support for dev (development) - mkdir -p -m 0644 ${D}/${includedir}/gps - install -m 0644 ${S}/gpsd.h ${D}/${includedir}/gps - install -m 0644 ${S}/os_compat.h ${D}/${includedir}/gps - install -m 0644 ${S}/revision.h ${D}/${includedir}/gps - install -m 0644 ${S}/gpsdclient.h ${D}/${includedir}/gps - install -m 0644 ${S}/gpsd_config.h ${D}/${includedir}/gps - install -m 0644 ${S}/compiler.h ${D}/${includedir}/gps - install -m 0644 ${S}/ppsthread.h ${D}/${includedir}/gps - install -m 0644 ${S}/gps.h ${D}/${includedir} - install -m 0644 ${S}/libgpsmm.h ${D}/${includedir} -} - - -FILES_${PN}-dev_append = " ${includedir}/gps.h ${includedir}/libgpsmm.h ${includedir}/gps ${libdir}/libgps.so" -FILES_${PN}-dev_remove = "${includedir} ${FILES_SOLIBSDEV} \ - ${libdir}/*.la ${libdir}/*.o ${libdir}/pkgconfig \ - ${datadir}/pkgconfig ${datadir}/aclocal \ - ${base_libdir}/*.o ${libdir}/${BPN}/*.la ${base_libdir}/*.la" - -SUMMARY_${PN}-dbg = "Debug the C service library used for communicating with gpsd" -PACKAGES = "${PN} ${PN}-dbg ${PN}-dev" - -FILES_${PN}-dbg_replace = "${prefix}/src/* ${libdir}/.debug/*" - -SUMMARY_${PN} = "C service library used for communicating with gpsd" - -RDEPENDS_${PN} += "dbus-lib" - -FILES_${PN}_append = " ${libdir}/libgps.so.* " -FILES_${PN}_remove = "${bindir}/* ${sbindir}/* ${libexecdir}/* \ - ${libdir}/lib*${SOLIBS} ${sysconfdir} ${sharedstatedir} \ - ${localstatedir} ${base_bindir}/* ${base_sbindir}/* \ - ${base_libdir}/*${SOLIBS} ${base_prefix}/lib/udev \ - ${prefix}/lib/udev ${base_libdir}/udev ${libdir}/udev \ - ${datadir}/${BPN} ${libdir}/${BPN}/* ${datadir}/pixmaps \ - ${datadir}/applications ${datadir}/idl ${datadir}/omf \ - ${datadir}/sounds ${libdir}/bonobo/servers \ -" diff --git a/recipes-navigation/gpsd/libgps24_3.18.1.bb.old b/recipes-navigation/gpsd/libgps24_3.18.1.bb.old deleted file mode 100644 index 8f1b811..0000000 --- a/recipes-navigation/gpsd/libgps24_3.18.1.bb.old +++ /dev/null @@ -1,142 +0,0 @@ -SUMMARY = "A TCP/IP Daemon simplifying the communication with GPS devices" -SECTION = "console/network" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800" -DEPENDS = "dbus dbus-glib ncurses python libusb1 chrpath-replacement-native pps-tools" -PROVIDES = "${PN} ${PN}-dbg ${PN}-dev" -PR="m5" -#BPN="gpsd" -#BP="${BPN}-${PV}" - -EXTRANATIVEPATH += "chrpath-native" -FILESEXTRAPATHS_prepend = "${THISDIR}/gpsd-${PV}:" -# sysclockcrash is fixed for gpsd -# suppress text in binary is fixed for gpsctl - -S = "${WORKDIR}/gpsd-${PV}" - -SRC_URI = "${SAVANNAH_GNU_MIRROR}/gpsd/gpsd-${PV}.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://0006-ubxtimelps.patch \ - file://0006-itu_r_tf_460_6.patch \ -" -SRC_URI[md5sum] = "3b11f26b295010666b1767b308f90bc5" -SRC_URI[sha256sum] = "5cb1e6d880ec9a52c62492dd0e3d77451b7c7ad625895bd652f6354215aec23e" - -inherit scons python-dir pythonnative systemd - -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}' \ - ashtech='no' \ - earthmate='no' \ - evermore='no' \ - fury='no' \ - fv18='no' \ - garmin='no' \ - garmintxt='no' \ - geostar='no' \ - greis='no' \ - itrax='no' \ - mtk3301='no' \ - navcom='no' \ - nmea0183='yes' \ - nmea2000='no' \ - oncore='no' \ - sirf='no' \ - skytraq='no' \ - superstar2='no' \ - tnt='no' \ - tripmate='no' \ - tsip='no' \ - ublox='yes' \ - ubloxtimels='yes' \ - aivdm='no' \ - gpsclock='no' \ - oceanserver='no' \ - libdir='${libdir}' \ - fixed_stop_bits='1' \ - pps='yes' \ - gpsd_group='gps' \ - ntpshm='yes' \ - prefix='usr' \ - ${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}" - install -d 755 ${D}${libdir} - install libgps.so.24.* ${D}${libdir} - cp -a libgps.so.24 ${D}${libdir} - (cd ${D}${libdir};ln -sf libgps.so.24.* libgps.so) - - # support for dev (development) - mkdir -p -m 0644 ${D}/${includedir}/gps - install -m 0644 ${S}/gpsd.h ${D}/${includedir}/gps - install -m 0644 ${S}/os_compat.h ${D}/${includedir}/gps - install -m 0644 ${S}/revision.h ${D}/${includedir}/gps - install -m 0644 ${S}/gpsdclient.h ${D}/${includedir}/gps - install -m 0644 ${S}/gpsd_config.h ${D}/${includedir}/gps - install -m 0644 ${S}/compiler.h ${D}/${includedir}/gps - install -m 0644 ${S}/ppsthread.h ${D}/${includedir}/gps - install -m 0644 ${S}/gps.h ${D}/${includedir} - install -m 0644 ${S}/libgpsmm.h ${D}/${includedir} -} - - -FILES_${PN}-dev_append = " ${includedir}/gps.h ${includedir}/libgpsmm.h ${includedir}/gps ${libdir}/libgps.so" -FILES_${PN}-dev_remove = "${includedir} ${FILES_SOLIBSDEV} \ - ${libdir}/*.la ${libdir}/*.o ${libdir}/pkgconfig \ - ${datadir}/pkgconfig ${datadir}/aclocal \ - ${base_libdir}/*.o ${libdir}/${BPN}/*.la ${base_libdir}/*.la" - -SUMMARY_${PN}-dbg = "Debug the C service library used for communicating with gpsd" -PACKAGES = "${PN} ${PN}-dbg ${PN}-dev" - -FILES_${PN}-dbg_replace = "${prefix}/src/* ${libdir}/.debug/*" - -SUMMARY_${PN} = "C service library used for communicating with gpsd" - -RDEPENDS_${PN} += "dbus-lib" - -FILES_${PN}_append = " ${libdir}/libgps.so.* " -FILES_${PN}_remove = "${bindir}/* ${sbindir}/* ${libexecdir}/* \ - ${libdir}/lib*${SOLIBS} ${sysconfdir} ${sharedstatedir} \ - ${localstatedir} ${base_bindir}/* ${base_sbindir}/* \ - ${base_libdir}/*${SOLIBS} ${base_prefix}/lib/udev \ - ${prefix}/lib/udev ${base_libdir}/udev ${libdir}/udev \ - ${datadir}/${BPN} ${libdir}/${BPN}/* ${datadir}/pixmaps \ - ${datadir}/applications ${datadir}/idl ${datadir}/omf \ - ${datadir}/sounds ${libdir}/bonobo/servers \ -" -- cgit v1.2.3