From 28e920f4b0fc7e3467da646cb8b6c47711c3adb1 Mon Sep 17 00:00:00 2001 From: John Klug Date: Thu, 20 Aug 2020 17:21:58 -0500 Subject: use IMAGE_INSTALL_append_mtcdt (order of append, mtcdt) and remove mtbsp-at91 --- recipes-core/images/mlinux-factory-image.bb | 9 +++++++-- recipes-core/images/mlinux-factory-test-image.bb | 2 +- recipes-core/images/mlinux-minimal-image.bb | 9 +++++---- recipes-core/images/mlinux-rs9113-mtrv1-image.bb | 1 + 4 files changed, 14 insertions(+), 7 deletions(-) (limited to 'recipes-core') diff --git a/recipes-core/images/mlinux-factory-image.bb b/recipes-core/images/mlinux-factory-image.bb index 9c84cf0..aef0f2a 100644 --- a/recipes-core/images/mlinux-factory-image.bb +++ b/recipes-core/images/mlinux-factory-image.bb @@ -1,4 +1,9 @@ # Conduit 0.0 or 0.1 without RS9113 +# +# The correct syntax for a machine append is: +# VARIABLE_append_mtcdt +# append must be before the machine name. +# require mlinux-base-image.bb DESCRIPTION = "mLinux factory image" @@ -27,8 +32,8 @@ IMAGE_INSTALL_append = " monit" # LoRa support (MTAC-LORA accessory card) IMAGE_INSTALL_append = " lora-gateway-utils lora-query lora-network-server lora-packet-forwarder-usb" -IMAGE_INSTALL_mtcdt_append = " lora-gateway-geolocation-utils lora-packet-forwarder-geolocation" -IMAGE_INSTALL_mtbsp-at91_append = " mtac-xdot-util" +IMAGE_INSTALL_append_mtcdt = " lora-gateway-geolocation-utils lora-packet-forwarder-geolocation" +IMAGE_INSTALL_append_mtcdt = " mtac-xdot-util" # MQTT server IMAGE_INSTALL_append = " mosquitto mosquitto-clients" diff --git a/recipes-core/images/mlinux-factory-test-image.bb b/recipes-core/images/mlinux-factory-test-image.bb index 82ed75d..83a7752 100644 --- a/recipes-core/images/mlinux-factory-test-image.bb +++ b/recipes-core/images/mlinux-factory-test-image.bb @@ -1,7 +1,7 @@ DESCRIPTION = "mLinux factory test image" LICENSE = "MIT" -require mlinux-factory-image.bb +require mlinux-rs9113-factory-image.bb IMAGE_INSTALL_append = " i2c-tools spitools " #Open console for testing diff --git a/recipes-core/images/mlinux-minimal-image.bb b/recipes-core/images/mlinux-minimal-image.bb index 41829ec..65bd696 100644 --- a/recipes-core/images/mlinux-minimal-image.bb +++ b/recipes-core/images/mlinux-minimal-image.bb @@ -1,3 +1,6 @@ +# The correct syntax for a machine append is: +# VARIABLE_append_mtcdt +# append must be before the machine name. DESCRIPTION = "mLinux minimal image" LICENSE = "MIT" @@ -25,7 +28,7 @@ CORE_FEATURES_append = " \ mts-io-sysfs \ " -CORE_FEATURES_append_mtbsp-at91 = " mtd-utils mtd-utils-jffs2 fstab-at91" +CORE_FEATURES_append = " mtd-utils mtd-utils-jffs2 fstab-at91" NETWORKING_FEATURES = "ppp curl iproute2 \ iptables iputils \ @@ -63,9 +66,7 @@ MULTITECH_MTAC_append_mtcdt = " \ MULTITECH_BB = "" -# BSP SPECIFIC UPGRADE FEATURES -UPGRADE_FEATURES = "" -UPGRADE_FEATURES_mtbsp-at91 = "mtd-utils-static" +UPGRADE_FEATURES = "mtd-utils-static" CONSOLE = "sysvinit-inittab-start" diff --git a/recipes-core/images/mlinux-rs9113-mtrv1-image.bb b/recipes-core/images/mlinux-rs9113-mtrv1-image.bb index e8dad45..eb5af9d 100644 --- a/recipes-core/images/mlinux-rs9113-mtrv1-image.bb +++ b/recipes-core/images/mlinux-rs9113-mtrv1-image.bb @@ -64,6 +64,7 @@ MISC_FEATURES = "minicom lrzsz nano pps-tools" 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 += "lxfp" +CONSOLE = "sysvinit-inittab-start-open" IMAGE_INSTALL += " \ ${WIFI_FEATURES} \ -- cgit v1.2.3