From 3d05dfdfeca2f8919b3e2f080beb2a73a4410ddf Mon Sep 17 00:00:00 2001 From: John Klug Date: Thu, 5 Jan 2023 18:25:21 -0600 Subject: Update the mlinux MTCDT images for new rsi-91x modules --- recipes-core/images/mlinux-base-image.bb | 2 ++ recipes-core/images/mlinux-commissioning-image.bb | 2 +- recipes-core/images/mlinux-rs9113-base-image.bb | 5 ----- recipes-core/images/mlinux-rs9113-factory-image.bb | 4 ++-- 4 files changed, 5 insertions(+), 8 deletions(-) delete mode 100644 recipes-core/images/mlinux-rs9113-base-image.bb diff --git a/recipes-core/images/mlinux-base-image.bb b/recipes-core/images/mlinux-base-image.bb index d1f7f3c..cbf63f7 100644 --- a/recipes-core/images/mlinux-base-image.bb +++ b/recipes-core/images/mlinux-base-image.bb @@ -37,6 +37,8 @@ RSI_91X_FEATURES = " \ kernel-module-rsi-bt91x \ kernel-module-rsi-btusb \ kernel-module-rsi-usb \ + kernel-module-rsi-91x-sta-ap \ + kernel-module-rsi-usb-sta-ap \ rs9113-fw \ rsi-91x-fw \ rsi-91x-utils \ diff --git a/recipes-core/images/mlinux-commissioning-image.bb b/recipes-core/images/mlinux-commissioning-image.bb index 1f1103c..199f0f3 100644 --- a/recipes-core/images/mlinux-commissioning-image.bb +++ b/recipes-core/images/mlinux-commissioning-image.bb @@ -2,6 +2,6 @@ require mlinux-rs9113-factory-image.bb DESCRIPTION = "mLinux factory image with commissioning support" # Extra stuff to install -IMAGE_INSTALL_append = " dnsmasq bluez5-noinst-tools commissioning commissioning-php-fpm rs9113-rm" +IMAGE_INSTALL_append = " dnsmasq bluez5-noinst-tools python-dbus commissioning commissioning-php-fpm rp-net-examples" IMAGE_INSTALL_remove = "useradd" ROOTFS_POSTPROCESS_COMMAND_remove = "mlinux_set_root_password;" diff --git a/recipes-core/images/mlinux-rs9113-base-image.bb b/recipes-core/images/mlinux-rs9113-base-image.bb deleted file mode 100644 index ed2fc83..0000000 --- a/recipes-core/images/mlinux-rs9113-base-image.bb +++ /dev/null @@ -1,5 +0,0 @@ -require mlinux-base-image.bb -DESCRIPTION = "mLinux base image with rs9113 drivers" - -# Extra stuff to install -IMAGE_INSTALL_append = " kernel-module-rs9113 rs9113-autostart rs9113-util" diff --git a/recipes-core/images/mlinux-rs9113-factory-image.bb b/recipes-core/images/mlinux-rs9113-factory-image.bb index 0c1411b..ff326b9 100644 --- a/recipes-core/images/mlinux-rs9113-factory-image.bb +++ b/recipes-core/images/mlinux-rs9113-factory-image.bb @@ -1,5 +1,5 @@ require mlinux-factory-image.bb -DESCRIPTION = "mLinux factory image with rs9113 drivers" +DESCRIPTION = "mLinux factory image with WiFi/BT related support packages" # Extra stuff to install -IMAGE_INSTALL_append = " dnsmasq bluez5-noinst-tools kernel-module-rs9113 rs9113-autostart rs9113-util rs9113-misc rs9113-utils-extra" +IMAGE_INSTALL_append = " dnsmasq bluez5-noinst-tools python-dbus" -- cgit v1.2.3