summaryrefslogtreecommitdiff
path: root/recipes-core
diff options
context:
space:
mode:
authorJohn Klug <john.klug@multitech.com>2016-11-14 10:55:07 -0600
committerJohn Klug <john.klug@multitech.com>2016-11-14 10:55:07 -0600
commit8d0f0fb4b86062bbd1dbaf8d4ea3640b97ae5a58 (patch)
tree9657575460c7c804f51c97063cb1722a49ef0654 /recipes-core
parent5b47b6c343c9421a7b6b59328ff8cbf85b0066af (diff)
downloadmeta-mlinux-8d0f0fb4b86062bbd1dbaf8d4ea3640b97ae5a58.tar.gz
meta-mlinux-8d0f0fb4b86062bbd1dbaf8d4ea3640b97ae5a58.tar.bz2
meta-mlinux-8d0f0fb4b86062bbd1dbaf8d4ea3640b97ae5a58.zip
Remove Redpine from the base mLinux image
Diffstat (limited to 'recipes-core')
-rw-r--r--recipes-core/images/mlinux-base-image.bb4
-rw-r--r--recipes-core/images/mlinux-factory-image.bb1
-rw-r--r--recipes-core/images/mlinux-rs9113-base-image.bb (renamed from recipes-core/images/mlinux-xrs9113-base-image.bb)4
-rw-r--r--recipes-core/images/mlinux-rs9113-factory-image.bb (renamed from recipes-core/images/mlinux-xrs9113-factory-image.bb)3
4 files changed, 6 insertions, 6 deletions
diff --git a/recipes-core/images/mlinux-base-image.bb b/recipes-core/images/mlinux-base-image.bb
index 6423237..6b19725 100644
--- a/recipes-core/images/mlinux-base-image.bb
+++ b/recipes-core/images/mlinux-base-image.bb
@@ -1,3 +1,4 @@
+# Conduit 0.0 or 0.1 without RS9113
DESCRIPTION = "mLinux base image"
LICENSE = "MIT"
@@ -51,10 +52,9 @@ MULTITECH_FEATURES += " \
reset-handler \
radio-cmd radio-query \
jsparser \
- annex-client \
"
-MISC_FEATURES = "minicom lrzsz nano rs9113"
+MISC_FEATURES = "minicom lrzsz nano"
# Extra stuff to install
IMAGE_INSTALL += " \
diff --git a/recipes-core/images/mlinux-factory-image.bb b/recipes-core/images/mlinux-factory-image.bb
index 8cf6ad2..0f8344e 100644
--- a/recipes-core/images/mlinux-factory-image.bb
+++ b/recipes-core/images/mlinux-factory-image.bb
@@ -1,3 +1,4 @@
+# Conduit 0.0 or 0.1 without RS9113
require mlinux-base-image.bb
LIGHTTPD = "lighttpd \
diff --git a/recipes-core/images/mlinux-xrs9113-base-image.bb b/recipes-core/images/mlinux-rs9113-base-image.bb
index 6b19725..6423237 100644
--- a/recipes-core/images/mlinux-xrs9113-base-image.bb
+++ b/recipes-core/images/mlinux-rs9113-base-image.bb
@@ -1,4 +1,3 @@
-# Conduit 0.0 or 0.1 without RS9113
DESCRIPTION = "mLinux base image"
LICENSE = "MIT"
@@ -52,9 +51,10 @@ MULTITECH_FEATURES += " \
reset-handler \
radio-cmd radio-query \
jsparser \
+ annex-client \
"
-MISC_FEATURES = "minicom lrzsz nano"
+MISC_FEATURES = "minicom lrzsz nano rs9113"
# Extra stuff to install
IMAGE_INSTALL += " \
diff --git a/recipes-core/images/mlinux-xrs9113-factory-image.bb b/recipes-core/images/mlinux-rs9113-factory-image.bb
index c536553..bf2beaa 100644
--- a/recipes-core/images/mlinux-xrs9113-factory-image.bb
+++ b/recipes-core/images/mlinux-rs9113-factory-image.bb
@@ -1,5 +1,4 @@
-# Conduit 0.0 or 0.1 without RS9113
-require mlinux-xrs9113-base-image.bb
+require mlinux-rs9113-base-image.bb
LIGHTTPD = "lighttpd \
lighttpd-module-cgi lighttpd-module-indexfile \