Fix up mtr/mtrv1 to use _append Yocto feature

2 files changed, 22 insertions, 9 deletions

diff --git a/recipes-core/images/mlinux-mtr-image.bb b/recipes-core/images/mlinux-mtr-image.bb
index baa2aef..fbf2765 100644
--- a/recipes-core/images/mlinux-mtr-image.bb
+++ b/recipes-core/images/mlinux-mtr-image.bb
@@ -3,6 +3,7 @@ DESCRIPTION = "mLinux base mtr image"
 LICENSE = "MIT"
 
 require mlinux-minimal-image.bb
+MULTITECH_MTAC = ""
 
 CONSOLE = "sysvinit-inittab-start-open"
 
@@ -18,6 +19,7 @@ FILESYSTEM_FEATURES = "dosfstools \
                  "
 
 NETWORKING_FEATURES_append = " bridge-utils \
+                       dnsmasq \
                        inetutils-ftp \
                        openssl \
                        rsync \
@@ -38,7 +40,7 @@ WIFI_FEATURES = " \
                 hostapd-cfg \
                 "
 
-BLUETOOTH_FEATURES = "bluez5"
+BLUETOOTH_FEATURES = "bluez5 bluez5-pand"
 
 # Add all timezones available
 # ntpdate will sync time every 30 min by default via cron
@@ -66,6 +68,10 @@ MULTITECH_FEATURES_append = " \
 MISC_FEATURES = "minicom lrzsz nano"
 
 # Extra stuff to install
+IMAGE_INSTALL_append = "ti-wifi-utils wl12xx-firmware"
+IMAGE_INSTALL_append = "gpsd libgps libgps24 ntp ntp-utils gpspipe gps-utils"
+IMAGE_INSTALL_append = "uxfp"
+
 IMAGE_INSTALL_append = " \
 				${TEST_FEATURES} \
 				${WIFI_FEATURES} \
diff --git a/recipes-core/images/mlinux-rs9113-mtrv1-image.bb b/recipes-core/images/mlinux-rs9113-mtrv1-image.bb
index da5632c..23a9052 100644
--- a/recipes-core/images/mlinux-rs9113-mtrv1-image.bb
+++ b/recipes-core/images/mlinux-rs9113-mtrv1-image.bb
@@ -5,17 +5,24 @@ LICENSE = "MIT"
 require mlinux-minimal-image.bb
 MULTITECH_MTAC = ""
 
+CONSOLE = "sysvinit-inittab-start-open"
+
+TEST_FEATURES = "i2c-tools \
+                  spitools \
+                  strace \
+                  devmem2 \
+                 "
+
 FILESYSTEM_FEATURES = "dosfstools \
                  cifs-utils \
 				 lsof \
                  "
 
-NETWORKING_FEATURES += "bridge-utils \
+NETWORKING_FEATURES_append = " bridge-utils \
                        dnsmasq \
                        inetutils-ftp \
                        openssl \
                        rsync \
-                       iperf2 \
                        iperf3 \
 					   mii-diag \
 					   tcpdump \
@@ -50,7 +57,7 @@ TIME_FEATURES = "tzdata tzdata-africa tzdata-americas tzdata-antarctica tzdata-a
 # radio-cmd: supports cellular radio activation and other configuration commands
 # radio-query: queries cellular radio for common info (IMEI, RSSI, etc)
 # jsparser: command line tool to parse JSON files
-MULTITECH_FEATURES += " \
+MULTITECH_FEATURES_append = " \
                      u-boot-linux-utils \
                      mlinux-scripts \
 					 reset-handler \
@@ -61,12 +68,12 @@ MULTITECH_FEATURES += " \
 MISC_FEATURES = "minicom lrzsz nano pps-tools"
 
 # Extra stuff to install
-IMAGE_INSTALL += "kernel-module-rs9113 rs9113rf rs9113-util rs9113-utils-extra rs9113-misc rs9113-autostart"
-IMAGE_INSTALL += "gpsd libgps libgps24 ntp ntp-utils gpspipe gps-utils"
-IMAGE_INSTALL += "uxfp"
-CONSOLE = "sysvinit-inittab-start-open"
+IMAGE_INSTALL_append = "kernel-module-rs9113 rs9113rf rs9113-util rs9113-utils-extra rs9113-misc rs9113-autostart"
+IMAGE_INSTALL_append = "gpsd libgps libgps24 ntp ntp-utils gpspipe gps-utils"
+IMAGE_INSTALL_append = "uxfp"
 
-IMAGE_INSTALL += " \
+IMAGE_INSTALL_append = " \
+				${TEST_FEATURES} \
 				${WIFI_FEATURES} \
 				${BLUETOOTH_FEATURES} \
 				${FILESYSTEM_FEATURES} \