diff options
| author | Jason Reiss <jreiss@multitech.com> | 2016-11-10 12:58:37 -0600 |
|---|---|---|
| committer | Jason Reiss <jreiss@multitech.com> | 2016-11-10 12:58:37 -0600 |
| commit | e093123ceafca8eb6d8d041e0ad09f67d1202c73 (patch) | |
| tree | 009fbbbb4c6ece6b88f5006d78a8d2ab85a835f4 /recipes-core/images | |
| parent | 75fd65e9f52aeea9ab27b4af85c1fa8b093e5be3 (diff) | |
| parent | 38ded95350a89cae973df774242e3c35e98784d8 (diff) | |
| download | meta-mlinux-e093123ceafca8eb6d8d041e0ad09f67d1202c73.tar.gz meta-mlinux-e093123ceafca8eb6d8d041e0ad09f67d1202c73.tar.bz2 meta-mlinux-e093123ceafca8eb6d8d041e0ad09f67d1202c73.zip | |
merge: Conduit_0.1 changes into master
lora: update lora-network-server to 1.0.16
Diffstat (limited to 'recipes-core/images')
| -rw-r--r-- | recipes-core/images/mlinux-base-image.bb | 1 | ||||
| -rw-r--r-- | recipes-core/images/mlinux-mtcap-debug-image.bb | 13 | ||||
| -rw-r--r-- | recipes-core/images/mlinux-mtcap-image.bb (renamed from recipes-core/images/mlinux-picocell-image.bb) | 4 | ||||
| -rw-r--r-- | recipes-core/images/mlinux-picocell-debug-image.bb | 10 |
4 files changed, 17 insertions, 11 deletions
diff --git a/recipes-core/images/mlinux-base-image.bb b/recipes-core/images/mlinux-base-image.bb index 35a58a9..6423237 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 rs9113" 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-picocell-image.bb b/recipes-core/images/mlinux-mtcap-image.bb index 49670a9..610fe08 100644 --- a/recipes-core/images/mlinux-picocell-image.bb +++ b/recipes-core/images/mlinux-mtcap-image.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "mLinux PicoCell image" +DESCRIPTION = "mLinux Conduit Access Point image" require mlinux-minimal-image.bb @@ -32,6 +32,8 @@ MULTITECH_FEATURES += " \ reset-handler \ radio-cmd radio-query \ jsparser \ + protobuf \ + annex-client \ " LORA_FEATURES = "lora-packet-forwarder \ 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 9ae7ea7..0000000 --- a/recipes-core/images/mlinux-picocell-debug-image.bb +++ /dev/null @@ -1,10 +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" - |