Move mLinux images to Python 3

9 files changed, 42 insertions, 12 deletions

diff --git a/recipes-core/images/mlinux-factory-image.bb b/recipes-core/images/mlinux-factory-image.bb
index eb3c92d..6adf7e2 100644
--- a/recipes-core/images/mlinux-factory-image.bb
+++ b/recipes-core/images/mlinux-factory-image.bb
@@ -47,9 +47,9 @@ IMAGE_INSTALL_append = " perl-module-io perl-module-fcntl"
 #IMAGE_INSTALL_append = " libexpect-perl"
 
 # Python support
-IMAGE_INSTALL_append = " python"
-# Python modules
-IMAGE_INSTALL_append = " python-argparse \
+# Python 2 is obsolete.
+PYTHON_2_FEATURES = " python \
+python-argparse \
 python-compression \
 python-dateutil \
 python-html \
@@ -64,7 +64,36 @@ python-syslog \
 python-textutils \
 python-unixadmin \
 python-xml \
+python-dbus \
 "
+PYTHON_3_FEATURES = " \
+                python3-core \
+                python3-logging \
+                python3-io \
+                python3-audio \
+                python3-compression \
+                python3-crypt \
+                python3-datetime \
+                python3-email \
+                python3-image \
+                python3-json \
+                python3-pyjwt \
+                python3-netclient \
+                python3-netserver \
+                python3-paho-mqtt \
+                python3-pycurl \
+                python3-pyserial \
+                python3-requests \
+                python3-shell \
+                python3-six \
+                python3-threading \
+                python3-twisted-core \
+                python3-urllib3 \
+                python3-dbus \
+                "
+
+IMAGE_INSTALL_append = "${PYTHON_3_FEATURES}"
+PYTHON_DEFAULT = "python-is-python3"
 
 # OpenJDK Java runtime
 # IMAGE_INSTALL_append = " openjdk-8"
@@ -89,8 +118,9 @@ IMAGE_INSTALL_append = " pps-tools"
 IMAGE_INSTALL_append = " dnsmasq bluez5-pand bluez5-rfcomm"
 
 # When ntp is to use the GPS, gpspipe is required
-IMAGE_INSTALL_append = " gpsd gpsd-conf gpsd-gpsctl libgps ntp ntp-utils gpspipe gps-utils"
+IMAGE_INSTALL_append = " gpsd gpsd-conf gpsd-gpsctl libgps ntp ntp-utils gpspipe gps-utils python3-pygps-pyc"
 
 IMAGE_INSTALL_append = " uxfp qfirehose uvccapture"
 
 IMAGE_INSTALL_append = " ppp-radioresetwait radio-reset-background"
+IMAGE_INSTALL_append = " ${PYTHON_DEFAULT}"
diff --git a/recipes-core/images/mlinux-mtcap-commissioning-image.bb b/recipes-core/images/mlinux-mtcap-commissioning-image.bb
index 1a86488..e685b47 100644
--- a/recipes-core/images/mlinux-mtcap-commissioning-image.bb
+++ b/recipes-core/images/mlinux-mtcap-commissioning-image.bb
@@ -14,5 +14,5 @@ LIGHTTPD = "lighttpd \
 IMAGE_INSTALL += "${LIGHTTPD}"
 IMAGE_INSTALL_append = " commissioning commissioning-php-fpm"
 IMAGE_INSTALL_remove = "useradd"
-IMAGE_INSTALL_append = " gpsd gpsd-conf gpsd-gpsctl libgps ntp ntp-utils gpspipe gps-utils"
+IMAGE_INSTALL_append = " gpsd gpsd-conf gpsd-gpsctl libgps ntp ntp-utils gpspipe gps-utils python3-pygps-pyc"
 ROOTFS_POSTPROCESS_COMMAND_remove = "mlinux_set_root_password;"
diff --git a/recipes-core/images/mlinux-mtcap-image.bb b/recipes-core/images/mlinux-mtcap-image.bb
index 87bf7d0..4fde767 100644
--- a/recipes-core/images/mlinux-mtcap-image.bb
+++ b/recipes-core/images/mlinux-mtcap-image.bb
@@ -63,7 +63,7 @@ IMAGE_INSTALL_append = " \
 MISC_FEATURES = "minicom lrzsz nano uxfp qfirehose"
 
 # Extra stuff to install
-IMAGE_INSTALL_append = " gpsd gpsd-conf gpsd-gpsctl libgps ntp ntp-utils gpspipe gps-utils"
+IMAGE_INSTALL_append = " gpsd gpsd-conf gpsd-gpsctl libgps ntp ntp-utils gpspipe gps-utils python3-pygps-pyc"
 
 IMAGE_INSTALL_append = " \
                 ${FILESYSTEM_FEATURES} \
diff --git a/recipes-core/images/mlinux-mtcap-test-image.bb b/recipes-core/images/mlinux-mtcap-test-image.bb
index df59845..6a91741 100644
--- a/recipes-core/images/mlinux-mtcap-test-image.bb
+++ b/recipes-core/images/mlinux-mtcap-test-image.bb
@@ -80,7 +80,7 @@ MISC_FEATURES = "minicom lrzsz nano uxfp qfirehose"
 #   Someday add wifi features
 #               ${WIFI_FEATURES}
 #
-IMAGE_INSTALL_append = " gpsd gpsd-conf gpsd-gpsctl libgps ntp ntp-utils gpspipe gps-utils"
+IMAGE_INSTALL_append = " gpsd gpsd-conf gpsd-gpsctl libgps ntp ntp-utils gpspipe gps-utils python3-pygps-pyc"
 
 IMAGE_INSTALL_append = " pps-tools"
 
diff --git a/recipes-core/images/mlinux-mtr-image.bb b/recipes-core/images/mlinux-mtr-image.bb
index c817a30..20db9c0 100644
--- a/recipes-core/images/mlinux-mtr-image.bb
+++ b/recipes-core/images/mlinux-mtr-image.bb
@@ -69,7 +69,7 @@ MISC_FEATURES = "minicom lrzsz nano"
 
 # Extra stuff to install
 IMAGE_INSTALL_append = " ti-wifi-utils wl12xx-firmware"
-IMAGE_INSTALL_append = " gpsd gpsd-conf gpsd-gpsctl libgps ntp ntp-utils gpspipe gps-utils"
+IMAGE_INSTALL_append = " gpsd gpsd-conf gpsd-gpsctl libgps ntp ntp-utils gpspipe gps-utils python3-pygps-pyc"
 IMAGE_INSTALL_append = " uxfp"
 
 IMAGE_INSTALL_append = " \
diff --git a/recipes-core/images/mlinux-mtrv1-image.bb b/recipes-core/images/mlinux-mtrv1-image.bb
index 847fea9..d60c9e0 100644
--- a/recipes-core/images/mlinux-mtrv1-image.bb
+++ b/recipes-core/images/mlinux-mtrv1-image.bb
@@ -70,7 +70,7 @@ MISC_FEATURES = "minicom lrzsz nano pps-tools"
 
 # Extra stuff to install
 IMAGE_INSTALL_append = " kernel-module-rs9113 rs9113-util rs9113-autostart"
-IMAGE_INSTALL_append = " gpsd gpsd-conf gpsd-gpsctl libgps ntp ntp-utils gpspipe gps-utils"
+IMAGE_INSTALL_append = " gpsd gpsd-conf gpsd-gpsctl libgps ntp ntp-utils gpspipe gps-utils python3-pygps-pyc"
 
 IMAGE_INSTALL_append = " \
 				${TEST_FEATURES} \
diff --git a/recipes-core/images/mlinux-rs9113-factory-image.bb b/recipes-core/images/mlinux-rs9113-factory-image.bb
index 40a4610..0c1411b 100644
--- a/recipes-core/images/mlinux-rs9113-factory-image.bb
+++ b/recipes-core/images/mlinux-rs9113-factory-image.bb
@@ -2,4 +2,4 @@ require mlinux-factory-image.bb
 DESCRIPTION = "mLinux factory image with rs9113 drivers"
 
 # Extra stuff to install
-IMAGE_INSTALL_append = " dnsmasq bluez5-noinst-tools python-dbus kernel-module-rs9113 rs9113-autostart rs9113-util rs9113-misc rs9113-utils-extra"
+IMAGE_INSTALL_append = " dnsmasq bluez5-noinst-tools kernel-module-rs9113 rs9113-autostart rs9113-util rs9113-misc rs9113-utils-extra"
diff --git a/recipes-core/images/mlinux-rs9113-mtrv1-image.bb b/recipes-core/images/mlinux-rs9113-mtrv1-image.bb
index 072240c..fb1dc34 100644
--- a/recipes-core/images/mlinux-rs9113-mtrv1-image.bb
+++ b/recipes-core/images/mlinux-rs9113-mtrv1-image.bb
@@ -70,7 +70,7 @@ MISC_FEATURES = "minicom lrzsz nano pps-tools"
 
 # Extra stuff to install
 IMAGE_INSTALL_append = " kernel-module-rs9113 rs9113rf rs9113-util rs9113-utils-extra rs9113-misc rs9113-autostart"
-IMAGE_INSTALL_append = " gpsd gpsd-conf gpsd-gpsctl libgps ntp ntp-utils gpspipe gps-utils"
+IMAGE_INSTALL_append = " gpsd gpsd-conf gpsd-gpsctl libgps ntp ntp-utils gpspipe gps-utils python3-pygps-pyc"
 IMAGE_INSTALL_append = " uxfp qfirehose"
 
 IMAGE_INSTALL_append = " \
diff --git a/recipes-core/images/mlinux-sel-test-image.bb b/recipes-core/images/mlinux-sel-test-image.bb
index a452893..a871f74 100644
--- a/recipes-core/images/mlinux-sel-test-image.bb
+++ b/recipes-core/images/mlinux-sel-test-image.bb
@@ -71,7 +71,7 @@ MISC_FEATURES = "minicom lrzsz nano pps-tools"
 
 # Extra stuff to install
 # IMAGE_INSTALL_append = " kernel-module-rs9113 rs9113-util rs9113-autostart"
-IMAGE_INSTALL_append = " gpsd gpsd-conf gpsd-gpsctl libgps ntp ntp-utils gpspipe gps-utils"
+IMAGE_INSTALL_append = " gpsd gpsd-conf gpsd-gpsctl libgps ntp ntp-utils gpspipe gps-utils python3-pygps-pyc"
 
 IMAGE_INSTALL_append = " \
 				${TEST_FEATURES} \