From e663240d230abb689d1d7768a7362b69dbdea938 Mon Sep 17 00:00:00 2001
From: j1nx
Date: Thu, 31 Aug 2023 19:03:59 +0000
Subject: [PATCH] [ALL] The big cleanup to change mycroft into ovos
---
.../board/ovos/ova/post-build.sh | 4 +-
.../board/ovos/pc/post-build.sh | 4 +-
.../board/ovos/raspberrypi/post-build.sh | 4 +-
.../usr/lib/systemd/system/nodered.service | 32 ---
buildroot-external/configs/ova_64_defconfig | 214 ++++--------------
buildroot-external/configs/rpi4_64_defconfig | 212 ++++-------------
.../package/ovos-splash/Config.in | 2 +-
.../ovos-splash/ovos-splash-quit.service | 2 -
.../systemd/users/ovos_audio.container | 3 +-
.../systemd/users/ovos_core.container | 2 +-
.../systemd/users/ovos_listener.container | 2 +-
.../users/ovos_listener_records.volume | 4 +-
.../systemd/users/ovos_models.volume | 4 +-
.../containers/systemd/users/ovos_nltk.volume | 4 +-
.../systemd/users/ovos_phal.container | 2 +-
.../systemd/users/ovos_tts_cache.volume | 4 +-
.../containers/systemd/users/ovos_vosk.volume | 4 +-
.../etc/dbus-1/system.d/audio-mpris.conf | 9 -
.../etc/dbus-1/system.d/mycroft.conf | 15 --
.../dbus-1/system.d/pulseaudio-system.conf | 33 ---
.../system.d/shairport-sync-dbus-policy.conf | 4 +-
.../system.d/shairport-sync-mpris-policy.conf | 4 +-
.../system.d/spotifyd-mpris-policy.conf | 4 +-
buildroot-external/rootfs-overlay/etc/subgid | 2 +-
buildroot-external/rootfs-overlay/etc/subuid | 2 +-
.../rootfs-overlay/etc/sudoers.d/mycroft | 1 -
.../rootfs-overlay/etc/sudoers.d/ovos | 1 +
.../etc/tmpfiles.d/mycroft.conf | 2 -
.../rootfs-overlay/etc/tmpfiles.d/ovos.conf | 2 +
.../rootfs-overlay/home/mycroft/cli_login.sh | 25 --
.../home/{mycroft => ovos}/.bash_profile | 0
.../home/{mycroft => ovos}/.bashrc | 0
.../.config/containers/storage.conf | 0
.../.config/mycroft/mycroft.conf | 0
.../.config/mycroft/mycroft_cli.conf | 0
.../skill-news.jarbasskills/settings.json | 0
.../systemd-tmpfiles-setup.service | 0
.../systemd/user/dbus-org.bluez.obex.service | 0
.../systemd/user/default.target.wants/.empty | 0
.../pipewire-pulse.service | 0
.../default.target.wants/pipewire.service | 0
.../user/pipewire-session-manager.service | 0
.../wireplumber.service | 0
.../user/sockets.target.wants/dbus.socket | 0
.../pipewire-pulse.socket | 0
.../user/sockets.target.wants/pipewire.socket | 0
.../systemd-tmpfiles-clean.timer | 0
.../home/{mycroft => ovos}/.local/bin/.empty | 0
.../home/{mycroft => ovos}/.local/lib/.empty | 0
.../{mycroft => ovos}/.local/share/.empty | 0
.../.local/state/mycroft/.empty | 0
.../home/{mycroft => ovos}/.ncpamixer.conf | 0
.../home/{mycroft => ovos}/.profile | 0
.../home/{mycroft => ovos}/Documents/.empty | 0
.../home/{mycroft => ovos}/Music/.empty | 0
.../home/{mycroft => ovos}/Pictures/.empty | 0
.../rootfs-overlay/home/ovos/cli_login.sh | 13 ++
.../home/{mycroft => ovos}/ovos/config/.empty | 0
.../home/{mycroft => ovos}/ovos/share/.empty | 0
.../home/{mycroft => ovos}/ovos/tmp/.empty | 0
.../rootfs-overlay/usr/libexec/home-setup | 4 +-
buildroot-external/user_table.txt | 2 +-
62 files changed, 142 insertions(+), 484 deletions(-)
delete mode 100644 buildroot-external/board/ovos/raspberrypi/rootfs-overlay/usr/lib/systemd/system/nodered.service
delete mode 100644 buildroot-external/rootfs-overlay/etc/dbus-1/system.d/audio-mpris.conf
delete mode 100644 buildroot-external/rootfs-overlay/etc/dbus-1/system.d/mycroft.conf
delete mode 100644 buildroot-external/rootfs-overlay/etc/dbus-1/system.d/pulseaudio-system.conf
delete mode 100644 buildroot-external/rootfs-overlay/etc/sudoers.d/mycroft
create mode 100644 buildroot-external/rootfs-overlay/etc/sudoers.d/ovos
delete mode 100644 buildroot-external/rootfs-overlay/etc/tmpfiles.d/mycroft.conf
create mode 100644 buildroot-external/rootfs-overlay/etc/tmpfiles.d/ovos.conf
delete mode 100644 buildroot-external/rootfs-overlay/home/mycroft/cli_login.sh
rename buildroot-external/rootfs-overlay/home/{mycroft => ovos}/.bash_profile (100%)
rename buildroot-external/rootfs-overlay/home/{mycroft => ovos}/.bashrc (100%)
rename buildroot-external/rootfs-overlay/home/{mycroft => ovos}/.config/containers/storage.conf (100%)
rename buildroot-external/rootfs-overlay/home/{mycroft => ovos}/.config/mycroft/mycroft.conf (100%)
rename buildroot-external/rootfs-overlay/home/{mycroft => ovos}/.config/mycroft/mycroft_cli.conf (100%)
rename buildroot-external/rootfs-overlay/home/{mycroft => ovos}/.config/mycroft/skills/skill-news.jarbasskills/settings.json (100%)
rename buildroot-external/rootfs-overlay/home/{mycroft => ovos}/.config/systemd/user/basic.target.wants/systemd-tmpfiles-setup.service (100%)
rename buildroot-external/rootfs-overlay/home/{mycroft => ovos}/.config/systemd/user/dbus-org.bluez.obex.service (100%)
rename buildroot-external/rootfs-overlay/home/{mycroft => ovos}/.config/systemd/user/default.target.wants/.empty (100%)
rename buildroot-external/rootfs-overlay/home/{mycroft => ovos}/.config/systemd/user/default.target.wants/pipewire-pulse.service (100%)
rename buildroot-external/rootfs-overlay/home/{mycroft => ovos}/.config/systemd/user/default.target.wants/pipewire.service (100%)
rename buildroot-external/rootfs-overlay/home/{mycroft => ovos}/.config/systemd/user/pipewire-session-manager.service (100%)
rename buildroot-external/rootfs-overlay/home/{mycroft => ovos}/.config/systemd/user/pipewire.service.wants/wireplumber.service (100%)
rename buildroot-external/rootfs-overlay/home/{mycroft => ovos}/.config/systemd/user/sockets.target.wants/dbus.socket (100%)
rename buildroot-external/rootfs-overlay/home/{mycroft => ovos}/.config/systemd/user/sockets.target.wants/pipewire-pulse.socket (100%)
rename buildroot-external/rootfs-overlay/home/{mycroft => ovos}/.config/systemd/user/sockets.target.wants/pipewire.socket (100%)
rename buildroot-external/rootfs-overlay/home/{mycroft => ovos}/.config/systemd/user/timers.target.wants/systemd-tmpfiles-clean.timer (100%)
rename buildroot-external/rootfs-overlay/home/{mycroft => ovos}/.local/bin/.empty (100%)
rename buildroot-external/rootfs-overlay/home/{mycroft => ovos}/.local/lib/.empty (100%)
rename buildroot-external/rootfs-overlay/home/{mycroft => ovos}/.local/share/.empty (100%)
rename buildroot-external/rootfs-overlay/home/{mycroft => ovos}/.local/state/mycroft/.empty (100%)
rename buildroot-external/rootfs-overlay/home/{mycroft => ovos}/.ncpamixer.conf (100%)
rename buildroot-external/rootfs-overlay/home/{mycroft => ovos}/.profile (100%)
rename buildroot-external/rootfs-overlay/home/{mycroft => ovos}/Documents/.empty (100%)
rename buildroot-external/rootfs-overlay/home/{mycroft => ovos}/Music/.empty (100%)
rename buildroot-external/rootfs-overlay/home/{mycroft => ovos}/Pictures/.empty (100%)
create mode 100644 buildroot-external/rootfs-overlay/home/ovos/cli_login.sh
rename buildroot-external/rootfs-overlay/home/{mycroft => ovos}/ovos/config/.empty (100%)
rename buildroot-external/rootfs-overlay/home/{mycroft => ovos}/ovos/share/.empty (100%)
rename buildroot-external/rootfs-overlay/home/{mycroft => ovos}/ovos/tmp/.empty (100%)
diff --git a/buildroot-external/board/ovos/ova/post-build.sh b/buildroot-external/board/ovos/ova/post-build.sh
index 9e9f411e..7d886ae2 100755
--- a/buildroot-external/board/ovos/ova/post-build.sh
+++ b/buildroot-external/board/ovos/ova/post-build.sh
@@ -19,8 +19,8 @@ BOARD_DIR="$(dirname $0)"
echo "HOME_URL=https://github.com/OpenVoiceOS/OpenVoiceOS"
echo "DOCUMENTATION_URL=https://github.com/OpenVoiceOS/OpenVoiceOS/tree/develop/documentation"
echo "SUPPORT_URL=https://github.com/OpenVoiceOS/OpenVoiceOS/issues"
- echo "VARIANT=\"${OVOS_NAME} - Mycroft Edition\""
- echo "VARIANT_ID=${OVOS_ID}-${BOARD_ID}-mycroft"
+ echo "VARIANT=\"${OVOS_NAME} - Buildroot Edition\""
+ echo "VARIANT_ID=${OVOS_ID}-${BOARD_ID}-buildroot"
} > "${TARGET_DIR}/usr/lib/os-release"
# Write machine-info
diff --git a/buildroot-external/board/ovos/pc/post-build.sh b/buildroot-external/board/ovos/pc/post-build.sh
index d5f6d265..13ecb32f 100755
--- a/buildroot-external/board/ovos/pc/post-build.sh
+++ b/buildroot-external/board/ovos/pc/post-build.sh
@@ -19,8 +19,8 @@ BOARD_DIR="$(dirname $0)"
echo "HOME_URL=https://github.com/OpenVoiceOS/OpenVoiceOS"
echo "DOCUMENTATION_URL=https://github.com/OpenVoiceOS/OpenVoiceOS/tree/develop/documentation"
echo "SUPPORT_URL=https://github.com/OpenVoiceOS/OpenVoiceOS/issues"
- echo "VARIANT=\"${OVOS_NAME} - Mycroft Edition\""
- echo "VARIANT_ID=${OVOS_ID}-${BOARD_ID}-mycroft"
+ echo "VARIANT=\"${OVOS_NAME} - Buildroot Edition\""
+ echo "VARIANT_ID=${OVOS_ID}-${BOARD_ID}-buildroot"
} > "${TARGET_DIR}/usr/lib/os-release"
# Write machine-info
diff --git a/buildroot-external/board/ovos/raspberrypi/post-build.sh b/buildroot-external/board/ovos/raspberrypi/post-build.sh
index 2bbf2741..9240ff7b 100755
--- a/buildroot-external/board/ovos/raspberrypi/post-build.sh
+++ b/buildroot-external/board/ovos/raspberrypi/post-build.sh
@@ -19,8 +19,8 @@ BOARD_DIR="$(dirname $0)"
echo "HOME_URL=https://github.com/OpenVoiceOS/OpenVoiceOS"
echo "DOCUMENTATION_URL=https://github.com/OpenVoiceOS/OpenVoiceOS/tree/develop/documentation"
echo "SUPPORT_URL=https://github.com/OpenVoiceOS/OpenVoiceOS/issues"
- echo "VARIANT=\"${OVOS_NAME} - Mycroft Edition\""
- echo "VARIANT_ID=${OVOS_ID}-${BOARD_ID}-mycroft"
+ echo "VARIANT=\"${OVOS_NAME} - Buildroot Edition\""
+ echo "VARIANT_ID=${OVOS_ID}-${BOARD_ID}-buildroot"
} > "${TARGET_DIR}/usr/lib/os-release"
# Write machine-info
diff --git a/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/usr/lib/systemd/system/nodered.service b/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/usr/lib/systemd/system/nodered.service
deleted file mode 100644
index dcb17eeb..00000000
--- a/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/usr/lib/systemd/system/nodered.service
+++ /dev/null
@@ -1,32 +0,0 @@
-# systemd service file to start Node-RED
-
-[Unit]
-Description=Node-RED graphical event wiring tool
-Wants=network.target
-Documentation=http://nodered.org/docs/hardware/raspberrypi.html
-
-[Service]
-Type=simple
-# Run as normal pi user - change to the user name you wish to run Node-RED as
-User=mycroft
-Group=mycroft
-WorkingDirectory=/home/mycroft
-
-Nice=5
-Environment="NODE_OPTIONS=--max_old_space_size=512"
-# uncomment and edit next line if you need an http proxy
-#Environment="HTTP_PROXY=my.httpproxy.server.address"
-# uncomment the next line for a more verbose log output
-#Environment="NODE_RED_OPTIONS=-v"
-#ExecStart=/usr/bin/env node $NODE_OPTIONS red.js $NODE_RED_OPTIONS
-ExecStart=/usr/bin/env node-red-pi $NODE_OPTIONS $NODE_RED_OPTIONS
-# Use SIGINT to stop
-KillSignal=SIGINT
-# Auto restart on crash
-Restart=on-failure
-# Tag things in the log
-SyslogIdentifier=Node-RED
-#StandardOutput=syslog
-
-[Install]
-WantedBy=multi-user.target
diff --git a/buildroot-external/configs/ova_64_defconfig b/buildroot-external/configs/ova_64_defconfig
index 071f9b0c..1974f6b5 100644
--- a/buildroot-external/configs/ova_64_defconfig
+++ b/buildroot-external/configs/ova_64_defconfig
@@ -54,176 +54,19 @@ BR2_PACKAGE_ALSA_UTILS_ASEQNET=y
BR2_PACKAGE_ALSA_UTILS_BAT=y
BR2_PACKAGE_ALSA_UTILS_IECSET=y
BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_INSTALL_TOOLS=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ADDER=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOMIXER=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORATE=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_COMPOSITOR=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ENCODING=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_OVERLAYCOMPOSITION=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_RAWPARSE=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_SUBPARSE=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TCP=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEORATE=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ALSA=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TREMOR=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_OGG=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_OPUS=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PANGO=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_THEORA=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VORBIS=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_JPEG=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PNG=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOFX=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOPARSERS=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUPARSE=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUTODETECT=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_CUTTER=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DEBUGUTILS=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DEINTERLACE=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DTMF=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_EFFECTV=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_EQUALIZER=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLV=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLX=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GOOM=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GOOM2K1=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ICYDEMUX=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ID3DEMUX=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_IMAGEFREEZE=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_INTERLEAVE=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LAW=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LEVEL=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MATROSKA=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MONOSCOPE=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MULTIFILE=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MULTIPART=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_REPLAYGAIN=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTP=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTPMANAGER=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTSP=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SHAPEWIPE=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SMPTE=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SPECTRUM=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_UDP=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOBOX=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOCROP=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOFILTER=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOMIXER=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVENC=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_XINGMUX=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_Y4M=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LAME=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MPG123=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_OSS=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_OSS4=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2_PROBE=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_CAIRO=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLAC=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_PULSE=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SPEEX=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_TAGLIB=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_TWOLAME=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVPACK=y
-BR2_PACKAGE_GST1_PLUGINS_BAD=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ADPCMDEC=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ADPCMENC=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AIFF=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOBUFFERSPLIT=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOFXBAD=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOLATENCY=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOMIXMATRIX=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOVISUALIZERS=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUTOCONVERT=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BAYER=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CAMERABIN2=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COLOREFFECTS=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DEBUGUTILS=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVBSUBENC=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVBSUBOVERLAY=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVDSPU=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FACEOVERLAY=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FESTIVAL=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FREEVERB=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GAUDIEFFECTS=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GDP=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ID3TAG=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_INTERLACE=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_JPEGFORMAT=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MIDI=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGDEMUX=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSMUX=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGPSMUX=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ONVIF=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PROXY=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RAWPARSE=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTMP2=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTP2=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTMP=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDP=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SEGMENTCLIP=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SUBENC=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SWITCHBIN=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_TIMECODE=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOFILTERS=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOFRAME_AUDIOLEVEL=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOPARSERS=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOSIGNAL=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VMNC=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_Y4M=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BLUEZ=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BZ2=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CURL=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DASH=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DECKLINK=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVB=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FAAD=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FBDEV=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FDK_AAC=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FLUIDSYNTH=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_HLS=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_KMS=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DTLS=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEG2ENC=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENH264=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENJPEG=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SHM=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SNDFILE=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SRTP=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_UVCH264=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VOAACENC=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBP=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTC=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTCDSP=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_V4L2CODECS=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_X265=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_ZBAR=y
-BR2_PACKAGE_GST1_PLUGINS_UGLY=y
-BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_ASFDEMUX=y
-BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDLPCMDEC=y
-BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDSUB=y
-BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_REALMEDIA=y
-BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDREAD=y
-BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MPEG2DEC=y
-BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_X264=y
-BR2_PACKAGE_GST1_DEVTOOLS=y
-BR2_PACKAGE_GST1_INTERPIPE=y
-BR2_PACKAGE_GST1_LIBAV=y
-BR2_PACKAGE_GST1_PYTHON=y
-BR2_PACKAGE_MPV=y
+BR2_PACKAGE_FFMPEG=y
+BR2_PACKAGE_FFMPEG_GPL=y
+BR2_PACKAGE_FFMPEG_NONFREE=y
+BR2_PACKAGE_FFMPEG_FFPLAY=y
+BR2_PACKAGE_FFMPEG_FFPROBE=y
+BR2_PACKAGE_FFMPEG_AVRESAMPLE=y
+BR2_PACKAGE_FFMPEG_POSTPROC=y
BR2_PACKAGE_PIPEWIRE=y
BR2_PACKAGE_PIPEWIRE_COMPRESS_OFFLOAD=y
+BR2_PACKAGE_PIPEWIRE_EXAMPLES=y
BR2_PACKAGE_PIPEWIRE_GSTREAMER=y
BR2_PACKAGE_PIPEWIRE_V4L2=y
-BR2_PACKAGE_SOX=y
+BR2_PACKAGE_PULSEAUDIO=y
BR2_PACKAGE_V4L2GRAB=y
BR2_PACKAGE_V4L2LOOPBACK=y
BR2_PACKAGE_V4L2LOOPBACK_UTILS=y
@@ -307,9 +150,15 @@ BR2_PACKAGE_RNG_TOOLS=y
BR2_PACKAGE_USB_MODESWITCH_DATA=y
BR2_PACKAGE_LUA=y
BR2_PACKAGE_PYTHON3=y
+BR2_PACKAGE_PYTHON3_PYEXPAT=y
+BR2_PACKAGE_PYTHON_GOBJECT=y
BR2_PACKAGE_PYTHON_PODMAN_COMPOSE=y
+BR2_PACKAGE_LILV=y
+BR2_PACKAGE_OPUS=y
BR2_PACKAGE_PORTAUDIO=y
-BR2_PACKAGE_SPEEXDSP=y
+BR2_PACKAGE_SBC=y
+BR2_PACKAGE_SBC_TOOLS=y
+BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING=y
BR2_PACKAGE_LIBARCHIVE=y
BR2_PACKAGE_LIBDEFLATE=y
BR2_PACKAGE_LZ4_PROGS=y
@@ -324,22 +173,53 @@ BR2_PACKAGE_LIBNFS=y
BR2_PACKAGE_LIBSYSFS=y
BR2_PACKAGE_LOCKDEV=y
BR2_PACKAGE_PHYSFS=y
+BR2_PACKAGE_FONTCONFIG=y
+BR2_PACKAGE_HARFBUZZ=y
+BR2_PACKAGE_LIBPNG=y
+BR2_PACKAGE_OPENJPEG=y
+BR2_PACKAGE_PIXMAN=y
+BR2_PACKAGE_WEBP=y
BR2_PACKAGE_WIREPLUMBER=y
+BR2_PACKAGE_ZBAR=y
+BR2_PACKAGE_LIBGUDEV=y
+BR2_PACKAGE_LIBV4L_UTILS=y
+BR2_PACKAGE_JSON_GLIB=y
+BR2_PACKAGE_LIBCAMERA=y
+BR2_PACKAGE_LIBCAMERA_V4L2=y
+BR2_PACKAGE_LIBCAMERA_PIPELINE_IPU3=y
+BR2_PACKAGE_LIBCAMERA_PIPELINE_SIMPLE=y
+BR2_PACKAGE_LIBCAMERA_PIPELINE_UVCVIDEO=y
+BR2_PACKAGE_LIBCAMERA_PIPELINE_VIMC=y
+BR2_PACKAGE_LIBCURL=y
BR2_PACKAGE_LIBCURL_CURL=y
BR2_PACKAGE_LIBNDP=y
+BR2_PACKAGE_LIBNICE=y
BR2_PACKAGE_LIBRSYNC=y
+BR2_PACKAGE_LIBSOUP=y
+BR2_PACKAGE_LIBSRTP=y
BR2_PACKAGE_LIBURIPARSER=y
BR2_PACKAGE_LIBWEBSOCKETS=y
+BR2_PACKAGE_RTMPDUMP=y
BR2_PACKAGE_SLIRP4NETNS=y
BR2_PACKAGE_ZEROMQ=y
BR2_PACKAGE_ZEROMQ_WEBSOCKET=y
BR2_PACKAGE_LIBCAP_TOOLS=y
BR2_PACKAGE_LIBNPTH=y
+BR2_PACKAGE_LIBFRIBIDI=y
BR2_PACKAGE_PCRE2=y
+BR2_PACKAGE_AVAHI=y
+BR2_PACKAGE_AVAHI_DAEMON=y
+BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
+BR2_PACKAGE_AVAHI_DEFAULT_SERVICES=y
BR2_PACKAGE_BLUEZ_TOOLS=y
+BR2_PACKAGE_BLUEZ5_UTILS=y
BR2_PACKAGE_BLUEZ5_UTILS_OBEX=y
BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
BR2_PACKAGE_BLUEZ5_UTILS_MONITOR=y
+BR2_PACKAGE_BLUEZ5_UTILS_EXPERIMENTAL=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HEALTH=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_NFC=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SAP=y
BR2_PACKAGE_BLUEZ5_UTILS_TOOLS_HID2HCI=y
BR2_PACKAGE_CRDA=y
BR2_PACKAGE_IPROUTE2=y
diff --git a/buildroot-external/configs/rpi4_64_defconfig b/buildroot-external/configs/rpi4_64_defconfig
index 46e4dc53..41bd497c 100644
--- a/buildroot-external/configs/rpi4_64_defconfig
+++ b/buildroot-external/configs/rpi4_64_defconfig
@@ -54,176 +54,19 @@ BR2_PACKAGE_ALSA_UTILS_ASEQNET=y
BR2_PACKAGE_ALSA_UTILS_BAT=y
BR2_PACKAGE_ALSA_UTILS_IECSET=y
BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_INSTALL_TOOLS=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ADDER=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOMIXER=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORATE=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_COMPOSITOR=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ENCODING=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_OVERLAYCOMPOSITION=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_RAWPARSE=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_SUBPARSE=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TCP=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEORATE=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ALSA=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TREMOR=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_OGG=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_OPUS=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PANGO=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_THEORA=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VORBIS=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_JPEG=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PNG=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOFX=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOPARSERS=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUPARSE=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUTODETECT=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_CUTTER=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DEBUGUTILS=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DEINTERLACE=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DTMF=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_EFFECTV=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_EQUALIZER=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLV=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLX=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GOOM=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GOOM2K1=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ICYDEMUX=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ID3DEMUX=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_IMAGEFREEZE=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_INTERLEAVE=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LAW=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LEVEL=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MATROSKA=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MONOSCOPE=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MULTIFILE=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MULTIPART=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_REPLAYGAIN=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTP=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTPMANAGER=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTSP=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SHAPEWIPE=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SMPTE=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SPECTRUM=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_UDP=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOBOX=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOCROP=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOFILTER=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOMIXER=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVENC=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_XINGMUX=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_Y4M=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LAME=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MPG123=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_OSS=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_OSS4=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2_PROBE=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_CAIRO=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLAC=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_PULSE=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SPEEX=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_TAGLIB=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_TWOLAME=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVPACK=y
-BR2_PACKAGE_GST1_PLUGINS_BAD=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ADPCMDEC=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ADPCMENC=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AIFF=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOBUFFERSPLIT=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOFXBAD=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOLATENCY=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOMIXMATRIX=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOVISUALIZERS=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUTOCONVERT=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BAYER=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CAMERABIN2=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COLOREFFECTS=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DEBUGUTILS=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVBSUBENC=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVBSUBOVERLAY=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVDSPU=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FACEOVERLAY=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FESTIVAL=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FREEVERB=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GAUDIEFFECTS=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GDP=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ID3TAG=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_INTERLACE=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_JPEGFORMAT=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MIDI=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGDEMUX=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSMUX=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGPSMUX=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ONVIF=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PROXY=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RAWPARSE=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTMP2=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTP2=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTMP=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDP=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SEGMENTCLIP=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SUBENC=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SWITCHBIN=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_TIMECODE=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOFILTERS=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOFRAME_AUDIOLEVEL=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOPARSERS=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOSIGNAL=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VMNC=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_Y4M=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BLUEZ=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BZ2=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CURL=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DASH=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DECKLINK=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVB=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FAAD=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FBDEV=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FDK_AAC=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FLUIDSYNTH=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_HLS=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_KMS=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DTLS=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEG2ENC=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENH264=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENJPEG=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SHM=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SNDFILE=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SRTP=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_UVCH264=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VOAACENC=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBP=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTC=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTCDSP=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_V4L2CODECS=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_X265=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_ZBAR=y
-BR2_PACKAGE_GST1_PLUGINS_UGLY=y
-BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_ASFDEMUX=y
-BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDLPCMDEC=y
-BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDSUB=y
-BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_REALMEDIA=y
-BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDREAD=y
-BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MPEG2DEC=y
-BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_X264=y
-BR2_PACKAGE_GST1_DEVTOOLS=y
-BR2_PACKAGE_GST1_INTERPIPE=y
-BR2_PACKAGE_GST1_LIBAV=y
-BR2_PACKAGE_GST1_PYTHON=y
-BR2_PACKAGE_MPV=y
+BR2_PACKAGE_FFMPEG=y
+BR2_PACKAGE_FFMPEG_GPL=y
+BR2_PACKAGE_FFMPEG_NONFREE=y
+BR2_PACKAGE_FFMPEG_FFPLAY=y
+BR2_PACKAGE_FFMPEG_FFPROBE=y
+BR2_PACKAGE_FFMPEG_AVRESAMPLE=y
+BR2_PACKAGE_FFMPEG_POSTPROC=y
BR2_PACKAGE_PIPEWIRE=y
BR2_PACKAGE_PIPEWIRE_COMPRESS_OFFLOAD=y
+BR2_PACKAGE_PIPEWIRE_EXAMPLES=y
BR2_PACKAGE_PIPEWIRE_GSTREAMER=y
BR2_PACKAGE_PIPEWIRE_V4L2=y
-BR2_PACKAGE_SOX=y
+BR2_PACKAGE_PULSEAUDIO=y
BR2_PACKAGE_V4L2GRAB=y
BR2_PACKAGE_V4L2LOOPBACK=y
BR2_PACKAGE_V4L2LOOPBACK_UTILS=y
@@ -290,9 +133,16 @@ BR2_PACKAGE_SPI_TOOLS=y
BR2_PACKAGE_USB_MODESWITCH_DATA=y
BR2_PACKAGE_LUA=y
BR2_PACKAGE_PYTHON3=y
+BR2_PACKAGE_PYTHON3_PYEXPAT=y
+BR2_PACKAGE_PYTHON_GOBJECT=y
BR2_PACKAGE_PYTHON_PODMAN_COMPOSE=y
+BR2_PACKAGE_LILV=y
+BR2_PACKAGE_OPUS=y
BR2_PACKAGE_PORTAUDIO=y
BR2_PACKAGE_SPEEXDSP=y
+BR2_PACKAGE_SBC=y
+BR2_PACKAGE_SBC_TOOLS=y
+BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING=y
BR2_PACKAGE_LIBARCHIVE=y
BR2_PACKAGE_LIBDEFLATE=y
BR2_PACKAGE_LZ4_PROGS=y
@@ -307,10 +157,30 @@ BR2_PACKAGE_LIBNFS=y
BR2_PACKAGE_LIBSYSFS=y
BR2_PACKAGE_LOCKDEV=y
BR2_PACKAGE_PHYSFS=y
+BR2_PACKAGE_FONTCONFIG=y
+BR2_PACKAGE_HARFBUZZ=y
+BR2_PACKAGE_LIBPNG=y
+BR2_PACKAGE_OPENJPEG=y
+BR2_PACKAGE_PIXMAN=y
+BR2_PACKAGE_WEBP=y
BR2_PACKAGE_WIREPLUMBER=y
+BR2_PACKAGE_ZBAR=y
+BR2_PACKAGE_LIBGUDEV=y
+BR2_PACKAGE_LIBV4L_UTILS=y
+BR2_PACKAGE_JSON_GLIB=y
+BR2_PACKAGE_LIBCAMERA=y
+BR2_PACKAGE_LIBCAMERA_V4L2=y
+BR2_PACKAGE_LIBCAMERA_PIPELINE_IPU3=y
+BR2_PACKAGE_LIBCAMERA_PIPELINE_SIMPLE=y
+BR2_PACKAGE_LIBCAMERA_PIPELINE_UVCVIDEO=y
+BR2_PACKAGE_LIBCAMERA_PIPELINE_VIMC=y
+BR2_PACKAGE_LIBCURL=y
BR2_PACKAGE_LIBCURL_CURL=y
BR2_PACKAGE_LIBNDP=y
+BR2_PACKAGE_LIBNICE=y
BR2_PACKAGE_LIBRSYNC=y
+BR2_PACKAGE_LIBSOUP=y
+BR2_PACKAGE_LIBSRTP=y
BR2_PACKAGE_LIBURIPARSER=y
BR2_PACKAGE_LIBWEBSOCKETS=y
BR2_PACKAGE_SLIRP4NETNS=y
@@ -318,11 +188,21 @@ BR2_PACKAGE_ZEROMQ=y
BR2_PACKAGE_ZEROMQ_WEBSOCKET=y
BR2_PACKAGE_LIBCAP_TOOLS=y
BR2_PACKAGE_LIBNPTH=y
+BR2_PACKAGE_LIBFRIBIDI=y
BR2_PACKAGE_PCRE2=y
+BR2_PACKAGE_AVAHI=y
+BR2_PACKAGE_AVAHI_DAEMON=y
+BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
+BR2_PACKAGE_AVAHI_DEFAULT_SERVICES=y
BR2_PACKAGE_BLUEZ_TOOLS=y
+BR2_PACKAGE_BLUEZ5_UTILS=y
BR2_PACKAGE_BLUEZ5_UTILS_OBEX=y
BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
BR2_PACKAGE_BLUEZ5_UTILS_MONITOR=y
+BR2_PACKAGE_BLUEZ5_UTILS_EXPERIMENTAL=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HEALTH=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_NFC=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SAP=y
BR2_PACKAGE_BLUEZ5_UTILS_TOOLS_HID2HCI=y
BR2_PACKAGE_CRDA=y
BR2_PACKAGE_IPROUTE2=y
diff --git a/buildroot-external/package/ovos-splash/Config.in b/buildroot-external/package/ovos-splash/Config.in
index 340c3218..b08c2eb4 100644
--- a/buildroot-external/package/ovos-splash/Config.in
+++ b/buildroot-external/package/ovos-splash/Config.in
@@ -30,5 +30,5 @@ config BR2_PACKAGE_OVOS_SPLASH
http://git.yoctoproject.org/cgit/cgit.cgi/psplash/
-comment "mycroft-splash needs a toolchain w/ wchar"
+comment "ovos-splash needs a toolchain w/ wchar"
depends on !BR2_USE_WCHAR
diff --git a/buildroot-external/package/ovos-splash/ovos-splash-quit.service b/buildroot-external/package/ovos-splash/ovos-splash-quit.service
index fd443083..9922a611 100644
--- a/buildroot-external/package/ovos-splash/ovos-splash-quit.service
+++ b/buildroot-external/package/ovos-splash/ovos-splash-quit.service
@@ -1,7 +1,5 @@
[Unit]
Description=Terminate OVOS splash boot Screen
-After=mycroft-messagebus.service
-After=mycroft-gui.service
[Service]
Type=oneshot
diff --git a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_audio.container b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_audio.container
index 960913c7..01c45d40 100644
--- a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_audio.container
+++ b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_audio.container
@@ -17,7 +17,8 @@ HostName=ovos_audio
Network=host
Timezone=local
UserNS=keep-id:uid=%U,gid=%G
-EnvironmentHost=true
+Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/1000/bus
+Environment=XDG_RUNTIME_DIR=%t
AddDevice=/dev/snd
Volume=%h/ovos/config:/home/ovos/.config/mycroft
Volume=%h/ovos/tmp:/tmp/mycroft
diff --git a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_core.container b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_core.container
index 73047bc1..0bed446f 100644
--- a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_core.container
+++ b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_core.container
@@ -17,7 +17,7 @@ HostName=ovos_core
Network=host
Timezone=local
UserNS=keep-id:uid=%U,gid=%G
-EnvironmentHost=true
+Environment=XDG_RUNTIME_DIR=%t
AddDevice=/dev/snd
Volume=%h/ovos/config:/home/ovos/.config/mycroft
Volume=%h/ovos/tmp:/tmp/mycroft
diff --git a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_listener.container b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_listener.container
index 0535ea01..79500cf0 100644
--- a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_listener.container
+++ b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_listener.container
@@ -17,7 +17,7 @@ HostName=ovos_listener
Network=host
Timezone=local
UserNS=keep-id:uid=%U,gid=%G
-EnvironmentHost=true
+Environment=XDG_RUNTIME_DIR=%t
AddDevice=/dev/snd
Volume=%h/ovos/config:/home/ovos/.config/mycroft:ro
Volume=%h/ovos/tmp:/tmp/mycroft
diff --git a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_listener_records.volume b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_listener_records.volume
index a7c0dabb..bc224534 100644
--- a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_listener_records.volume
+++ b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_listener_records.volume
@@ -1,4 +1,4 @@
[Volume]
-User=mycroft
-Group=mycroft
+User=ovos
+Group=ovos
Label=name=ovos_listener_records
diff --git a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_models.volume b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_models.volume
index 209716ce..a68eda64 100644
--- a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_models.volume
+++ b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_models.volume
@@ -1,4 +1,4 @@
[Volume]
-User=mycroft
-Group=mycroft
+User=ovos
+Group=ovos
Label=name=ovos_models
diff --git a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_nltk.volume b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_nltk.volume
index 243178de..c9d07bff 100644
--- a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_nltk.volume
+++ b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_nltk.volume
@@ -1,4 +1,4 @@
[Volume]
-User=mycroft
-Group=mycroft
+User=ovos
+Group=ovos
Label=name=ovos_nltk
diff --git a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_phal.container b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_phal.container
index 0c253227..60f7297b 100644
--- a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_phal.container
+++ b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_phal.container
@@ -15,7 +15,7 @@ HostName=ovos_phal
Network=host
Timezone=local
UserNS=keep-id:uid=%U,gid=%G
-EnvironmentHost=true
+Environment=XDG_RUNTIME_DIR=%t
AddDevice=/dev/snd
Volume=%h/ovos/config:/home/ovos/.config/mycroft
Volume=%h/ovos/tmp:/tmp/mycroft
diff --git a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_tts_cache.volume b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_tts_cache.volume
index 79dfa1a8..2e111cde 100644
--- a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_tts_cache.volume
+++ b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_tts_cache.volume
@@ -1,4 +1,4 @@
[Volume]
-User=mycroft
-Group=mycroft
+User=ovos
+Group=ovos
Label=name=ovos_tts_cache
diff --git a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_vosk.volume b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_vosk.volume
index ac20a914..b331ec15 100644
--- a/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_vosk.volume
+++ b/buildroot-external/rootfs-overlay/etc/containers/systemd/users/ovos_vosk.volume
@@ -1,4 +1,4 @@
[Volume]
-User=mycroft
-Group=mycroft
+User=ovos
+Group=ovos
Label=name=ovos_vosk
diff --git a/buildroot-external/rootfs-overlay/etc/dbus-1/system.d/audio-mpris.conf b/buildroot-external/rootfs-overlay/etc/dbus-1/system.d/audio-mpris.conf
deleted file mode 100644
index b9819207..00000000
--- a/buildroot-external/rootfs-overlay/etc/dbus-1/system.d/audio-mpris.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
diff --git a/buildroot-external/rootfs-overlay/etc/dbus-1/system.d/mycroft.conf b/buildroot-external/rootfs-overlay/etc/dbus-1/system.d/mycroft.conf
deleted file mode 100644
index d51aabd2..00000000
--- a/buildroot-external/rootfs-overlay/etc/dbus-1/system.d/mycroft.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/buildroot-external/rootfs-overlay/etc/dbus-1/system.d/pulseaudio-system.conf b/buildroot-external/rootfs-overlay/etc/dbus-1/system.d/pulseaudio-system.conf
deleted file mode 100644
index f3b43e1e..00000000
--- a/buildroot-external/rootfs-overlay/etc/dbus-1/system.d/pulseaudio-system.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/buildroot-external/rootfs-overlay/etc/dbus-1/system.d/shairport-sync-dbus-policy.conf b/buildroot-external/rootfs-overlay/etc/dbus-1/system.d/shairport-sync-dbus-policy.conf
index 6c22c57b..37c4780b 100644
--- a/buildroot-external/rootfs-overlay/etc/dbus-1/system.d/shairport-sync-dbus-policy.conf
+++ b/buildroot-external/rootfs-overlay/etc/dbus-1/system.d/shairport-sync-dbus-policy.conf
@@ -4,11 +4,11 @@
"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-
+
-
+
diff --git a/buildroot-external/rootfs-overlay/etc/dbus-1/system.d/shairport-sync-mpris-policy.conf b/buildroot-external/rootfs-overlay/etc/dbus-1/system.d/shairport-sync-mpris-policy.conf
index e44e6d46..443467bd 100644
--- a/buildroot-external/rootfs-overlay/etc/dbus-1/system.d/shairport-sync-mpris-policy.conf
+++ b/buildroot-external/rootfs-overlay/etc/dbus-1/system.d/shairport-sync-mpris-policy.conf
@@ -4,8 +4,8 @@
"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-
-
+
+
diff --git a/buildroot-external/rootfs-overlay/etc/dbus-1/system.d/spotifyd-mpris-policy.conf b/buildroot-external/rootfs-overlay/etc/dbus-1/system.d/spotifyd-mpris-policy.conf
index eb0db39f..2d09d9e6 100644
--- a/buildroot-external/rootfs-overlay/etc/dbus-1/system.d/spotifyd-mpris-policy.conf
+++ b/buildroot-external/rootfs-overlay/etc/dbus-1/system.d/spotifyd-mpris-policy.conf
@@ -4,8 +4,8 @@
"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-
-
+
+
diff --git a/buildroot-external/rootfs-overlay/etc/subgid b/buildroot-external/rootfs-overlay/etc/subgid
index 00f1f16d..343bdde3 100644
--- a/buildroot-external/rootfs-overlay/etc/subgid
+++ b/buildroot-external/rootfs-overlay/etc/subgid
@@ -1 +1 @@
-mycroft:100000:65536
+ovos:100000:65536
diff --git a/buildroot-external/rootfs-overlay/etc/subuid b/buildroot-external/rootfs-overlay/etc/subuid
index 00f1f16d..343bdde3 100644
--- a/buildroot-external/rootfs-overlay/etc/subuid
+++ b/buildroot-external/rootfs-overlay/etc/subuid
@@ -1 +1 @@
-mycroft:100000:65536
+ovos:100000:65536
diff --git a/buildroot-external/rootfs-overlay/etc/sudoers.d/mycroft b/buildroot-external/rootfs-overlay/etc/sudoers.d/mycroft
deleted file mode 100644
index 51413bf5..00000000
--- a/buildroot-external/rootfs-overlay/etc/sudoers.d/mycroft
+++ /dev/null
@@ -1 +0,0 @@
-mycroft ALL=(ALL:ALL) NOPASSWD: ALL
diff --git a/buildroot-external/rootfs-overlay/etc/sudoers.d/ovos b/buildroot-external/rootfs-overlay/etc/sudoers.d/ovos
new file mode 100644
index 00000000..fece3075
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/etc/sudoers.d/ovos
@@ -0,0 +1 @@
+ovos ALL=(ALL:ALL) NOPASSWD: ALL
diff --git a/buildroot-external/rootfs-overlay/etc/tmpfiles.d/mycroft.conf b/buildroot-external/rootfs-overlay/etc/tmpfiles.d/mycroft.conf
deleted file mode 100644
index 22bac379..00000000
--- a/buildroot-external/rootfs-overlay/etc/tmpfiles.d/mycroft.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-d /var/log/mycroft 700 mycroft mycroft
-Z /usr/share/mycroft - mycroft mycroft
diff --git a/buildroot-external/rootfs-overlay/etc/tmpfiles.d/ovos.conf b/buildroot-external/rootfs-overlay/etc/tmpfiles.d/ovos.conf
new file mode 100644
index 00000000..3eb2ce01
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/etc/tmpfiles.d/ovos.conf
@@ -0,0 +1,2 @@
+d /var/log/ovos 700 ovos ovos
+Z /usr/share/ovos - ovos ovos
diff --git a/buildroot-external/rootfs-overlay/home/mycroft/cli_login.sh b/buildroot-external/rootfs-overlay/home/mycroft/cli_login.sh
deleted file mode 100644
index 674a051e..00000000
--- a/buildroot-external/rootfs-overlay/home/mycroft/cli_login.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-echo -e "\e[31m"
-echo " ___ __ __ _ ___ ____ "
-echo " / _ \ _ __ ___ _ _\ \ / /__ (_) ___ ___ / _ \/ ___| "
-echo " | | | | '_ \ / _ \ '_ \ \ / / _ \| |/ __/ _ \ | | \___ \ "
-echo " | |_| | |_) | __/ | | \ V / (_) | | (_| __/ |_| |___) |"
-echo " \___/| .__/ \___|_| |_|\_/ \___/|_|\___\___|\___/|____/ "
-echo " |_| "
-echo
-echo -e "\e[0m"
-echo " --- Welcome to OpenVoiceOS --- "
-echo " Mycroft Edition v0.1.0 "
-echo
-echo "Mycroft Tool COMMANDs:"
-echo " mycroft-cli-client Command line client, useful for debugging"
-echo " mycroft-config Manage your local Mycroft configuration files"
-echo " mycroft-listen Activate the microphone to listen for a command"
-echo " mycroft-speak Have Mycroft speak a phrase to the user"
-echo " mycroft-say-to Send an utterance to Mycroft as if spoken by a user"
-echo
-echo "Mycroft Skill Manager COMMANDs:"
-echo " msm install Install mycroft skills"
-echo " msm remove Uninstall mycroft skills"
-echo " msm update Update installed skills"
-echo
diff --git a/buildroot-external/rootfs-overlay/home/mycroft/.bash_profile b/buildroot-external/rootfs-overlay/home/ovos/.bash_profile
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/mycroft/.bash_profile
rename to buildroot-external/rootfs-overlay/home/ovos/.bash_profile
diff --git a/buildroot-external/rootfs-overlay/home/mycroft/.bashrc b/buildroot-external/rootfs-overlay/home/ovos/.bashrc
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/mycroft/.bashrc
rename to buildroot-external/rootfs-overlay/home/ovos/.bashrc
diff --git a/buildroot-external/rootfs-overlay/home/mycroft/.config/containers/storage.conf b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/storage.conf
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/mycroft/.config/containers/storage.conf
rename to buildroot-external/rootfs-overlay/home/ovos/.config/containers/storage.conf
diff --git a/buildroot-external/rootfs-overlay/home/mycroft/.config/mycroft/mycroft.conf b/buildroot-external/rootfs-overlay/home/ovos/.config/mycroft/mycroft.conf
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/mycroft/.config/mycroft/mycroft.conf
rename to buildroot-external/rootfs-overlay/home/ovos/.config/mycroft/mycroft.conf
diff --git a/buildroot-external/rootfs-overlay/home/mycroft/.config/mycroft/mycroft_cli.conf b/buildroot-external/rootfs-overlay/home/ovos/.config/mycroft/mycroft_cli.conf
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/mycroft/.config/mycroft/mycroft_cli.conf
rename to buildroot-external/rootfs-overlay/home/ovos/.config/mycroft/mycroft_cli.conf
diff --git a/buildroot-external/rootfs-overlay/home/mycroft/.config/mycroft/skills/skill-news.jarbasskills/settings.json b/buildroot-external/rootfs-overlay/home/ovos/.config/mycroft/skills/skill-news.jarbasskills/settings.json
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/mycroft/.config/mycroft/skills/skill-news.jarbasskills/settings.json
rename to buildroot-external/rootfs-overlay/home/ovos/.config/mycroft/skills/skill-news.jarbasskills/settings.json
diff --git a/buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/basic.target.wants/systemd-tmpfiles-setup.service b/buildroot-external/rootfs-overlay/home/ovos/.config/systemd/user/basic.target.wants/systemd-tmpfiles-setup.service
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/basic.target.wants/systemd-tmpfiles-setup.service
rename to buildroot-external/rootfs-overlay/home/ovos/.config/systemd/user/basic.target.wants/systemd-tmpfiles-setup.service
diff --git a/buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/dbus-org.bluez.obex.service b/buildroot-external/rootfs-overlay/home/ovos/.config/systemd/user/dbus-org.bluez.obex.service
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/dbus-org.bluez.obex.service
rename to buildroot-external/rootfs-overlay/home/ovos/.config/systemd/user/dbus-org.bluez.obex.service
diff --git a/buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/default.target.wants/.empty b/buildroot-external/rootfs-overlay/home/ovos/.config/systemd/user/default.target.wants/.empty
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/default.target.wants/.empty
rename to buildroot-external/rootfs-overlay/home/ovos/.config/systemd/user/default.target.wants/.empty
diff --git a/buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/default.target.wants/pipewire-pulse.service b/buildroot-external/rootfs-overlay/home/ovos/.config/systemd/user/default.target.wants/pipewire-pulse.service
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/default.target.wants/pipewire-pulse.service
rename to buildroot-external/rootfs-overlay/home/ovos/.config/systemd/user/default.target.wants/pipewire-pulse.service
diff --git a/buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/default.target.wants/pipewire.service b/buildroot-external/rootfs-overlay/home/ovos/.config/systemd/user/default.target.wants/pipewire.service
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/default.target.wants/pipewire.service
rename to buildroot-external/rootfs-overlay/home/ovos/.config/systemd/user/default.target.wants/pipewire.service
diff --git a/buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/pipewire-session-manager.service b/buildroot-external/rootfs-overlay/home/ovos/.config/systemd/user/pipewire-session-manager.service
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/pipewire-session-manager.service
rename to buildroot-external/rootfs-overlay/home/ovos/.config/systemd/user/pipewire-session-manager.service
diff --git a/buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/pipewire.service.wants/wireplumber.service b/buildroot-external/rootfs-overlay/home/ovos/.config/systemd/user/pipewire.service.wants/wireplumber.service
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/pipewire.service.wants/wireplumber.service
rename to buildroot-external/rootfs-overlay/home/ovos/.config/systemd/user/pipewire.service.wants/wireplumber.service
diff --git a/buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/sockets.target.wants/dbus.socket b/buildroot-external/rootfs-overlay/home/ovos/.config/systemd/user/sockets.target.wants/dbus.socket
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/sockets.target.wants/dbus.socket
rename to buildroot-external/rootfs-overlay/home/ovos/.config/systemd/user/sockets.target.wants/dbus.socket
diff --git a/buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/sockets.target.wants/pipewire-pulse.socket b/buildroot-external/rootfs-overlay/home/ovos/.config/systemd/user/sockets.target.wants/pipewire-pulse.socket
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/sockets.target.wants/pipewire-pulse.socket
rename to buildroot-external/rootfs-overlay/home/ovos/.config/systemd/user/sockets.target.wants/pipewire-pulse.socket
diff --git a/buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/sockets.target.wants/pipewire.socket b/buildroot-external/rootfs-overlay/home/ovos/.config/systemd/user/sockets.target.wants/pipewire.socket
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/sockets.target.wants/pipewire.socket
rename to buildroot-external/rootfs-overlay/home/ovos/.config/systemd/user/sockets.target.wants/pipewire.socket
diff --git a/buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/timers.target.wants/systemd-tmpfiles-clean.timer b/buildroot-external/rootfs-overlay/home/ovos/.config/systemd/user/timers.target.wants/systemd-tmpfiles-clean.timer
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/timers.target.wants/systemd-tmpfiles-clean.timer
rename to buildroot-external/rootfs-overlay/home/ovos/.config/systemd/user/timers.target.wants/systemd-tmpfiles-clean.timer
diff --git a/buildroot-external/rootfs-overlay/home/mycroft/.local/bin/.empty b/buildroot-external/rootfs-overlay/home/ovos/.local/bin/.empty
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/mycroft/.local/bin/.empty
rename to buildroot-external/rootfs-overlay/home/ovos/.local/bin/.empty
diff --git a/buildroot-external/rootfs-overlay/home/mycroft/.local/lib/.empty b/buildroot-external/rootfs-overlay/home/ovos/.local/lib/.empty
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/mycroft/.local/lib/.empty
rename to buildroot-external/rootfs-overlay/home/ovos/.local/lib/.empty
diff --git a/buildroot-external/rootfs-overlay/home/mycroft/.local/share/.empty b/buildroot-external/rootfs-overlay/home/ovos/.local/share/.empty
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/mycroft/.local/share/.empty
rename to buildroot-external/rootfs-overlay/home/ovos/.local/share/.empty
diff --git a/buildroot-external/rootfs-overlay/home/mycroft/.local/state/mycroft/.empty b/buildroot-external/rootfs-overlay/home/ovos/.local/state/mycroft/.empty
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/mycroft/.local/state/mycroft/.empty
rename to buildroot-external/rootfs-overlay/home/ovos/.local/state/mycroft/.empty
diff --git a/buildroot-external/rootfs-overlay/home/mycroft/.ncpamixer.conf b/buildroot-external/rootfs-overlay/home/ovos/.ncpamixer.conf
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/mycroft/.ncpamixer.conf
rename to buildroot-external/rootfs-overlay/home/ovos/.ncpamixer.conf
diff --git a/buildroot-external/rootfs-overlay/home/mycroft/.profile b/buildroot-external/rootfs-overlay/home/ovos/.profile
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/mycroft/.profile
rename to buildroot-external/rootfs-overlay/home/ovos/.profile
diff --git a/buildroot-external/rootfs-overlay/home/mycroft/Documents/.empty b/buildroot-external/rootfs-overlay/home/ovos/Documents/.empty
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/mycroft/Documents/.empty
rename to buildroot-external/rootfs-overlay/home/ovos/Documents/.empty
diff --git a/buildroot-external/rootfs-overlay/home/mycroft/Music/.empty b/buildroot-external/rootfs-overlay/home/ovos/Music/.empty
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/mycroft/Music/.empty
rename to buildroot-external/rootfs-overlay/home/ovos/Music/.empty
diff --git a/buildroot-external/rootfs-overlay/home/mycroft/Pictures/.empty b/buildroot-external/rootfs-overlay/home/ovos/Pictures/.empty
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/mycroft/Pictures/.empty
rename to buildroot-external/rootfs-overlay/home/ovos/Pictures/.empty
diff --git a/buildroot-external/rootfs-overlay/home/ovos/cli_login.sh b/buildroot-external/rootfs-overlay/home/ovos/cli_login.sh
new file mode 100644
index 00000000..7203b47d
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/home/ovos/cli_login.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+echo -e "\e[31m"
+echo " ___ __ __ _ ___ ____ "
+echo " / _ \ _ __ ___ _ _\ \ / /__ (_) ___ ___ / _ \/ ___| "
+echo " | | | | '_ \ / _ \ '_ \ \ / / _ \| |/ __/ _ \ | | \___ \ "
+echo " | |_| | |_) | __/ | | \ V / (_) | | (_| __/ |_| |___) |"
+echo " \___/| .__/ \___|_| |_|\_/ \___/|_|\___\___|\___/|____/ "
+echo " |_| "
+echo
+echo -e "\e[0m"
+echo " --- Welcome to OpenVoiceOS - -- "
+echo " v0.1.1 "
+echo
diff --git a/buildroot-external/rootfs-overlay/home/mycroft/ovos/config/.empty b/buildroot-external/rootfs-overlay/home/ovos/ovos/config/.empty
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/mycroft/ovos/config/.empty
rename to buildroot-external/rootfs-overlay/home/ovos/ovos/config/.empty
diff --git a/buildroot-external/rootfs-overlay/home/mycroft/ovos/share/.empty b/buildroot-external/rootfs-overlay/home/ovos/ovos/share/.empty
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/mycroft/ovos/share/.empty
rename to buildroot-external/rootfs-overlay/home/ovos/ovos/share/.empty
diff --git a/buildroot-external/rootfs-overlay/home/mycroft/ovos/tmp/.empty b/buildroot-external/rootfs-overlay/home/ovos/ovos/tmp/.empty
similarity index 100%
rename from buildroot-external/rootfs-overlay/home/mycroft/ovos/tmp/.empty
rename to buildroot-external/rootfs-overlay/home/ovos/ovos/tmp/.empty
diff --git a/buildroot-external/rootfs-overlay/usr/libexec/home-setup b/buildroot-external/rootfs-overlay/usr/libexec/home-setup
index 86c74302..a6ac46ef 100755
--- a/buildroot-external/rootfs-overlay/usr/libexec/home-setup
+++ b/buildroot-external/rootfs-overlay/usr/libexec/home-setup
@@ -1,6 +1,6 @@
#!/bin/sh
# home persistent overlay
-if [ ! -d /mnt/home/mycroft ]; then
- cp -a /home/mycroft /mnt/home/
+if [ ! -d /mnt/home/ovos ]; then
+ cp -a /home/ovos /mnt/home/
fi
diff --git a/buildroot-external/user_table.txt b/buildroot-external/user_table.txt
index 4420feb0..96ee24fe 100644
--- a/buildroot-external/user_table.txt
+++ b/buildroot-external/user_table.txt
@@ -1 +1 @@
-mycroft -2 mycroft -2 =mycroft /home/mycroft /bin/sh input,i2c,spi,tty,gpio,adm,wheel,audio,video,lp,adm,network,systemd-journal,systemd-timesync,docker Mycroft user
+ovos -2 ovos -2 =ovos /home/ovos /bin/sh input,i2c,spi,tty,gpio,adm,wheel,audio,video,lp,adm,network,systemd-journal,systemd-timesync Ovos user