From 325bbefe2b0c6266c5c6d6fdd9539176c5722912 Mon Sep 17 00:00:00 2001 From: John Klug Date: Mon, 3 Aug 2020 12:34:18 -0500 Subject: Remove Ruby and NodeJS --- recipes-core/images/mlinux-factory-image.bb | 10 +++++----- recipes-core/images/mlinux-mtcap-commissioning-image.bb | 10 ++++++++++ recipes-core/images/mlinux-mtcap-debug-image.bb | 2 -- recipes-core/images/mlinux-mtr-image.bb | 2 ++ recipes-core/images/mlinux-mtrv1-image.bb | 2 ++ 5 files changed, 19 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 4afabff..9c84cf0 100644 --- a/recipes-core/images/mlinux-factory-image.bb +++ b/recipes-core/images/mlinux-factory-image.bb @@ -62,10 +62,10 @@ python-xml \ " # Ruby support -IMAGE_INSTALL_append = " ruby" +#IMAGE_INSTALL_append = " ruby" -IMAGE_INSTALL_append = " ruby-sqlite3" -IMAGE_INSTALL_append = " ruby-serialport" +#IMAGE_INSTALL_append = " ruby-sqlite3" +#IMAGE_INSTALL_append = " ruby-serialport" # OpenJDK Java runtime # IMAGE_INSTALL_append = " openjdk-8" @@ -79,8 +79,8 @@ IMAGE_INSTALL_append = " ruby-serialport" # PHP support IMAGE_INSTALL_append = " php php-cli php-fpm" -# Node.js support -IMAGE_INSTALL_append = " nodejs nodejs-npm" +# Node.js support not available for Atmel any more. +# IMAGE_INSTALL_append = " nodejs nodejs-npm" # Multi-Tech SMS Utility (see http://git.multitech.net) IMAGE_INSTALL_append = " sms-utils" diff --git a/recipes-core/images/mlinux-mtcap-commissioning-image.bb b/recipes-core/images/mlinux-mtcap-commissioning-image.bb index 9e933b1..b1edd03 100644 --- a/recipes-core/images/mlinux-mtcap-commissioning-image.bb +++ b/recipes-core/images/mlinux-mtcap-commissioning-image.bb @@ -1,7 +1,17 @@ require mlinux-mtcap-image.bb DESCRIPTION = "mtcap image with commissioning support" +LIGHTTPD = "lighttpd \ + lighttpd-module-cgi lighttpd-module-indexfile \ + lighttpd-module-redirect lighttpd-module-auth \ + lighttpd-module-access lighttpd-module-accesslog \ + lighttpd-module-rewrite lighttpd-module-proxy lighttpd-module-fastcgi \ + lighttpd-module-scgi lighttpd-module-alias \ + lighttpd-module-dirlisting lighttpd-module-staticfile \ + " + #install +IMAGE_INSTALL += "${LIGHTTPD}" IMAGE_INSTALL_append = " commissioning commissioning-php-fpm" IMAGE_INSTALL_remove = "useradd" ROOTFS_POSTPROCESS_COMMAND_remove = "mlinux_set_root_password;" diff --git a/recipes-core/images/mlinux-mtcap-debug-image.bb b/recipes-core/images/mlinux-mtcap-debug-image.bb index 13a3518..ce20bdc 100644 --- a/recipes-core/images/mlinux-mtcap-debug-image.bb +++ b/recipes-core/images/mlinux-mtcap-debug-image.bb @@ -7,7 +7,5 @@ IMAGE_INSTALL_append = " lora-network-server-mtcap \ lora-gateway-utils \ lora-query \ mosquitto mosquitto-clients \ - nodejs \ - nodejs-npm \ " diff --git a/recipes-core/images/mlinux-mtr-image.bb b/recipes-core/images/mlinux-mtr-image.bb index 5a557ab..efbfd69 100644 --- a/recipes-core/images/mlinux-mtr-image.bb +++ b/recipes-core/images/mlinux-mtr-image.bb @@ -4,6 +4,8 @@ LICENSE = "MIT" require mlinux-minimal-image.bb +CONSOLE = "sysvinit-inittab-start-open" + FILESYSTEM_FEATURES = "dosfstools \ cifs-utils \ lsof \ diff --git a/recipes-core/images/mlinux-mtrv1-image.bb b/recipes-core/images/mlinux-mtrv1-image.bb index ff9af34..43315f6 100644 --- a/recipes-core/images/mlinux-mtrv1-image.bb +++ b/recipes-core/images/mlinux-mtrv1-image.bb @@ -4,6 +4,8 @@ LICENSE = "MIT" require mlinux-minimal-image.bb +CONSOLE = "sysvinit-inittab-start-open" + FILESYSTEM_FEATURES = "dosfstools \ cifs-utils \ lsof \ -- cgit v1.2.3