Get buildroot-external tree to reflect 2022.02.1

- Changes to the raspberypi board folder/structure
- Bump python related poackages and fixes to Python3.10
- Bump KF5 framewerk packages to 5.91
- Bump qtwebengine to 5.15.8
- Bump/Add/Fix all OVOS related packages
- Fixes all over the OpenVoiceOS structure for 2022.02.1

buildroot-external/Config.in

@@ -1,5 +1,4 @@
 menu "Additional drivers, libraries and/or applications"
-	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/alsa-plugins/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/baresip/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/btspeaker/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/docbook-xml/Config.in"
@@ -63,6 +62,7 @@ menu "KDE Framework and Plasma"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-kwin/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-kwindowsystem/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-kxmlgui/Config.in"
+	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-layer-shell-qt/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-libkscreen/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-libksysguard/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/kf5-phonon/Config.in"
@@ -106,13 +106,11 @@ menu "Additional external python modules"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-astral/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-audio-metadata/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-beniget/Config.in"
-	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-bidict/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-bitstruct/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-blinker/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-bs4/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-cachetools/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-casttube/Config.in"
-	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-charset-normalizer/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-click-default-group/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-colour/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-combo-lock/Config.in"
@@ -120,7 +118,6 @@ menu "Additional external python modules"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-coverage/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-coveralls/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-dataclasses/Config.in"
-	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-dbus-next/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-deprecated/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-fann2/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-fasteners/Config.in"
@@ -129,7 +126,6 @@ menu "Additional external python modules"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-flask-mail/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-flask-simplelogin/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-flask-socketio/Config.in"
-	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-flask-wtf/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-gast/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-geocoder/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-geoip-geolite2/Config.in"
@@ -203,7 +199,6 @@ menu "Additional external python modules"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-requests-cache/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-requests-futures/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-reverse-geocoder/Config.in"
-	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-rsa/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ruamel-yaml/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-scipy/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-sgmllib3k/Config.in"
@@ -240,6 +235,7 @@ menu "Mycroft A.I. Personal Assistant"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-embedded-shell/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-gui/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-holmesv/Config.in"
+	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-cli-client/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-core/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-service/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-splash/Config.in"
@@ -267,12 +263,16 @@ menu "Mycroft A.I. Plugins"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-plugin-manager/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-skill-installer/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-skill-manager/Config.in"
+	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-stt-http-server/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-stt-plugin-chromium/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-stt-plugin-pocketsphinx/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-stt-plugin-vosk/Config.in"
+	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-stt-server-plugin/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-tts-plugin-mimic/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-tts-plugin-mimic2/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-tts-plugin-pico/Config.in"
+	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-tts-server/Config.in"
+	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-tts-server-plugin/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-utils/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-vlc-plugin/Config.in"
 	source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-workshop/Config.in"

buildroot-external/board/raspberrypi/cmdline.txt

@@ -1 +1 @@
-dwc_otg.lpm_enable=0 root=PARTUUID=c0932a41-44cf-463b-8152-d43188553ed4 rootfstype=ext4 fsck.repair=yes zram.enabled=1 zram.num_devices=4 console=tty1 consoleblank=0 loglevel=0 vt.global_cursor_default=0 logo.nologo systemd.show_status=0 rootwait quiet splash
+dwc_otg.lpm_enable=0 root=PARTUUID=c0932a41-44cf-463b-8152-d43188553ed4 rootfstype=ext4 fsck.repair=yes zram.enabled=1 zram.num_devices=4 console=tty1 consoleblank=0 loglevel=0 vt.global_cursor_default=0 audit=0 logo.nologo systemd.show_status=0 usb-storage.quirks=174c:55aa:u,2109:0715:u,152d:0578:u,152d:0579:u,152d:1561:u,174c:0829:u,14b0:0206:u rootwait quiet splash

buildroot-external/board/raspberrypi/config_3_64bit.txt

@@ -0,0 +1,56 @@
+# Please note that this is only a sample, we recommend you to change it to fit
+# your needs.
+# You should override this file using a post-build script.
+# See http://buildroot.org/manual.html#rootfs-custom
+# and http://elinux.org/RPiconfig for a description of config.txt syntax
+# We always use the same names, the real used variant is selected by
+# BR2_PACKAGE_RPI_FIRMWARE_{DEFAULT,X,CD} choice
+start_file=start.elf
+fixup_file=fixup.dat
+
+kernel=Image
+
+# To use an external initramfs file
+# initramfs rootfs.cpio.gz
+
+# Disable overscan assuming the display supports displaying the full resolution
+# If the text shown on the screen disappears off the edge, comment this out
+# disable_overscan=1
+dtoverlay=vc4-fkms-v3d
+# dtoverlay=vc4-kms-v3d
+hdmi_drive=2
+hdmi_group=2
+hdmi_mode=14
+max_framebuffers=2
+
+# uncomment if you get no picture on HDMI for a default "safe" mode
+# hdmi_safe=1
+
+# How much memory in MB to assign to the GPU on Pi models having
+# 256, 512 or 1024 MB total memory
+gpu_mem=256
+gpu_mem_256=128
+gpu_mem_512=128
+gpu_mem_1024=128
+
+# fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console
+dtoverlay=miniuart-bt
+
+# enable autoprobing of Bluetooth driver without need of hciattach/btattach
+dtoverlay=krnbt=on
+
+# Enable the onboard soundcard
+dtparam=audio=on
+
+# Disable rainbow color splash
+disable_splash=1
+
+# Enable some optional hardware interfaces
+dtparam=i2c_arm=on
+dtparam=i2c_arm_baudrate=100000
+dtoverlay=i2s-mmap
+dtparam=i2s=on
+dtparam=spi=on
+
+# Disable GPIO IRQ
+dtoverlay=gpio-no-irq

buildroot-external/board/raspberrypi/config_4_64bit.txt

@@ -0,0 +1,63 @@
+# Please note that this is only a sample, we recommend you to change it to fit
+# your needs.
+# You should override this file using a post-build script.
+# See http://buildroot.org/manual.html#rootfs-custom
+# and http://elinux.org/RPiconfig for a description of config.txt syntax
+# We always use the same names, the real used variant is selected by
+# BR2_PACKAGE_RPI_FIRMWARE_{DEFAULT,X,CD} choice
+start_file=start4.elf
+fixup_file=fixup4.dat
+
+kernel=Image
+
+# To use an external initramfs file
+# initramfs rootfs.cpio.gz
+
+# Disable overscan assuming the display supports displaying the full resolution
+# If the text shown on the screen disappears off the edge, comment this out
+# disable_overscan=1
+dtoverlay=vc4-fkms-v3d
+# dtoverlay=vc4-kms-v3d-pi4
+hdmi_drive=2
+hdmi_group=2
+hdmi_mode=14
+max_framebuffers=2
+
+# uncomment if you get no picture on HDMI for a default "safe" mode
+# hdmi_safe=1
+
+# How much memory in MB to assign to the GPU on Pi models having
+# 256, 512 or 1024 MB total memory
+gpu_mem=256
+gpu_mem_256=128
+gpu_mem_512=128
+gpu_mem_1024=128
+
+# fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console
+# dtoverlay=miniuart-bt
+
+# enable autoprobing of Bluetooth driver without need of hciattach/btattach
+dtoverlay=krnbt=on
+
+# Enable the onboard soundcard
+dtparam=audio=on
+
+# Enable camera driver
+# dtoverlay=imx219
+dtoverlay=ov5647
+
+# Disable rainbow color splash
+disable_splash=1
+
+# Enable some optional hardware interfaces
+dtparam=i2c_arm=on
+dtparam=i2c_arm_baudrate=100000
+dtoverlay=i2s-mmap
+dtparam=i2s=on
+dtparam=spi=on
+
+# Disable GPIO IRQ
+dtoverlay=gpio-no-irq
+
+# enable 64bits support
+arm_64bit=1

buildroot-external/board/raspberrypi/genimage-raspberrypi3-64.cfg

@@ -19,7 +19,7 @@ image boot.vfat {
 image sdcard.img {
   hdimage {
     disk-signature = 0xOVOS
-    gpt = "true"
+    partition-table-type = "hybrid"
   }
 
   partition boot1 {

buildroot-external/board/raspberrypi/genimage-raspberrypi4-64.cfg

@@ -4,9 +4,9 @@ image boot.vfat {
       "bcm2711-rpi-4-b.dtb",
       "rpi-firmware/cmdline.txt",
       "rpi-firmware/config.txt",
-      "rpi-firmware/fixup.dat",
-      "rpi-firmware/start.elf",
-      "overlays",
+      "rpi-firmware/fixup4.dat",
+      "rpi-firmware/start4.elf",
+      "rpi-firmware/overlays",
       "Image"
     }
   }
@@ -16,7 +16,7 @@ image boot.vfat {
 image sdcard.img {
   hdimage {
     disk-signature = 0xOVOS
-    gpt = "true"
+    partition-table-type = "hybrid"
   }
 
   partition boot1 {

buildroot-external/board/raspberrypi/post-build.sh

@@ -29,5 +29,17 @@ BOARD_DIR="$(dirname $0)"
     echo "DEPLOYMENT=${DEPLOYMENT}"
 } > "${TARGET_DIR}/etc/machine-info"
 
-cp -f ../buildroot-external/board/raspberrypi/config.txt ${BINARIES_DIR}/rpi-firmware/config.txt
 cp -f ../buildroot-external/board/raspberrypi/cmdline.txt ${BINARIES_DIR}/rpi-firmware/cmdline.txt
+
+# Copy the right config.txt file
+for arg in "$@"
+do
+    case "${arg}" in
+        --rpi3)
+        cp -f ../buildroot-external/board/raspberrypi/config_3_64bit.txt ${BINARIES_DIR}/rpi-firmware/config.txt
+        ;;
+        --rpi4)
+        cp -f ../buildroot-external/board/raspberrypi/config_4_64bit.txt ${BINARIES_DIR}/rpi-firmware/config.txt
+        ;;
+    esac
+done

buildroot-external/board/raspberrypi/post-image.sh

@@ -7,39 +7,6 @@ BOARD_NAME="$(basename ${BOARD_DIR})"
 GENIMAGE_CFG="${BOARD_DIR}/genimage-${BOARD_NAME}.cfg"
 GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
 
-for arg in "$@"
-do
-	case "${arg}" in
-		--add-miniuart-bt-overlay)
-		if ! grep -qE '^dtoverlay=' "${BINARIES_DIR}/rpi-firmware/config.txt"; then
-			echo "Adding 'dtoverlay=miniuart-bt' to config.txt (fixes ttyAMA0 serial console)."
-			cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt"
-
-# fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console
-dtoverlay=miniuart-bt
-__EOF__
-		fi
-		;;
-		--aarch64)
-		# Run a 64bits kernel (armv8)
-		sed -e '/^kernel=/s,=.*,=Image,' -i "${BINARIES_DIR}/rpi-firmware/config.txt"
-		if ! grep -qE '^arm_64bit=1' "${BINARIES_DIR}/rpi-firmware/config.txt"; then
-			cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt"
-
-# enable 64bits support
-arm_64bit=1
-__EOF__
-		fi
-		;;
-		--gpu_mem_256=*|--gpu_mem_512=*|--gpu_mem_1024=*)
-		# Set GPU memory
-		gpu_mem="${arg:2}"
-		sed -e "/^${gpu_mem%=*}=/s,=.*,=${gpu_mem##*=}," -i "${BINARIES_DIR}/rpi-firmware/config.txt"
-		;;
-	esac
-
-done
-
 # Pass an empty rootpath. genimage makes a full copy of the given rootpath to
 # ${GENIMAGE_TMP}/root so passing TARGET_DIR would be a waste of time and disk
 # space. We don't rely on genimage to build the rootfs image, just to insert a