From 2e67432120b62215596fb2cf1a9e1c921e6d4207 Mon Sep 17 00:00:00 2001 From: Brandon Bayer Date: Tue, 1 Nov 2016 09:41:25 -0500 Subject: mtp: add nodejs to debug image --- recipes-core/images/mlinux-picocell-debug-image.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'recipes-core') diff --git a/recipes-core/images/mlinux-picocell-debug-image.bb b/recipes-core/images/mlinux-picocell-debug-image.bb index 9ae7ea7..7975b8d 100644 --- a/recipes-core/images/mlinux-picocell-debug-image.bb +++ b/recipes-core/images/mlinux-picocell-debug-image.bb @@ -6,5 +6,8 @@ require mlinux-picocell-image.bb IMAGE_INSTALL += "lora-network-server-mtp \ lora-gateway-utils \ lora-query \ - mosquitto mosquitto-clients" + mosquitto mosquitto-clients \ + nodejs + nodejs-npm + " -- cgit v1.2.3 From a4442e19bdf376f043521eee6b71e1f4e506e3fc Mon Sep 17 00:00:00 2001 From: Brandon Bayer Date: Tue, 1 Nov 2016 09:55:50 -0500 Subject: mtp:fix: image syntax --- recipes-core/images/mlinux-picocell-debug-image.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'recipes-core') diff --git a/recipes-core/images/mlinux-picocell-debug-image.bb b/recipes-core/images/mlinux-picocell-debug-image.bb index 7975b8d..f77685b 100644 --- a/recipes-core/images/mlinux-picocell-debug-image.bb +++ b/recipes-core/images/mlinux-picocell-debug-image.bb @@ -7,7 +7,7 @@ IMAGE_INSTALL += "lora-network-server-mtp \ lora-gateway-utils \ lora-query \ mosquitto mosquitto-clients \ - nodejs - nodejs-npm + nodejs \ + nodejs-npm \ " -- cgit v1.2.3 From 961165c078505e47405a974bd771032557072776 Mon Sep 17 00:00:00 2001 From: Brandon Bayer Date: Tue, 1 Nov 2016 16:05:17 -0500 Subject: mtcap: rename machine type mtp to mtcap --- recipes-core/base-files/base-files/mtcap/fstab | 9 ++++ recipes-core/base-files/base-files/mtp/fstab | 9 ---- recipes-core/base-files/base-files_3.0.14.bbappend | 2 +- recipes-core/images/mlinux-mtcap-debug-image.bb | 13 ++++++ recipes-core/images/mlinux-mtcap-image.bb | 52 ++++++++++++++++++++++ recipes-core/images/mlinux-picocell-debug-image.bb | 13 ------ recipes-core/images/mlinux-picocell-image.bb | 52 ---------------------- recipes-core/udev/udev-182/mtcap/mtcap.rules | 8 ++++ recipes-core/udev/udev-182/mtp/mtp.rules | 8 ---- 9 files changed, 83 insertions(+), 83 deletions(-) create mode 100644 recipes-core/base-files/base-files/mtcap/fstab delete mode 100644 recipes-core/base-files/base-files/mtp/fstab create mode 100644 recipes-core/images/mlinux-mtcap-debug-image.bb create mode 100644 recipes-core/images/mlinux-mtcap-image.bb delete mode 100644 recipes-core/images/mlinux-picocell-debug-image.bb delete mode 100644 recipes-core/images/mlinux-picocell-image.bb create mode 100644 recipes-core/udev/udev-182/mtcap/mtcap.rules delete mode 100644 recipes-core/udev/udev-182/mtp/mtp.rules (limited to 'recipes-core') diff --git a/recipes-core/base-files/base-files/mtcap/fstab b/recipes-core/base-files/base-files/mtcap/fstab new file mode 100644 index 0000000..01b5f38 --- /dev/null +++ b/recipes-core/base-files/base-files/mtcap/fstab @@ -0,0 +1,9 @@ +rootfs / auto defaults 1 1 +proc /proc proc defaults 0 0 +devpts /dev/pts devpts mode=0620,gid=5 0 0 +usbdevfs /proc/bus/usb usbdevfs noauto 0 0 +tmpfs /run tmpfs mode=0755,nodev,nosuid,strictatime 0 0 +tmpfs /var/volatile tmpfs defaults 0 0 + +/dev/mtdblock6 /var/config jffs2 defaults 0 0 +/dev/mtdblock7 /var/oem jffs2 defaults,ro 0 0 diff --git a/recipes-core/base-files/base-files/mtp/fstab b/recipes-core/base-files/base-files/mtp/fstab deleted file mode 100644 index 01b5f38..0000000 --- a/recipes-core/base-files/base-files/mtp/fstab +++ /dev/null @@ -1,9 +0,0 @@ -rootfs / auto defaults 1 1 -proc /proc proc defaults 0 0 -devpts /dev/pts devpts mode=0620,gid=5 0 0 -usbdevfs /proc/bus/usb usbdevfs noauto 0 0 -tmpfs /run tmpfs mode=0755,nodev,nosuid,strictatime 0 0 -tmpfs /var/volatile tmpfs defaults 0 0 - -/dev/mtdblock6 /var/config jffs2 defaults 0 0 -/dev/mtdblock7 /var/oem jffs2 defaults,ro 0 0 diff --git a/recipes-core/base-files/base-files_3.0.14.bbappend b/recipes-core/base-files/base-files_3.0.14.bbappend index f1ab005..0f0ae4f 100644 --- a/recipes-core/base-files/base-files_3.0.14.bbappend +++ b/recipes-core/base-files/base-files_3.0.14.bbappend @@ -1,7 +1,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}" media_card="/media/card" -media_card_mtp="" +media_card_mtcap="" # add SD card dir dirs755_append = " ${media_card}" diff --git a/recipes-core/images/mlinux-mtcap-debug-image.bb b/recipes-core/images/mlinux-mtcap-debug-image.bb new file mode 100644 index 0000000..48009ae --- /dev/null +++ b/recipes-core/images/mlinux-mtcap-debug-image.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "mLinux Conduit Access Point debug image" + +require mlinux-mtcap-image.bb + +# Extra stuff to install +IMAGE_INSTALL += "lora-network-server-mtcap \ + lora-gateway-utils \ + lora-query \ + mosquitto mosquitto-clients \ + nodejs \ + nodejs-npm \ + " + diff --git a/recipes-core/images/mlinux-mtcap-image.bb b/recipes-core/images/mlinux-mtcap-image.bb new file mode 100644 index 0000000..ad60705 --- /dev/null +++ b/recipes-core/images/mlinux-mtcap-image.bb @@ -0,0 +1,52 @@ +DESCRIPTION = "mLinux Conduit Access Point image" + +require mlinux-minimal-image.bb + +FILESYSTEM_FEATURES = "dosfstools \ + cifs-utils \ + lsof \ + " + +NETWORKING_FEATURES += "bridge-utils \ + inetutils-ftp \ + openssl \ + rsync \ + iperf \ + mii-diag \ + tcpdump \ + netcat \ + wget \ + strongswan \ + " + +TIME_FEATURES = "tzdata tzdata-africa tzdata-americas tzdata-antarctica tzdata-arctic \ + tzdata-asia tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific \ + tzdata-misc \ + cronie \ + ntpdate \ + " + +MULTITECH_FEATURES += " \ + u-boot-linux-utils \ + mlinux-scripts \ + reset-handler \ + radio-cmd radio-query \ + jsparser \ + " + +LORA_FEATURES = "lora-packet-forwarder \ + lora-packet-forwarder-dbg \ + lora-gateway-utils" + +MISC_FEATURES = "minicom lrzsz nano" + +# Extra stuff to install +IMAGE_INSTALL += " \ + ${FILESYSTEM_FEATURES} \ + ${TIME_FEATURES} \ + ${LORA_FEATURES} \ + ${MISC_FEATURES} \ + " + +# Multi-Tech SMS Utility (see http://git.multitech.net) +IMAGE_INSTALL += "sms-utils" diff --git a/recipes-core/images/mlinux-picocell-debug-image.bb b/recipes-core/images/mlinux-picocell-debug-image.bb deleted file mode 100644 index f77685b..0000000 --- a/recipes-core/images/mlinux-picocell-debug-image.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "mLinux PicoCell debug image" - -require mlinux-picocell-image.bb - -# Extra stuff to install -IMAGE_INSTALL += "lora-network-server-mtp \ - lora-gateway-utils \ - lora-query \ - mosquitto mosquitto-clients \ - nodejs \ - nodejs-npm \ - " - diff --git a/recipes-core/images/mlinux-picocell-image.bb b/recipes-core/images/mlinux-picocell-image.bb deleted file mode 100644 index 49670a9..0000000 --- a/recipes-core/images/mlinux-picocell-image.bb +++ /dev/null @@ -1,52 +0,0 @@ -DESCRIPTION = "mLinux PicoCell image" - -require mlinux-minimal-image.bb - -FILESYSTEM_FEATURES = "dosfstools \ - cifs-utils \ - lsof \ - " - -NETWORKING_FEATURES += "bridge-utils \ - inetutils-ftp \ - openssl \ - rsync \ - iperf \ - mii-diag \ - tcpdump \ - netcat \ - wget \ - strongswan \ - " - -TIME_FEATURES = "tzdata tzdata-africa tzdata-americas tzdata-antarctica tzdata-arctic \ - tzdata-asia tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific \ - tzdata-misc \ - cronie \ - ntpdate \ - " - -MULTITECH_FEATURES += " \ - u-boot-linux-utils \ - mlinux-scripts \ - reset-handler \ - radio-cmd radio-query \ - jsparser \ - " - -LORA_FEATURES = "lora-packet-forwarder \ - lora-packet-forwarder-dbg \ - lora-gateway-utils" - -MISC_FEATURES = "minicom lrzsz nano" - -# Extra stuff to install -IMAGE_INSTALL += " \ - ${FILESYSTEM_FEATURES} \ - ${TIME_FEATURES} \ - ${LORA_FEATURES} \ - ${MISC_FEATURES} \ - " - -# Multi-Tech SMS Utility (see http://git.multitech.net) -IMAGE_INSTALL += "sms-utils" diff --git a/recipes-core/udev/udev-182/mtcap/mtcap.rules b/recipes-core/udev/udev-182/mtcap/mtcap.rules new file mode 100644 index 0000000..a0dc9fb --- /dev/null +++ b/recipes-core/udev/udev-182/mtcap/mtcap.rules @@ -0,0 +1,8 @@ +ACTION=="remove", GOTO="mlinux_end" +SUBSYSTEM!="tty", GOTO="mlinux_end" +KERNEL!="ttyXRUSB[0-9]*", GOTO="mlinux_end" + +SUBSYSTEMS=="usb", ENV{ID_IFACE}="$attr{bInterfaceNumber}" +ENV{ID_IFACE}=="", GOTO="mlinux_end" + +LABEL="mlinux_end" diff --git a/recipes-core/udev/udev-182/mtp/mtp.rules b/recipes-core/udev/udev-182/mtp/mtp.rules deleted file mode 100644 index a0dc9fb..0000000 --- a/recipes-core/udev/udev-182/mtp/mtp.rules +++ /dev/null @@ -1,8 +0,0 @@ -ACTION=="remove", GOTO="mlinux_end" -SUBSYSTEM!="tty", GOTO="mlinux_end" -KERNEL!="ttyXRUSB[0-9]*", GOTO="mlinux_end" - -SUBSYSTEMS=="usb", ENV{ID_IFACE}="$attr{bInterfaceNumber}" -ENV{ID_IFACE}=="", GOTO="mlinux_end" - -LABEL="mlinux_end" -- cgit v1.2.3 From 5e1da7aeca498961c20147c356990752a4cb2d87 Mon Sep 17 00:00:00 2001 From: Brandon Bayer Date: Thu, 3 Nov 2016 09:34:32 -0500 Subject: fix: remove lora-network-server-usb from build --- recipes-core/images/mlinux-factory-image.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-core') diff --git a/recipes-core/images/mlinux-factory-image.bb b/recipes-core/images/mlinux-factory-image.bb index 9cf9b06..2a3bef4 100644 --- a/recipes-core/images/mlinux-factory-image.bb +++ b/recipes-core/images/mlinux-factory-image.bb @@ -20,7 +20,7 @@ IMAGE_INSTALL += "autossh" IMAGE_INSTALL += "monit" # LoRa support (MTAC-LORA accessory card) -IMAGE_INSTALL += "lora-gateway-utils lora-gateway-usb-utils lora-network-server lora-query lora-packet-forwarder-usb" +IMAGE_INSTALL += "lora-gateway-utils lora-gateway-usb-utils lora-network-server lora-query lora-packet-forwarder" # MQTT server IMAGE_INSTALL += "mosquitto mosquitto-clients" -- cgit v1.2.3 From 4d6aefceec69079f3069440f6a9d2f3ea30aee89 Mon Sep 17 00:00:00 2001 From: Brandon Bayer Date: Wed, 26 Oct 2016 15:40:35 -0500 Subject: feat: add annex-client --- recipes-core/annex-client/annex-client-from-src.bb | 27 ++++++++++++++ recipes-core/annex-client/annex-client.bb | 29 +++++++++++++++ .../annex-client/annex-client/annex-client.init | 43 ++++++++++++++++++++++ recipes-core/annex-proto/annex-proto.bb | 24 ++++++++++++ recipes-core/images/mlinux-base-image.bb | 1 + recipes-core/images/mlinux-mtcap-image.bb | 2 + 6 files changed, 126 insertions(+) create mode 100644 recipes-core/annex-client/annex-client-from-src.bb create mode 100644 recipes-core/annex-client/annex-client.bb create mode 100644 recipes-core/annex-client/annex-client/annex-client.init create mode 100644 recipes-core/annex-proto/annex-proto.bb (limited to 'recipes-core') diff --git a/recipes-core/annex-client/annex-client-from-src.bb b/recipes-core/annex-client/annex-client-from-src.bb new file mode 100644 index 0000000..ee7dee9 --- /dev/null +++ b/recipes-core/annex-client/annex-client-from-src.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "Provides the Multi-Tech MDM client" +SECTION = "remote-management" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" +PROVIDES = "annex-client-from-src" +DEPENDS = "jsoncpp curl protobuf cyrus-sasl protobuf-native annex-proto mts-io" + +PR = "r0" +SRCREV = "a696a7660bf153fec126cf971442c60961c51782" + +SRC_URI = "git://git@${MTS_INTERNAL_GIT}/multitech/annex-client.git;protocol=ssh;branch=master" + +S = "${WORKDIR}/git" + +do_compile() { + echo "directory: `pwd`" + mkdir -p annex_pb + cp ${STAGING_DIR_NATIVE}/annex.proto annex_pb/ + make all CFLAGS+="-DMLINUX_BUILD" +} + +# IMPORTANT NOTE: +# this recipe is only used for the annex-client Jenkin's job to build IPK. +# annex-client.bb is used to install the binary in an image +do_install() { + oe_runmake install DESTDIR=${D} SUBDIRS="src" +} diff --git a/recipes-core/annex-client/annex-client.bb b/recipes-core/annex-client/annex-client.bb new file mode 100644 index 0000000..1a0544a --- /dev/null +++ b/recipes-core/annex-client/annex-client.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "Provides the Multi-Tech MDM client" +SECTION = "remote-management" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" +PROVIDES = "annex-client" + +# NOTE: annex-client binary is built with Jenkin's job using annex-client-from-src.bb +# To update this, manually copy ipk from Jenkin's job to .net/downloads/ +PR = "r0" +SRC_URI = "http://multitech.net/downloads/annex-client-from-src_${PV}-${PR}.0_${TUNE_PKGARCH}.ipk \ + file://annex-client.init \ +" + +SRC_URI[md5sum] = "b17462ba3883df6a06b226b37a523eba" +SRC_URI[sha256sum] = "be903e7e27ad34832cb8045ef805f4e226aa6e254a3c995c5e61a0a9197a95b0" + +#inherit update-rc.d +# +#INITSCRIPT_NAME = "annex-client" +#INITSCRIPT_PARAMS = "defaults 95 1" +S = "${WORKDIR}" + +do_install() { + install -d ${D}${sbindir} + install -m 755 sbin/annexcd ${D}${sbindir} + + install -d ${D}${sysconfdir}/init.d + install -m 755 ${WORKDIR}/annex-client.init ${D}${sysconfdir}/init.d/annex-client +} diff --git a/recipes-core/annex-client/annex-client/annex-client.init b/recipes-core/annex-client/annex-client/annex-client.init new file mode 100644 index 0000000..4a5dc4b --- /dev/null +++ b/recipes-core/annex-client/annex-client/annex-client.init @@ -0,0 +1,43 @@ +#!/bin/bash + +MONITOR="/sbin/monitor-annexcd" +CLIENT="annexcd" + +start() { + if [[ $(pidof -x $MONITOR) ]]; then + echo "RM client is already running" + else + echo "Starting RM client" + $MONITOR & + fi +} + +stop() { + MONITOR_PID=$(pidof -x $MONITOR) + CLIENT_PID=$(pidof $CLIENT) + if [[ $MONITOR_PID ]]; then + echo "Stopping RM client" + kill $MONITOR_PID $CLIENT_PID + else + echo "RM client is not running" + fi +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart) + stop + start + ;; + *) + echo "Usage: /etc/init.d/annex-client {start|stop|restart}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/recipes-core/annex-proto/annex-proto.bb b/recipes-core/annex-proto/annex-proto.bb new file mode 100644 index 0000000..cbb6fb2 --- /dev/null +++ b/recipes-core/annex-proto/annex-proto.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "Provides the Multi-Tech MDM client protobuffer definitions" +SECTION = "remote-management" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" +PR = "r20" +PROVIDES = "annex_proto" +DEPENDS = "protobuf" +SRCREV = "7ad3f17a59d3fe564da099518310d61ad1304913" + +SRC_URI = "git://git@${MTS_INTERNAL_GIT}/annex/proto.git;protocol=ssh;branch=master \ +" +S = "${WORKDIR}/git" + +# don't use cli here +do_compile() { + echo "directory: `pwd`" +} + +do_install() { + install annex.proto ${STAGING_DIR_NATIVE} +} + + + diff --git a/recipes-core/images/mlinux-base-image.bb b/recipes-core/images/mlinux-base-image.bb index b90903a..84cead8 100644 --- a/recipes-core/images/mlinux-base-image.bb +++ b/recipes-core/images/mlinux-base-image.bb @@ -51,6 +51,7 @@ MULTITECH_FEATURES += " \ reset-handler \ radio-cmd radio-query \ jsparser \ + annex-client \ " MISC_FEATURES = "minicom lrzsz nano" diff --git a/recipes-core/images/mlinux-mtcap-image.bb b/recipes-core/images/mlinux-mtcap-image.bb index ad60705..610fe08 100644 --- a/recipes-core/images/mlinux-mtcap-image.bb +++ b/recipes-core/images/mlinux-mtcap-image.bb @@ -32,6 +32,8 @@ MULTITECH_FEATURES += " \ reset-handler \ radio-cmd radio-query \ jsparser \ + protobuf \ + annex-client \ " LORA_FEATURES = "lora-packet-forwarder \ -- cgit v1.2.3