From 8d0f0fb4b86062bbd1dbaf8d4ea3640b97ae5a58 Mon Sep 17 00:00:00 2001 From: John Klug Date: Mon, 14 Nov 2016 10:55:07 -0600 Subject: Remove Redpine from the base mLinux image --- recipes-core/images/mlinux-base-image.bb | 4 +- recipes-core/images/mlinux-factory-image.bb | 1 + recipes-core/images/mlinux-rs9113-base-image.bb | 66 +++++++++++++++++ recipes-core/images/mlinux-rs9113-factory-image.bb | 84 +++++++++++++++++++++ recipes-core/images/mlinux-xrs9113-base-image.bb | 66 ----------------- .../images/mlinux-xrs9113-factory-image.bb | 85 ---------------------- 6 files changed, 153 insertions(+), 153 deletions(-) create mode 100644 recipes-core/images/mlinux-rs9113-base-image.bb create mode 100644 recipes-core/images/mlinux-rs9113-factory-image.bb delete mode 100644 recipes-core/images/mlinux-xrs9113-base-image.bb delete mode 100644 recipes-core/images/mlinux-xrs9113-factory-image.bb 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-rs9113-base-image.bb b/recipes-core/images/mlinux-rs9113-base-image.bb new file mode 100644 index 0000000..6423237 --- /dev/null +++ b/recipes-core/images/mlinux-rs9113-base-image.bb @@ -0,0 +1,66 @@ +DESCRIPTION = "mLinux base image" +LICENSE = "MIT" + +require mlinux-minimal-image.bb + +FILESYSTEM_FEATURES = "dosfstools \ + cifs-utils \ + lsof \ + " + +NETWORKING_FEATURES += "bridge-utils \ + inetutils-ftp \ + openssl \ + rsync \ + iperf \ + mii-diag \ + tcpdump \ + netcat \ + wget \ + strongswan \ + " + +WIFI_FEATURES = " \ + libnl \ + wpa-supplicant \ + wireless-tools \ + iw \ + hostap-daemon hostap-utils \ + " + +BLUETOOTH_FEATURES = "bluez4" + +# Add all timezones available +# ntpdate will sync time every 30 min by default via cron +TIME_FEATURES = "tzdata tzdata-africa tzdata-americas tzdata-antarctica tzdata-arctic \ + tzdata-asia tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific \ + tzdata-misc \ + cronie \ + ntpdate \ + " + +# u-boot-linux-utils: U-Boot environment access from Linux +# mlinux-scripts: sample scripts for setting up Conduit for various tasks +# reset-handler: default reset button handler +# 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 += " \ + u-boot-linux-utils \ + mlinux-scripts \ + reset-handler \ + radio-cmd radio-query \ + jsparser \ + annex-client \ + " + +MISC_FEATURES = "minicom lrzsz nano rs9113" + +# Extra stuff to install +IMAGE_INSTALL += " \ + ${WIFI_FEATURES} \ + ${BLUETOOTH_FEATURES} \ + ${FILESYSTEM_FEATURES} \ + ${TIME_FEATURES} \ + ${MISC_FEATURES} \ + " diff --git a/recipes-core/images/mlinux-rs9113-factory-image.bb b/recipes-core/images/mlinux-rs9113-factory-image.bb new file mode 100644 index 0000000..bf2beaa --- /dev/null +++ b/recipes-core/images/mlinux-rs9113-factory-image.bb @@ -0,0 +1,84 @@ +require mlinux-rs9113-base-image.bb + +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 \ + " + +# Lighttpd web server +IMAGE_INSTALL += "${LIGHTTPD}" + +IMAGE_INSTALL += "sqlite3" + +IMAGE_INSTALL += "autossh" + +# Monit system/process monitor +IMAGE_INSTALL += "monit" + +# LoRa support (MTAC-LORA accessory card) +IMAGE_INSTALL += "lora-gateway-utils lora-network-server lora-query" + +# MQTT server +IMAGE_INSTALL += "mosquitto mosquitto-clients" + +# Perl support +IMAGE_INSTALL += "perl" +IMAGE_INSTALL += "perl-module-io perl-module-fcntl" +# not in meta-oe or oe-core... +#IMAGE_INSTALL += "libdevice-serialport-perl" +#IMAGE_INSTALL += "libexpect-perl" + +# Python support +IMAGE_INSTALL += "python" +# Python modules +IMAGE_INSTALL += "python-async \ +python-argparse \ +python-compression \ +python-dateutil \ +python-html \ +python-psutil \ +python-pycurl \ +python-pyopenssl \ +python-pyserial \ +python-pyudev \ +python-pyusb \ +python-simplejson \ +python-sqlite3 \ +python-syslog \ +python-textutils \ +python-unixadmin \ +python-xml \ +" + +# Ruby support +IMAGE_INSTALL += "ruby" +IMAGE_INSTALL += "ruby-sqlite3" +IMAGE_INSTALL += "ruby-serialport" + +# OpenJDK Java runtime +IMAGE_INSTALL += "openjdk-7-jre" +# OpenJDK with JamVM VM (Multi-Tech default) +IMAGE_INSTALL += "openjdk-7-vm-jamvm" +# OpenJDK with CACAO VM (run with 'java -cacao') +IMAGE_INSTALL += "openjdk-7-vm-cacao" +# OpenJDK Zero VM (run with 'java -zero') +IMAGE_INSTALL += "openjdk-7-vm-zero" + +# PHP support +IMAGE_INSTALL += "php php-cli php-cgi" + +# Node.js support +IMAGE_INSTALL += "nodejs nodejs-npm" + +# Multi-Tech SMS Utility (see http://git.multitech.net) +IMAGE_INSTALL += "sms-utils" +# Multi-Tech GPS Utility +IMAGE_INSTALL += "venus-gps" +IMAGE_INSTALL += "pps-tools" +IMAGE_INSTALL += "gpsd" + +IMAGE_INSTALL += "uvccapture" diff --git a/recipes-core/images/mlinux-xrs9113-base-image.bb b/recipes-core/images/mlinux-xrs9113-base-image.bb deleted file mode 100644 index 6b19725..0000000 --- a/recipes-core/images/mlinux-xrs9113-base-image.bb +++ /dev/null @@ -1,66 +0,0 @@ -# Conduit 0.0 or 0.1 without RS9113 -DESCRIPTION = "mLinux base image" -LICENSE = "MIT" - -require mlinux-minimal-image.bb - -FILESYSTEM_FEATURES = "dosfstools \ - cifs-utils \ - lsof \ - " - -NETWORKING_FEATURES += "bridge-utils \ - inetutils-ftp \ - openssl \ - rsync \ - iperf \ - mii-diag \ - tcpdump \ - netcat \ - wget \ - strongswan \ - " - -WIFI_FEATURES = " \ - libnl \ - wpa-supplicant \ - wireless-tools \ - iw \ - hostap-daemon hostap-utils \ - " - -BLUETOOTH_FEATURES = "bluez4" - -# Add all timezones available -# ntpdate will sync time every 30 min by default via cron -TIME_FEATURES = "tzdata tzdata-africa tzdata-americas tzdata-antarctica tzdata-arctic \ - tzdata-asia tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific \ - tzdata-misc \ - cronie \ - ntpdate \ - " - -# u-boot-linux-utils: U-Boot environment access from Linux -# mlinux-scripts: sample scripts for setting up Conduit for various tasks -# reset-handler: default reset button handler -# 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 += " \ - u-boot-linux-utils \ - mlinux-scripts \ - reset-handler \ - radio-cmd radio-query \ - jsparser \ - " - -MISC_FEATURES = "minicom lrzsz nano" - -# Extra stuff to install -IMAGE_INSTALL += " \ - ${WIFI_FEATURES} \ - ${BLUETOOTH_FEATURES} \ - ${FILESYSTEM_FEATURES} \ - ${TIME_FEATURES} \ - ${MISC_FEATURES} \ - " diff --git a/recipes-core/images/mlinux-xrs9113-factory-image.bb b/recipes-core/images/mlinux-xrs9113-factory-image.bb deleted file mode 100644 index c536553..0000000 --- a/recipes-core/images/mlinux-xrs9113-factory-image.bb +++ /dev/null @@ -1,85 +0,0 @@ -# Conduit 0.0 or 0.1 without RS9113 -require mlinux-xrs9113-base-image.bb - -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 \ - " - -# Lighttpd web server -IMAGE_INSTALL += "${LIGHTTPD}" - -IMAGE_INSTALL += "sqlite3" - -IMAGE_INSTALL += "autossh" - -# Monit system/process monitor -IMAGE_INSTALL += "monit" - -# LoRa support (MTAC-LORA accessory card) -IMAGE_INSTALL += "lora-gateway-utils lora-network-server lora-query" - -# MQTT server -IMAGE_INSTALL += "mosquitto mosquitto-clients" - -# Perl support -IMAGE_INSTALL += "perl" -IMAGE_INSTALL += "perl-module-io perl-module-fcntl" -# not in meta-oe or oe-core... -#IMAGE_INSTALL += "libdevice-serialport-perl" -#IMAGE_INSTALL += "libexpect-perl" - -# Python support -IMAGE_INSTALL += "python" -# Python modules -IMAGE_INSTALL += "python-async \ -python-argparse \ -python-compression \ -python-dateutil \ -python-html \ -python-psutil \ -python-pycurl \ -python-pyopenssl \ -python-pyserial \ -python-pyudev \ -python-pyusb \ -python-simplejson \ -python-sqlite3 \ -python-syslog \ -python-textutils \ -python-unixadmin \ -python-xml \ -" - -# Ruby support -IMAGE_INSTALL += "ruby" -IMAGE_INSTALL += "ruby-sqlite3" -IMAGE_INSTALL += "ruby-serialport" - -# OpenJDK Java runtime -IMAGE_INSTALL += "openjdk-7-jre" -# OpenJDK with JamVM VM (Multi-Tech default) -IMAGE_INSTALL += "openjdk-7-vm-jamvm" -# OpenJDK with CACAO VM (run with 'java -cacao') -IMAGE_INSTALL += "openjdk-7-vm-cacao" -# OpenJDK Zero VM (run with 'java -zero') -IMAGE_INSTALL += "openjdk-7-vm-zero" - -# PHP support -IMAGE_INSTALL += "php php-cli php-cgi" - -# Node.js support -IMAGE_INSTALL += "nodejs nodejs-npm" - -# Multi-Tech SMS Utility (see http://git.multitech.net) -IMAGE_INSTALL += "sms-utils" -# Multi-Tech GPS Utility -IMAGE_INSTALL += "venus-gps" -IMAGE_INSTALL += "pps-tools" -IMAGE_INSTALL += "gpsd" - -IMAGE_INSTALL += "uvccapture" -- cgit v1.2.3