Merge branch 'develop' into feature/respeaker

buildroot-external/configs/mycroftos_rpi3_defconfig

@@ -6,7 +6,9 @@ BR2_CCACHE=y
 BR2_CCACHE_DIR="../ccache"
 BR2_OPTIMIZE_FAST=y
 BR2_GLOBAL_PATCH_DIR="../buildroot-patches"
-BR2_TOOLCHAIN_EXTERNAL=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
+BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TARGET_GENERIC_HOSTNAME="MycroftOS"
 BR2_TARGET_GENERIC_ISSUE="Welcome to MycroftOS"
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
@@ -47,8 +49,6 @@ BR2_PACKAGE_ALSA_UTILS_BAT=y
 BR2_PACKAGE_ALSA_UTILS_IECSET=y
 BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
 BR2_PACKAGE_BLUEZ_ALSA=y
-BR2_PACKAGE_ESPEAK=y
-BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_ALSA=y
 BR2_PACKAGE_FFMPEG_GPL=y
 BR2_PACKAGE_FFMPEG_NONFREE=y
 BR2_PACKAGE_FLAC=y
@@ -58,11 +58,8 @@ BR2_PACKAGE_MPG123=y
 BR2_PACKAGE_MPV=y
 BR2_PACKAGE_PULSEAUDIO=y
 BR2_PACKAGE_PULSEAUDIO_DAEMON=y
-BR2_PACKAGE_VLC=y
 BR2_PACKAGE_GZIP=y
 BR2_PACKAGE_LZ4=y
-BR2_PACKAGE_P7ZIP=y
-BR2_PACKAGE_UNRAR=y
 BR2_PACKAGE_UNZIP=y
 BR2_PACKAGE_ZIP=y
 BR2_PACKAGE_BINUTILS=y
@@ -85,7 +82,6 @@ BR2_PACKAGE_RPI_WIFI_FIRMWARE=y
 BR2_PACKAGE_DBUS_PYTHON=y
 BR2_PACKAGE_KBD=y
 BR2_PACKAGE_PARTED=y
-BR2_PACKAGE_RPI_USERLAND=y
 BR2_PACKAGE_PYTHON3=y
 BR2_PACKAGE_PYTHON3_PY_ONLY=y
 BR2_PACKAGE_PYTHON3_BZIP2=y
@@ -115,17 +111,15 @@ BR2_PACKAGE_PYTHON_SERIAL=y
 BR2_PACKAGE_PYTHON_TEXTTABLE=y
 BR2_PACKAGE_PYTHON_TORNADO=y
 BR2_PACKAGE_PYTHON_WEBSOCKET_CLIENT=y
-BR2_PACKAGE_AUDIOFILE=y
+BR2_PACKAGE_PORTAUDIO=y
 BR2_PACKAGE_PORTAUDIO_OSS=y
 BR2_PACKAGE_SPEEXDSP=y
-BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING=y
 BR2_PACKAGE_LIBARCHIVE=y
 BR2_PACKAGE_LIBARCHIVE_BSDTAR=y
 BR2_PACKAGE_LIBARCHIVE_BSDCPIO=y
 BR2_PACKAGE_LIBARCHIVE_BSDCAT=y
 BR2_PACKAGE_LIBZIP=y
 BR2_PACKAGE_LZO=y
-BR2_PACKAGE_SNAPPY=y
 BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_LIBOPENSSL_BIN=y
 BR2_PACKAGE_LIBOPENSSL_ENGINES=y
@@ -137,7 +131,6 @@ BR2_PACKAGE_BCM2835=y
 BR2_PACKAGE_WIRINGPI=y
 BR2_PACKAGE_LIBMPEG2=y
 BR2_PACKAGE_LIBMPEG2_BINS=y
-BR2_PACKAGE_LIBOPENH264=y
 BR2_PACKAGE_LIBTHEORA=y
 BR2_PACKAGE_LIBCURL=y
 BR2_PACKAGE_CURL=y

buildroot-external/package/python-mycroft/0002-Force-USER-config-path-to-root.patch

@@ -1,23 +0,0 @@
-From 93b3e606dddd93e8346da265a1751ecb546c882b Mon Sep 17 00:00:00 2001
-From: Peter Steenbergen <info@j1nx.nl>
-Date: Sat, 13 Oct 2018 10:50:06 +0200
-Subject: [PATCH 1/1] Force USER config path.
-
----
- mycroft/configuration/locations.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mycroft/configuration/locations.py b/mycroft/configuration/locations.py
-index 0759152f99..3666ac5dfa 100644
---- a/mycroft/configuration/locations.py
-+++ b/mycroft/configuration/locations.py
-@@ -15,5 +15,5 @@ from os.path import join, dirname, expanduser
- 
- DEFAULT_CONFIG = join(dirname(__file__), 'mycroft.conf')
- SYSTEM_CONFIG = '/etc/mycroft/mycroft.conf'
--USER_CONFIG = join(expanduser('~'), '.mycroft/mycroft.conf')
-+USER_CONFIG = '/.mycroft/mycroft.conf'
- REMOTE_CONFIG = "mycroft.ai"
--- 
-2.11.0
-

buildroot-external/package/python-mycroft/python-mycroft.hash

@@ -1,3 +1,4 @@
 sha256	90255931a864a4abe30f28c470009cf798dc72221cab16ba41712d80b19e28e4  python-mycroft-v18.8.1.tar.gz
 sha256	af18bd9ee1c6e3bbc6b424af39b352179d05fc337d04573eadba37b01f7105f6  python-mycroft-v18.8.2.tar.gz
 sha256	25c583e40e888a99ea6fb0817960952bc26dcf8facf87f77f3363ac0c3c3b9d9  python-mycroft-v18.8.3.tar.gz
+sha256	42950284980d415d5cf75c91ad1e59080770cf82a12dc294f106b97fdf8c65c0  python-mycroft-v18.8.4.tar.gz

buildroot-external/package/python-mycroft/python-mycroft.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PYTHON_MYCROFT_VERSION = v18.8.3
+PYTHON_MYCROFT_VERSION = v18.8.4
 PYTHON_MYCROFT_SITE = $(call github,MycroftAI,mycroft-core,release/$(PYTHON_MYCROFT_VERSION))
 PYTHON_MYCROFT_SETUP_TYPE = setuptools
 PYTHON_MYCROFT_LICENSE_FILES = 

buildroot-external/rootfs-overlay/root/.mycroft

@@ -1 +0,0 @@
-../.mycroft

scripts/build.sh

@@ -1,13 +1,16 @@
 #!/bin/bash
 set -e
 
+mkdir -p release
+mkdir -p logs
+
 all_platforms=(rpi3)
 for platform in "${all_platforms[@]}"; do
-#	make -C buildroot BR2_EXTERNAL=../buildroot-external distclean
+	make -C buildroot BR2_EXTERNAL=../buildroot-external clean
-#	make -C buildroot BR2_EXTERNAL=../buildroot-external mycroftos_${platform}_defconfig
+	make -C buildroot BR2_EXTERNAL=../buildroot-external mycroftos_${platform}_defconfig
 
 	# Optional if you need to change stuff, uncomment the next line.
-	# make -C buildroot BR2_EXTERNAL=../buildroot-external makemenuconfig 
+	make -C buildroot BR2_EXTERNAL=../buildroot-external menuconfig 
 
 	make -C buildroot BR2_EXTERNAL=../buildroot-external 2>&1 | tee logs/buildroot_output.txt
 	cp -f buildroot/output/images/sdcard.img release/MycroftOS_${platform}.img