diff --git a/.gitmodules b/.gitmodules index c2597b2d..46caf118 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "buildroot"] path = buildroot url = https://github.com/buildroot/buildroot.git - branch = 2018.11.x + branch = 2019.11.x diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..a50dbbbf --- /dev/null +++ b/Makefile @@ -0,0 +1,43 @@ +RELEASE_DIR = release + +BUILDROOT=buildroot +BUILDROOT_EXTERNAL=buildroot-external +DEFCONFIG_DIR = $(BUILDROOT_EXTERNAL)/configs + +TARGETS := $(notdir $(patsubst %_defconfig,%,$(wildcard $(DEFCONFIG_DIR)/*_defconfig))) +TARGETS_CONFIG := $(notdir $(patsubst %_defconfig,%-config,$(wildcard $(DEFCONFIG_DIR)/*_defconfig))) + +.NOTPARALLEL: $(TARGETS) $(TARGETS_CONFIG) all + +.PHONY: $(TARGETS) $(TARGETS_CONFIG) all clean help + +all: $(TARGETS) + +$(RELEASE_DIR): + mkdir -p $(RELEASE_DIR) + +$(TARGETS_CONFIG): %-config: + @echo "config $*" + $(MAKE) -C $(BUILDROOT) BR2_EXTERNAL=../$(BUILDROOT_EXTERNAL) "$*_defconfig" + +$(TARGETS): %: $(RELEASE_DIR) %-config + @echo "build $@" + $(MAKE) -C $(BUILDROOT) BR2_EXTERNAL=../$(BUILDROOT_EXTERNAL) 2>&1 | tee logs/buildroot_$@_output.txt + cp -f $(BUILDROOT)/output/images/sdcard.img $(RELEASE_DIR)/MycroftOS_$@.img + + # Do not clean when building for one target +ifneq ($(words $(filter $(TARGETS),$(MAKECMDGOALS))), 1) + @echo "clean $@" + $(MAKE) -C $(BUILDROOT) BR2_EXTERNAL=../$(BUILDROOT_EXTERNAL) clean +endif + @echo "finished $@" + +clean: + $(MAKE) -C $(BUILDROOT) BR2_EXTERNAL=../$(BUILDROOT_EXTERNAL) clean + +help: + @echo "Supported targets: $(TARGETS)" + @echo "Run 'make ' to build a target image." + @echo "Run 'make all' to build all target images." + @echo "Run 'make clean' to clean the build output." + @echo "Run 'make -config' to configure buildroot for a target." diff --git a/README.md b/README.md index 18d8e430..9a6d5dda 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,9 @@ More information about the development, process, ideas etc. at https://www.j1nx. More information about the Mycroft A.I. software stack at https://mycroft.ai ## System. -- Linux kernel 4.14 (LT) -- Buildroot 2018.11.x -- Mycroft 18.08.x +- Linux kernel 4.19.x +- Buildroot 2019.11.x +- Mycroft 19.08.x - Raspberry Pi 3B (initial development hardware) ## Stats: diff --git a/buildroot b/buildroot index 93d8af97..836b84a7 160000 --- a/buildroot +++ b/buildroot @@ -1 +1 @@ -Subproject commit 93d8af974346d95e66f5582e420dd0fb35d32916 +Subproject commit 836b84a7743cbf7d6b745efd023217bed47e34e8 diff --git a/buildroot-external/Config.in b/buildroot-external/Config.in index 5623193e..db00859e 100644 --- a/buildroot-external/Config.in +++ b/buildroot-external/Config.in @@ -1,9 +1,17 @@ +menu "Mycroft A.I. Personal Assistant" + source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/firstboot-service/Config.in" + source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/prepare_system-service/Config.in" + source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-mycroft/Config.in" + source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/mycroft-service/Config.in" + source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/mycroft-splash/Config.in" menu "Additional drivers, libraries and/or applications" + source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/alsa-plugins/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/fann/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/respeaker/Config.in" endmenu menu "Additional external python modules" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-adapt-parser/Config.in" + source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-appdirs/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-bs4/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-cachetools/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-casttube/Config.in" @@ -23,16 +31,15 @@ menu "Additional external python modules" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-gtts/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-gtts_token/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-humanhash3/Config.in" - source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-ifaddr/Config.in" - source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-inflection/Config.in" + source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-lazy/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-monotonic/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-msk/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-msm/Config.in" - source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-mycroft/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-oauth2client/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-olefile/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-padaos/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-padatious/Config.in" + source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-pako/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-pep8/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-petact/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-pocketsphinx/Config.in" @@ -42,7 +49,7 @@ menu "Additional external python modules" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-pychromecast/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-pyee/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-pygithub/Config.in" - source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-pyjwt/Config.in" + source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-pymplayer/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-requests-futures/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-rsa/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-sgmllib3k/Config.in" @@ -54,3 +61,4 @@ menu "Additional external python modules" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-xmlrunner/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-xxhash/Config.in" endmenu +endmenu diff --git a/buildroot-external/board/raspberrypi/cmdline.txt b/buildroot-external/board/raspberrypi/cmdline.txt index 21a87a90..53535880 100644 --- a/buildroot-external/board/raspberrypi/cmdline.txt +++ b/buildroot-external/board/raspberrypi/cmdline.txt @@ -1 +1 @@ -root=/dev/mmcblk0p2 console=ttyAMA0,115200 consoleblank=0 loglevel=0 vt.global_cursor_default=0 logo.nologo rootwait noswap quiet +dwc_otg.lpm_enable=0 root=/dev/mmcblk0p2 rootfstype=ext4 elevator=deadline fsck.repair=yes console=tty2 consoleblank=0 loglevel=0 vt.global_cursor_default=0 logo.nologo rootwait noswap quiet diff --git a/buildroot-external/board/raspberrypi/genimage-raspberrypi4.cfg b/buildroot-external/board/raspberrypi/genimage-raspberrypi4.cfg new file mode 100644 index 00000000..4e4742f3 --- /dev/null +++ b/buildroot-external/board/raspberrypi/genimage-raspberrypi4.cfg @@ -0,0 +1,30 @@ +image boot.vfat { + vfat { + files = { + "bcm2711-rpi-4-b.dtb", + "rpi-firmware/cmdline.txt", + "rpi-firmware/config.txt", + "rpi-firmware/fixup4.dat", + "rpi-firmware/start4.elf", + "rpi-firmware/overlays", + "zImage" + } + } + size = 32M +} + +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/buildroot-external/board/raspberrypi/post-image.sh b/buildroot-external/board/raspberrypi/post-image.sh index 3c6c9384..bf9af5dc 100755 --- a/buildroot-external/board/raspberrypi/post-image.sh +++ b/buildroot-external/board/raspberrypi/post-image.sh @@ -23,11 +23,11 @@ __EOF__ --aarch64) # Run a 64bits kernel (armv8) sed -e '/^kernel=/s,=.*,=Image,' -i "${BINARIES_DIR}/rpi-firmware/config.txt" - if ! grep -qE '^arm_control=0x200' "${BINARIES_DIR}/rpi-firmware/config.txt"; then + 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_control=0x200 +arm_64bit=1 __EOF__ fi @@ -49,10 +49,18 @@ __EOF__ 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 +# pre-built one in the disk image. + +trap 'rm -rf "${ROOTPATH_TMP}"' EXIT +ROOTPATH_TMP="$(mktemp -d)" + rm -rf "${GENIMAGE_TMP}" -genimage \ - --rootpath "${TARGET_DIR}" \ +genimage \ + --rootpath "${ROOTPATH_TMP}" \ --tmppath "${GENIMAGE_TMP}" \ --inputpath "${BINARIES_DIR}" \ --outputpath "${BINARIES_DIR}" \ diff --git a/buildroot-external/board/raspberrypi/readme.txt b/buildroot-external/board/raspberrypi/readme.txt index 9f915810..69c9f9b2 100644 --- a/buildroot-external/board/raspberrypi/readme.txt +++ b/buildroot-external/board/raspberrypi/readme.txt @@ -8,6 +8,7 @@ These instructions apply to all models of the Raspberry Pi: - the "enhanced" models A+ and B+, - the model B2 (aka Raspberry Pi 2) - the model B3 (aka Raspberry Pi 3). + - the model B4 (aka Raspberry Pi 4). How to build it =============== @@ -34,6 +35,10 @@ For model 3 B and B+: $ make raspberrypi3_defconfig +For model 4 B: + + $ make raspberrypi4_defconfig + Build the rootfs ---------------- @@ -57,6 +62,7 @@ After building, you should obtain this tree: +-- bcm2709-rpi-2-b.dtb [1] +-- bcm2710-rpi-3-b.dtb [1] +-- bcm2710-rpi-3-b-plus.dtb [1] + +-- bcm2711-rpi-4-b.dtb [1] +-- boot.vfat +-- rootfs.ext4 +-- rpi-firmware/ @@ -72,7 +78,7 @@ After building, you should obtain this tree: [1] Not all of them will be present, depending on the RaspberryPi model you are using. -[2] Only for the Raspberry Pi 3 Model (overlay pi3-miniuart-bt is needed +[2] Only for the Raspberry Pi 3/4 Models (overlay pi3-miniuart-bt is needed to enable the RPi3 serial console otherwise occupied by the bluetooth chip). Alternative would be to disable the serial console in cmdline.txt and /etc/inittab. diff --git a/buildroot-external/board/raspberrypi4 b/buildroot-external/board/raspberrypi4 new file mode 120000 index 00000000..fcdafc81 --- /dev/null +++ b/buildroot-external/board/raspberrypi4 @@ -0,0 +1 @@ +raspberrypi \ No newline at end of file diff --git a/buildroot-external/configs/mycroftos_rpi3_defconfig b/buildroot-external/configs/rpi3_defconfig similarity index 55% rename from buildroot-external/configs/mycroftos_rpi3_defconfig rename to buildroot-external/configs/rpi3_defconfig index 116465e9..f5a86e78 100644 --- a/buildroot-external/configs/mycroftos_rpi3_defconfig +++ b/buildroot-external/configs/rpi3_defconfig @@ -6,8 +6,10 @@ BR2_CCACHE=y BR2_CCACHE_DIR="../ccache" BR2_GLOBAL_PATCH_DIR="../buildroot-patches" BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_BINUTILS_VERSION_2_32_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_TOOLCHAIN_BUILDROOT_FORTRAN=y BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY=y BR2_TARGET_GENERIC_HOSTNAME="MycroftOS" BR2_TARGET_GENERIC_ISSUE="Welcome to MycroftOS" @@ -18,18 +20,23 @@ BR2_SYSTEM_BIN_SH_BASH=y BR2_SYSTEM_DHCP="eth0" # BR2_ENABLE_LOCALE_PURGE is not set BR2_GENERATE_LOCALE="en_US.UTF-8" -BR2_ROOTFS_OVERLAY="../buildroot-external/rootfs-overlay" -BR2_ROOTFS_POST_BUILD_SCRIPT="../buildroot-external/board/raspberrypi3/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="../buildroot-external/board/raspberrypi3/post-image.sh" +BR2_SYSTEM_ENABLE_NLS=y +BR2_ROOTFS_USERS_TABLES="$(BR2_EXTERNAL)/user_table.txt" +BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL)/rootfs-overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL)/board/raspberrypi3/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL)/board/raspberrypi3/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="--add-pi3-miniuart-bt-overlay" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="8ec2a2d27dd3e3e32113445592f44ea974b21732" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="6018f7ebfe5e7fa01f499300b796f409a817241b" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b bcm2710-rpi-3-b-plus bcm2710-rpi-cm3" -BR2_PACKAGE_BUSYBOX_CONFIG="../buildroot-external/busybox.config" +BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_LINUX_TOOLS_GPIO=y +BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL)/busybox.config" BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y BR2_PACKAGE_ALSA_UTILS=y BR2_PACKAGE_ALSA_UTILS_ALSACONF=y @@ -48,8 +55,13 @@ 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_FAAD2=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_FLAC=y BR2_PACKAGE_MIMIC=y BR2_PACKAGE_MIMIC_AUDIO_BACKEND_ALSA=y @@ -70,7 +82,7 @@ BR2_PACKAGE_BINUTILS_TARGET=y BR2_PACKAGE_CHECK=y BR2_PACKAGE_DIFFUTILS=y BR2_PACKAGE_FINDUTILS=y -BR2_PACKAGE_GIT=y +BR2_PACKAGE_GIT_CRYPT=y BR2_PACKAGE_GREP=y BR2_PACKAGE_JQ=y BR2_PACKAGE_MAKE=y @@ -78,17 +90,79 @@ BR2_PACKAGE_PKGCONF=y BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y BR2_PACKAGE_NTFS_3G=y +BR2_PACKAGE_DIRECTFB=y +BR2_PACKAGE_DIRECTFB_TIFF=y +BR2_PACKAGE_DIRECTFB_IMLIB2=y BR2_PACKAGE_FBV=y +BR2_PACKAGE_FREERDP=y +BR2_PACKAGE_ARMBIAN_FIRMWARE=y +BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y +BR2_PACKAGE_ARMBIAN_FIRMWARE_AP6212=y +BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_IBT=y +BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174A_BT=y +BR2_PACKAGE_LINUX_FIRMWARE_TI_CC2560=y +BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_6002=y +BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_6003=y +BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_6004=y +BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_7010=y +BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9170=y +BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271=y +BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA998X=y +BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA6174=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3168=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_5000=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2A=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2B=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7260=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7265D=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8000C=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8265=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_9XXX=y +BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V8=y +BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V9=y +BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8688=y +BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8787=y +BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8797=y +BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8797=y +BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8801=y +BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8887=y +BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8897=y +BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8897=y +BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_PCIE8897=y +BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y +BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174=y +BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61=y +BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y +BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y +BR2_PACKAGE_LINUX_FIRMWARE_REDPINE_RS9113=y +BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X=y +BR2_PACKAGE_LINUX_FIRMWARE_TI_WL128X=y +BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y +BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y +BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4=y +BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T5=y +BR2_PACKAGE_LINUX_FIRMWARE_INTEL_E100=y +BR2_PACKAGE_LINUX_FIRMWARE_QLOGIC_4X=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y BR2_PACKAGE_RPI_BT_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_X=y BR2_PACKAGE_RPI_WIFI_FIRMWARE=y +BR2_PACKAGE_UX500_FIRMWARE=y +BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILINK_BT_FIRMWARE=y +BR2_PACKAGE_ZD1211_FIRMWARE=y BR2_PACKAGE_DBUS_PYTHON=y BR2_PACKAGE_KBD=y BR2_PACKAGE_PARTED=y BR2_PACKAGE_SPI_TOOLS=y BR2_PACKAGE_PYTHON3=y -BR2_PACKAGE_PYTHON3_PY_PYC=y +BR2_PACKAGE_PYTHON3_PY_ONLY=y BR2_PACKAGE_PYTHON3_BZIP2=y BR2_PACKAGE_PYTHON3_CODECSCJK=y BR2_PACKAGE_PYTHON3_CURSES=y @@ -98,10 +172,12 @@ BR2_PACKAGE_PYTHON3_SQLITE=y BR2_PACKAGE_PYTHON3_XZ=y BR2_PACKAGE_PYTHON_ALSAAUDIO=y BR2_PACKAGE_PYTHON_ARROW=y -BR2_PACKAGE_PYTHON_CFFI=y +BR2_PACKAGE_PYTHON_COLORAMA=y BR2_PACKAGE_PYTHON_CONFIGSHELL_FB=y +BR2_PACKAGE_PYTHON_CRYPTOGRAPHY=y BR2_PACKAGE_PYTHON_DAEMONIZE=y BR2_PACKAGE_PYTHON_GOBJECT=y +BR2_PACKAGE_PYTHON_INFLECTION=y BR2_PACKAGE_PYTHON_LXML=y BR2_PACKAGE_PYTHON_NETADDR=y BR2_PACKAGE_PYTHON_OAUTHLIB=y @@ -110,37 +186,59 @@ BR2_PACKAGE_PYTHON_PIP=y BR2_PACKAGE_PYTHON_PSUTIL=y BR2_PACKAGE_PYTHON_PYCLI=y BR2_PACKAGE_PYTHON_PYCRYPTO=y +BR2_PACKAGE_PYTHON_PYJWT=y BR2_PACKAGE_PYTHON_PYTZ=y BR2_PACKAGE_PYTHON_PYUSB=y +BR2_PACKAGE_PYTHON_PYYAML=y BR2_PACKAGE_PYTHON_SERIAL=y BR2_PACKAGE_PYTHON_SPIDEV=y BR2_PACKAGE_PYTHON_TEXTTABLE=y BR2_PACKAGE_PYTHON_TORNADO=y BR2_PACKAGE_PYTHON_WEBSOCKET_CLIENT=y BR2_PACKAGE_PYTHON_WRAPT=y +BR2_PACKAGE_LIBAO=y +BR2_PACKAGE_LIBCDDB=y +BR2_PACKAGE_LIBMAD=y +BR2_PACKAGE_LIBSIDPLAY2=y +BR2_PACKAGE_OPUSFILE=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_CA_CERTIFICATES=y +BR2_PACKAGE_GNUTLS=y +BR2_PACKAGE_GNUTLS_OPENSSL=y +BR2_PACKAGE_LIBSSH2=y BR2_PACKAGE_LIBOPENSSL_BIN=y BR2_PACKAGE_LIBOPENSSL_ENGINES=y BR2_PACKAGE_LIBCONFIG=y BR2_PACKAGE_LIBNFS=y -BR2_PACKAGE_BCM2835=y +BR2_PACKAGE_LIBRSVG=y +BR2_PACKAGE_MRAA=y BR2_PACKAGE_WIRINGPI=y -BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_LIBASS=y +BR2_PACKAGE_LIBBLURAY=y +BR2_PACKAGE_LIBDVBPSI=y +BR2_PACKAGE_LIBMATROSKA=y BR2_PACKAGE_LIBMPEG2=y BR2_PACKAGE_LIBMPEG2_BINS=y +BR2_PACKAGE_LIBOPENH264=y +BR2_PACKAGE_LIBOPUSENC=y BR2_PACKAGE_LIBTHEORA=y +BR2_PACKAGE_X264=y +BR2_PACKAGE_X265=y +BR2_PACKAGE_C_ARES=y BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_CURL=y +BR2_PACKAGE_LIBHTTPPARSER=y BR2_PACKAGE_LIBTIRPC=y -BR2_PACKAGE_LIBFRIBIDI=y +BR2_PACKAGE_NGHTTP2=y +BR2_PACKAGE_LIBUV=y BR2_PACKAGE_LIBUNISTRING=y BR2_PACKAGE_NCURSES_WCHAR=y BR2_PACKAGE_NCURSES_TARGET_PROGS=y @@ -148,24 +246,36 @@ BR2_PACKAGE_PCRE_16=y BR2_PACKAGE_PCRE_32=y BR2_PACKAGE_PCRE2_16=y BR2_PACKAGE_PCRE2_32=y -BR2_PACKAGE_CONNMAN=y -BR2_PACKAGE_CONNMAN_WIFI=y -BR2_PACKAGE_CONNMAN_BLUETOOTH=y +BR2_PACKAGE_AVAHI=y +BR2_PACKAGE_CRDA=y +BR2_PACKAGE_IFUPDOWN=y +BR2_PACKAGE_IPTABLES=y BR2_PACKAGE_IW=y BR2_PACKAGE_NTP=y BR2_PACKAGE_OPENSSH=y BR2_PACKAGE_WGET=y +BR2_PACKAGE_WIRELESS_TOOLS=y +BR2_PACKAGE_WPA_SUPPLICANT=y BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y +BR2_PACKAGE_WPA_SUPPLICANT_EAP=y +BR2_PACKAGE_WPA_SUPPLICANT_WPS=y BR2_PACKAGE_WPA_SUPPLICANT_CLI=y BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO=y BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y +BR2_PACKAGE_WPA_SUPPLICANT_DBUS=y BR2_PACKAGE_BASH_COMPLETION=y BR2_PACKAGE_FILE=y BR2_PACKAGE_SCREEN=y +BR2_PACKAGE_SUDO=y BR2_PACKAGE_TIME=y BR2_PACKAGE_WHICH=y BR2_PACKAGE_HTOP=y +BR2_PACKAGE_RSYSLOG=y BR2_PACKAGE_START_STOP_DAEMON=y +BR2_PACKAGE_SYSKLOGD=y +BR2_PACKAGE_SYSTEMD_FIRSTBOOT=y +BR2_PACKAGE_SYSTEMD_LOCALED=y +BR2_PACKAGE_SYSTEMD_RFKILL=y BR2_PACKAGE_TAR=y BR2_PACKAGE_UTIL_LINUX_HWCLOCK=y BR2_PACKAGE_UTIL_LINUX_KILL=y @@ -184,6 +294,14 @@ BR2_PACKAGE_HOST_PYTHON_CYTHON=y BR2_PACKAGE_HOST_PYTHON_LXML=y BR2_PACKAGE_HOST_PYTHON_SIX=y BR2_PACKAGE_HOST_PYTHON_XLRD=y +BR2_PACKAGE_HOST_PYTHON3=y +BR2_PACKAGE_HOST_PYTHON3_SSL=y +BR2_PACKAGE_FIRSTBOOT_SERVICE=y +BR2_PACKAGE_PREPARE_SYSTEM_SERVICE=y +BR2_PACKAGE_PYTHON_MYCROFT=y +BR2_PACKAGE_MYCROFT_SERVICE=y +BR2_PACKAGE_MYCROFT_SPLASH=y +BR2_PACKAGE_ALSA_PLUGINS=y BR2_PACKAGE_FANN=y BR2_PACKAGE_RESPEAKER=y BR2_PACKAGE_PYTHON_ADAPT_PARSER=y @@ -196,19 +314,19 @@ BR2_PACKAGE_PYTHON_GOOGLE_API_PYTHON_CLIENT=y BR2_PACKAGE_PYTHON_GPIOZERO=y BR2_PACKAGE_PYTHON_GTTS=y BR2_PACKAGE_PYTHON_HUMANHASH3=y -BR2_PACKAGE_PYTHON_INFLECTION=y +BR2_PACKAGE_PYTHON_LAZY=y BR2_PACKAGE_PYTHON_MSK=y -BR2_PACKAGE_PYTHON_MYCROFT=y BR2_PACKAGE_PYTHON_OAUTH2CLIENT=y BR2_PACKAGE_PYTHON_OLEFILE=y BR2_PACKAGE_PYTHON_PADATIOUS=y +BR2_PACKAGE_PYTHON_PAKO=y BR2_PACKAGE_PYTHON_PEP8=y BR2_PACKAGE_PYTHON_PETACT=y BR2_PACKAGE_PYTHON_POCKETSPHINX=y BR2_PACKAGE_PYTHON_PRECISE_RUNNER=y BR2_PACKAGE_PYTHON_PULSECTL=y BR2_PACKAGE_PYTHON_PYCHROMECAST=y -BR2_PACKAGE_PYTHON_PYJWT=y +BR2_PACKAGE_PYTHON_PYMPLAYER=y BR2_PACKAGE_PYTHON_REQUESTS_FUTURES=y BR2_PACKAGE_PYTHON_SGMLLIB3K=y BR2_PACKAGE_PYTHON_SOURCE=y diff --git a/buildroot-external/configs/rpi4_defconfig b/buildroot-external/configs/rpi4_defconfig new file mode 100644 index 00000000..2d1b638e --- /dev/null +++ b/buildroot-external/configs/rpi4_defconfig @@ -0,0 +1,336 @@ +BR2_arm=y +BR2_cortex_a72=y +BR2_ARM_FPU_NEON_VFPV4=y +BR2_DL_DIR="../downloads" +BR2_CCACHE=y +BR2_CCACHE_DIR="../ccache" +BR2_GLOBAL_PATCH_DIR="../buildroot-patches" +BR2_TOOLCHAIN_BUILDROOT_GLIBC=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_BINUTILS_VERSION_2_32_X=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_TOOLCHAIN_BUILDROOT_FORTRAN=y +BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY=y +BR2_TARGET_GENERIC_HOSTNAME="MycroftOS" +BR2_TARGET_GENERIC_ISSUE="Welcome to MycroftOS" +BR2_INIT_SYSTEMD=y +BR2_TARGET_GENERIC_ROOT_PASSWD="mycroft" +BR2_SYSTEM_BIN_SH_BASH=y +# BR2_TARGET_GENERIC_GETTY is not set +BR2_SYSTEM_DHCP="eth0" +# BR2_ENABLE_LOCALE_PURGE is not set +BR2_GENERATE_LOCALE="en_US.UTF-8" +BR2_SYSTEM_ENABLE_NLS=y +BR2_ROOTFS_USERS_TABLES="$(BR2_EXTERNAL)/user_table.txt" +BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL)/rootfs-overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL)/board/raspberrypi4/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL)/board/raspberrypi4/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="--add-pi3-miniuart-bt-overlay" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="6018f7ebfe5e7fa01f499300b796f409a817241b" +BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2711-rpi-4-b" +BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_LINUX_TOOLS_GPIO=y +BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL)/busybox.config" +BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y +BR2_PACKAGE_ALSA_UTILS=y +BR2_PACKAGE_ALSA_UTILS_ALSACONF=y +BR2_PACKAGE_ALSA_UTILS_ACONNECT=y +BR2_PACKAGE_ALSA_UTILS_ALSALOOP=y +BR2_PACKAGE_ALSA_UTILS_ALSAUCM=y +BR2_PACKAGE_ALSA_UTILS_ALSATPLG=y +BR2_PACKAGE_ALSA_UTILS_AMIDI=y +BR2_PACKAGE_ALSA_UTILS_AMIXER=y +BR2_PACKAGE_ALSA_UTILS_APLAY=y +BR2_PACKAGE_ALSA_UTILS_APLAYMIDI=y +BR2_PACKAGE_ALSA_UTILS_ARECORDMIDI=y +BR2_PACKAGE_ALSA_UTILS_ASEQDUMP=y +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_BLUEZ_ALSA=y +BR2_PACKAGE_FAAD2=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_FLAC=y +BR2_PACKAGE_MIMIC=y +BR2_PACKAGE_MIMIC_AUDIO_BACKEND_ALSA=y +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_LZOP=y +BR2_PACKAGE_P7ZIP=y +BR2_PACKAGE_UNRAR=y +BR2_PACKAGE_UNZIP=y +BR2_PACKAGE_ZIP=y +BR2_PACKAGE_BINUTILS=y +BR2_PACKAGE_BINUTILS_TARGET=y +BR2_PACKAGE_CHECK=y +BR2_PACKAGE_DIFFUTILS=y +BR2_PACKAGE_FINDUTILS=y +BR2_PACKAGE_GIT_CRYPT=y +BR2_PACKAGE_GREP=y +BR2_PACKAGE_JQ=y +BR2_PACKAGE_MAKE=y +BR2_PACKAGE_PKGCONF=y +BR2_PACKAGE_E2FSPROGS=y +BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y +BR2_PACKAGE_NTFS_3G=y +BR2_PACKAGE_DIRECTFB=y +BR2_PACKAGE_DIRECTFB_TIFF=y +BR2_PACKAGE_DIRECTFB_IMLIB2=y +BR2_PACKAGE_FBV=y +BR2_PACKAGE_FREERDP=y +BR2_PACKAGE_ARMBIAN_FIRMWARE=y +BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y +BR2_PACKAGE_ARMBIAN_FIRMWARE_AP6212=y +BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_IBT=y +BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174A_BT=y +BR2_PACKAGE_LINUX_FIRMWARE_TI_CC2560=y +BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_6002=y +BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_6003=y +BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_6004=y +BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_7010=y +BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9170=y +BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271=y +BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA998X=y +BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA6174=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3168=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_5000=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2A=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2B=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7260=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7265D=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8000C=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8265=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_9XXX=y +BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V8=y +BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V9=y +BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8688=y +BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8787=y +BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8797=y +BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8797=y +BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8801=y +BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8887=y +BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8897=y +BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8897=y +BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_PCIE8897=y +BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y +BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174=y +BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61=y +BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y +BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y +BR2_PACKAGE_LINUX_FIRMWARE_REDPINE_RS9113=y +BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X=y +BR2_PACKAGE_LINUX_FIRMWARE_TI_WL128X=y +BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y +BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y +BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4=y +BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T5=y +BR2_PACKAGE_LINUX_FIRMWARE_INTEL_E100=y +BR2_PACKAGE_LINUX_FIRMWARE_QLOGIC_4X=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y +BR2_PACKAGE_RPI_BT_FIRMWARE=y +BR2_PACKAGE_RPI_FIRMWARE=y +BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y +BR2_PACKAGE_RPI_FIRMWARE_X=y +BR2_PACKAGE_RPI_WIFI_FIRMWARE=y +BR2_PACKAGE_UX500_FIRMWARE=y +BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILINK_BT_FIRMWARE=y +BR2_PACKAGE_ZD1211_FIRMWARE=y +BR2_PACKAGE_DBUS_PYTHON=y +BR2_PACKAGE_KBD=y +BR2_PACKAGE_PARTED=y +BR2_PACKAGE_SPI_TOOLS=y +BR2_PACKAGE_PYTHON3=y +BR2_PACKAGE_PYTHON3_PY_ONLY=y +BR2_PACKAGE_PYTHON3_BZIP2=y +BR2_PACKAGE_PYTHON3_CODECSCJK=y +BR2_PACKAGE_PYTHON3_CURSES=y +BR2_PACKAGE_PYTHON3_DECIMAL=y +BR2_PACKAGE_PYTHON3_OSSAUDIODEV=y +BR2_PACKAGE_PYTHON3_SQLITE=y +BR2_PACKAGE_PYTHON3_XZ=y +BR2_PACKAGE_PYTHON_ALSAAUDIO=y +BR2_PACKAGE_PYTHON_ARROW=y +BR2_PACKAGE_PYTHON_COLORAMA=y +BR2_PACKAGE_PYTHON_CONFIGSHELL_FB=y +BR2_PACKAGE_PYTHON_CRYPTOGRAPHY=y +BR2_PACKAGE_PYTHON_DAEMONIZE=y +BR2_PACKAGE_PYTHON_GOBJECT=y +BR2_PACKAGE_PYTHON_INFLECTION=y +BR2_PACKAGE_PYTHON_LXML=y +BR2_PACKAGE_PYTHON_NETADDR=y +BR2_PACKAGE_PYTHON_OAUTHLIB=y +BR2_PACKAGE_PYTHON_PILLOW=y +BR2_PACKAGE_PYTHON_PIP=y +BR2_PACKAGE_PYTHON_PSUTIL=y +BR2_PACKAGE_PYTHON_PYCLI=y +BR2_PACKAGE_PYTHON_PYCRYPTO=y +BR2_PACKAGE_PYTHON_PYJWT=y +BR2_PACKAGE_PYTHON_PYTZ=y +BR2_PACKAGE_PYTHON_PYUSB=y +BR2_PACKAGE_PYTHON_PYYAML=y +BR2_PACKAGE_PYTHON_SERIAL=y +BR2_PACKAGE_PYTHON_SPIDEV=y +BR2_PACKAGE_PYTHON_TEXTTABLE=y +BR2_PACKAGE_PYTHON_TORNADO=y +BR2_PACKAGE_PYTHON_WEBSOCKET_CLIENT=y +BR2_PACKAGE_PYTHON_WRAPT=y +BR2_PACKAGE_LIBAO=y +BR2_PACKAGE_LIBCDDB=y +BR2_PACKAGE_LIBMAD=y +BR2_PACKAGE_LIBSIDPLAY2=y +BR2_PACKAGE_OPUSFILE=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_CA_CERTIFICATES=y +BR2_PACKAGE_GNUTLS=y +BR2_PACKAGE_GNUTLS_OPENSSL=y +BR2_PACKAGE_LIBSSH2=y +BR2_PACKAGE_LIBOPENSSL_BIN=y +BR2_PACKAGE_LIBOPENSSL_ENGINES=y +BR2_PACKAGE_LIBCONFIG=y +BR2_PACKAGE_LIBNFS=y +BR2_PACKAGE_LIBRSVG=y +BR2_PACKAGE_MRAA=y +BR2_PACKAGE_WIRINGPI=y +BR2_PACKAGE_LIBASS=y +BR2_PACKAGE_LIBBLURAY=y +BR2_PACKAGE_LIBDVBPSI=y +BR2_PACKAGE_LIBMATROSKA=y +BR2_PACKAGE_LIBMPEG2=y +BR2_PACKAGE_LIBMPEG2_BINS=y +BR2_PACKAGE_LIBOPENH264=y +BR2_PACKAGE_LIBOPUSENC=y +BR2_PACKAGE_LIBTHEORA=y +BR2_PACKAGE_X264=y +BR2_PACKAGE_X265=y +BR2_PACKAGE_C_ARES=y +BR2_PACKAGE_LIBCURL=y +BR2_PACKAGE_CURL=y +BR2_PACKAGE_LIBHTTPPARSER=y +BR2_PACKAGE_LIBTIRPC=y +BR2_PACKAGE_NGHTTP2=y +BR2_PACKAGE_LIBUV=y +BR2_PACKAGE_LIBUNISTRING=y +BR2_PACKAGE_NCURSES_WCHAR=y +BR2_PACKAGE_NCURSES_TARGET_PROGS=y +BR2_PACKAGE_PCRE_16=y +BR2_PACKAGE_PCRE_32=y +BR2_PACKAGE_PCRE2_16=y +BR2_PACKAGE_PCRE2_32=y +BR2_PACKAGE_AVAHI=y +BR2_PACKAGE_CRDA=y +BR2_PACKAGE_IFUPDOWN=y +BR2_PACKAGE_IPTABLES=y +BR2_PACKAGE_IW=y +BR2_PACKAGE_NTP=y +BR2_PACKAGE_OPENSSH=y +BR2_PACKAGE_WGET=y +BR2_PACKAGE_WIRELESS_TOOLS=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y +BR2_PACKAGE_WPA_SUPPLICANT_EAP=y +BR2_PACKAGE_WPA_SUPPLICANT_WPS=y +BR2_PACKAGE_WPA_SUPPLICANT_CLI=y +BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO=y +BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y +BR2_PACKAGE_WPA_SUPPLICANT_DBUS=y +BR2_PACKAGE_BASH_COMPLETION=y +BR2_PACKAGE_FILE=y +BR2_PACKAGE_SCREEN=y +BR2_PACKAGE_SUDO=y +BR2_PACKAGE_TIME=y +BR2_PACKAGE_WHICH=y +BR2_PACKAGE_HTOP=y +BR2_PACKAGE_RSYSLOG=y +BR2_PACKAGE_START_STOP_DAEMON=y +BR2_PACKAGE_SYSKLOGD=y +BR2_PACKAGE_SYSTEMD_FIRSTBOOT=y +BR2_PACKAGE_SYSTEMD_LOCALED=y +BR2_PACKAGE_SYSTEMD_RFKILL=y +BR2_PACKAGE_TAR=y +BR2_PACKAGE_UTIL_LINUX_HWCLOCK=y +BR2_PACKAGE_UTIL_LINUX_KILL=y +BR2_PACKAGE_UTIL_LINUX_MORE=y +BR2_PACKAGE_NANO=y +BR2_PACKAGE_VIM=y +# BR2_PACKAGE_VIM_RUNTIME is not set +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="1024M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_PYTHON_CYTHON=y +BR2_PACKAGE_HOST_PYTHON_LXML=y +BR2_PACKAGE_HOST_PYTHON_SIX=y +BR2_PACKAGE_HOST_PYTHON_XLRD=y +BR2_PACKAGE_HOST_PYTHON3=y +BR2_PACKAGE_HOST_PYTHON3_SSL=y +BR2_PACKAGE_FIRSTBOOT_SERVICE=y +BR2_PACKAGE_PREPARE_SYSTEM_SERVICE=y +BR2_PACKAGE_PYTHON_MYCROFT=y +BR2_PACKAGE_MYCROFT_SERVICE=y +BR2_PACKAGE_MYCROFT_SPLASH=y +BR2_PACKAGE_ALSA_PLUGINS=y +BR2_PACKAGE_FANN=y +BR2_PACKAGE_RESPEAKER=y +BR2_PACKAGE_PYTHON_ADAPT_PARSER=y +BR2_PACKAGE_PYTHON_COLORZERO=y +BR2_PACKAGE_PYTHON_COVERALLS=y +BR2_PACKAGE_PYTHON_DEPRECATED=y +BR2_PACKAGE_PYTHON_FASTENERS=y +BR2_PACKAGE_PYTHON_FEEDPARSER=y +BR2_PACKAGE_PYTHON_GOOGLE_API_PYTHON_CLIENT=y +BR2_PACKAGE_PYTHON_GPIOZERO=y +BR2_PACKAGE_PYTHON_GTTS=y +BR2_PACKAGE_PYTHON_HUMANHASH3=y +BR2_PACKAGE_PYTHON_LAZY=y +BR2_PACKAGE_PYTHON_MSK=y +BR2_PACKAGE_PYTHON_OAUTH2CLIENT=y +BR2_PACKAGE_PYTHON_OLEFILE=y +BR2_PACKAGE_PYTHON_PADATIOUS=y +BR2_PACKAGE_PYTHON_PAKO=y +BR2_PACKAGE_PYTHON_PEP8=y +BR2_PACKAGE_PYTHON_PETACT=y +BR2_PACKAGE_PYTHON_POCKETSPHINX=y +BR2_PACKAGE_PYTHON_PRECISE_RUNNER=y +BR2_PACKAGE_PYTHON_PULSECTL=y +BR2_PACKAGE_PYTHON_PYCHROMECAST=y +BR2_PACKAGE_PYTHON_PYMPLAYER=y +BR2_PACKAGE_PYTHON_REQUESTS_FUTURES=y +BR2_PACKAGE_PYTHON_SGMLLIB3K=y +BR2_PACKAGE_PYTHON_SOURCE=y +BR2_PACKAGE_PYTHON_SPEECHRECOGNITION=y +BR2_PACKAGE_PYTHON_VLC=y +BR2_PACKAGE_PYTHON_XMLRUNNER=y diff --git a/buildroot-external/package/alsa-plugins/Config.in b/buildroot-external/package/alsa-plugins/Config.in new file mode 100644 index 00000000..3c87f58d --- /dev/null +++ b/buildroot-external/package/alsa-plugins/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_ALSA_PLUGINS + bool "alsa-plugins" + depends on BR2_PACKAGE_ALSA_LIB + select BR2_PACKAGE_LIBSAMPLERATE + help + Advanced Linux Sound Architecture Plugins + + http://www.alsa-project.org/ + diff --git a/buildroot-external/package/alsa-plugins/alsa-plugins.hash b/buildroot-external/package/alsa-plugins/alsa-plugins.hash new file mode 100644 index 00000000..872d5737 --- /dev/null +++ b/buildroot-external/package/alsa-plugins/alsa-plugins.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 161772303da521abbbf1d91f63b470c4791392d5728f2192a42d71292078f907 alsa-plugins-1.1.9.tar.bz2 diff --git a/buildroot-external/package/alsa-plugins/alsa-plugins.mk b/buildroot-external/package/alsa-plugins/alsa-plugins.mk new file mode 100644 index 00000000..5b998bcd --- /dev/null +++ b/buildroot-external/package/alsa-plugins/alsa-plugins.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# alsa-plugins +# +################################################################################ + +ALSA_PLUGINS_VERSION = 1.1.9 +ALSA_PLUGINS_SOURCE = alsa-plugins-$(ALSA_PLUGINS_VERSION).tar.bz2 +ALSA_PLUGINS_SITE = ftp://ftp.alsa-project.org/pub/plugins +ALSA_PLUGINS_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (aserver) +ALSA_PLUGINS_LICENSE_FILES = COPYING aserver/COPYING +ALSA_PLUGINS_CFLAGS = $(TARGET_CFLAGS) +ALSA_PLUGINS_AUTORECONF = YES +ALSA_PLUGINS_DEPENDENCIES = alsa-lib libsamplerate pulseaudio +ALSA_PLUGINS_CONF_OPTS = \ + --with-plugindir=/usr/lib/alsa-lib \ + --localstatedir=/var \ + --disable-jack \ + --enable-samplerate \ + --enable-pulseaudio \ + --disable-avcodec \ + --with-speex=builtin + +$(eval $(autotools-package)) diff --git a/buildroot-external/package/firstboot-service/Config.in b/buildroot-external/package/firstboot-service/Config.in new file mode 100644 index 00000000..23cd1748 --- /dev/null +++ b/buildroot-external/package/firstboot-service/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_FIRSTBOOT_SERVICE + bool "firstboot-service" + help + A systemd service that only runs on first boot + which can be used to run certain scripts that + prepare the rootfs. For now being used to auto + expand the filesystem over the full size of the + SD card. diff --git a/buildroot-external/package/firstboot-service/firstboot b/buildroot-external/package/firstboot-service/firstboot new file mode 100755 index 00000000..bb9b3eb8 --- /dev/null +++ b/buildroot-external/package/firstboot-service/firstboot @@ -0,0 +1,4 @@ +#!/bin/bash +# +/usr/sbin/resizeSD && +rm /etc/firstboot diff --git a/buildroot-external/package/firstboot-service/firstboot-service.mk b/buildroot-external/package/firstboot-service/firstboot-service.mk new file mode 100644 index 00000000..f6f3b635 --- /dev/null +++ b/buildroot-external/package/firstboot-service/firstboot-service.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# firstboot-service +# +################################################################################ + +FIRSTBOOT_SERVICE_VERSION = 0.1.0 +FIRSTBOOT_SERVICE_SITE = $(BR2_EXTERNAL_MYCROFTOS_PATH)/package/firstboot-service +FIRSTBOOT_SERVICE_SITE_METHOD = local +FIRSTBOOT_SERVICE_LICENSE = Apache License 2.0 +FIRSTBOOT_SERVICE_LICENSE_FILES = LICENSE + +define FIRSTBOOT_SERVICE_INSTALL_TARGET_CMDS + $(INSTALL) -m 0755 $(@D)/resizeSD $(TARGET_DIR)/usr/sbin/ + $(INSTALL) -m 0755 $(@D)/firstboot $(TARGET_DIR)/usr/sbin/ + $(INSTALL) -D -m 644 $(@D)/firstboot.service \ + $(TARGET_DIR)/usr/lib/systemd/system/firstboot.service + mkdir -p $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants + ln -fs ../../../../usr/lib/systemd/system/firstboot.service \ + $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants/firstboot.service + touch $(TARGET_DIR)/etc/firstboot +endef + +$(eval $(generic-package)) diff --git a/buildroot-external/package/firstboot-service/firstboot.service b/buildroot-external/package/firstboot-service/firstboot.service new file mode 100644 index 00000000..6a18a865 --- /dev/null +++ b/buildroot-external/package/firstboot-service/firstboot.service @@ -0,0 +1,16 @@ +[Unit] +Description=First Boot run script +DefaultDependencies=no +Conflicts=shutdown.target +After=systemd-remount-fs.service +Before=sysinit.target shutdown.target +ConditionPathIsReadWrite=/etc +ConditionPathExists=/etc/firstboot + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/usr/sbin/firstboot + +[Install] +WantedBy=sysinit.target diff --git a/buildroot-external/package/firstboot-service/resizeSD b/buildroot-external/package/firstboot-service/resizeSD new file mode 100755 index 00000000..4818c6b1 --- /dev/null +++ b/buildroot-external/package/firstboot-service/resizeSD @@ -0,0 +1,9 @@ +#!/bin/bash +# +printf "Resize data partition ..." +parted /dev/mmcblk0 unit % resizepart 2 100% && +partprobe /dev/mmcblk0 && +sync && +resize2fs /dev/mmcblk0p2 && +echo "[OK]" + diff --git a/buildroot-external/package/mycroft-service/Config.in b/buildroot-external/package/mycroft-service/Config.in new file mode 100644 index 00000000..f5a8e8c9 --- /dev/null +++ b/buildroot-external/package/mycroft-service/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_MYCROFT_SERVICE + bool "mycroft-service" + help + Start the Mycroft A.I. software as service. + + https://mycroft.ai/ diff --git a/buildroot-external/package/mycroft-service/mycroft-service.mk b/buildroot-external/package/mycroft-service/mycroft-service.mk new file mode 100644 index 00000000..05ee9a92 --- /dev/null +++ b/buildroot-external/package/mycroft-service/mycroft-service.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# mycroft-service +# +################################################################################ + +MYCROFT_SERVICE_VERSION = 0.1.0 +MYCROFT_SERVICE_SITE = $(BR2_EXTERNAL_MYCROFTOS_PATH)/package/mycroft-service +MYCROFT_SERVICE_SITE_METHOD = local +MYCROFT_SERVICE_LICENSE = Apache License 2.0 +MYCROFT_SERVICE_LICENSE_FILES = LICENSE + +define MYCROFT_SERVICE_INSTALL_TARGET_CMDS + $(INSTALL) -m 0755 $(@D)/start-mycroft.sh $(TARGET_DIR)/usr/bin/ + $(INSTALL) -m 0755 $(@D)/stop-mycroft.sh $(TARGET_DIR)/usr/bin/ + $(INSTALL) -D -m 644 $(@D)/mycroft.service \ + $(TARGET_DIR)/usr/lib/systemd/system/mycroft.service + mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants + ln -fs ../../../../usr/lib/systemd/system/mycroft.service \ + $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/mycroft.service +endef + +$(eval $(generic-package)) diff --git a/buildroot-external/package/mycroft-service/mycroft.service b/buildroot-external/package/mycroft-service/mycroft.service new file mode 100644 index 00000000..9f079730 --- /dev/null +++ b/buildroot-external/package/mycroft-service/mycroft.service @@ -0,0 +1,15 @@ +[Unit] +Description=Mycroft AI +After=pulseaudio.service + +[Service] +User=mycroft +WorkingDirectory=/home/mycroft +ExecStart=start-mycroft.sh all +ExecStop=stop-mycroft.sh all +Type=forking +Restart=always +RestartSec=3 + +[Install] +WantedBy=multi-user.target diff --git a/buildroot-external/rootfs-overlay/usr/bin/start-mycroft.sh b/buildroot-external/package/mycroft-service/start-mycroft.sh similarity index 65% rename from buildroot-external/rootfs-overlay/usr/bin/start-mycroft.sh rename to buildroot-external/package/mycroft-service/start-mycroft.sh index 61c71a1c..d6e122c6 100755 --- a/buildroot-external/rootfs-overlay/usr/bin/start-mycroft.sh +++ b/buildroot-external/package/mycroft-service/start-mycroft.sh @@ -23,31 +23,34 @@ DIR="$( pwd )" function help() { echo "${script}: Mycroft command/service launcher" - echo "usage: ${script} [command] [params]" + echo "usage: ${script} [COMMAND] [restart] [params]" echo - echo "Services:" + echo "Services COMMANDs:" echo " all runs core services: bus, audio, skills, voice" echo " debug runs core services, then starts the CLI" - echo - echo "Services:" echo " audio the audio playback service" echo " bus the messagebus service" echo " skills the skill service" echo " voice voice capture service" + # echo " wifi wifi setup service" echo " enclosure mark_1 enclosure service" echo - echo "Tools:" + echo "Tool COMMANDs:" echo " cli the Command Line Interface" echo " unittest run mycroft-core unit tests (requires pytest)" echo " skillstest run the skill autotests for all skills (requires pytest)" echo - echo "Utils:" + echo "Util COMMANDs:" echo " audiotest attempt simple audio validation" echo " audioaccuracytest more complex audio validation" echo " sdkdoc generate sdk documentation" echo + echo "Options:" + echo " restart (optional) Force the service to restart if running" + echo echo "Examples:" echo " ${script} all" + echo " ${script} all restart" echo " ${script} cli" echo " ${script} unittest" @@ -72,7 +75,33 @@ function name-to-script-path() { esac } +first_time=true + +# set the right locale / language settings +export LC_ALL=en_US.UTF-8 +export LANG=en_US.UTF-8 +export LANGUAGE=en_US.UTF-8 + +function init-once() { + sudo fbv -f -d 1 /opt/mycroft/splash/logo.png > /dev/null 2>&1 + if ($first_time) ; then + echo "Initializing..." + # Check if Mycroft log folders are present and if not + # create those logging folders + if [[ ! -w /var/log/mycroft/ ]] ; then + # Creating needed folders + printf "Creating /var/log/mycroft/ directory" + if [[ ! -d /var/log/mycroft/ ]] ; then + mkdir /var/log/mycroft/ + fi + fi + first_time=false + fi +} + function launch-process() { + init-once + name-to-script-path ${1} # Launch process in foreground @@ -80,12 +109,28 @@ function launch-process() { python3 -m ${_module} $_params } +function require-process() { + # Launch process if not found + name-to-script-path ${1} + if ! pgrep -f "python3 -m ${_module}" > /dev/null ; then + # Start required process + launch-background ${1} + fi +} + function launch-background() { + init-once + # Check if given module is running and start (or restart if running) name-to-script-path ${1} if pgrep -f "python3 -m ${_module}" > /dev/null ; then - echo "Restarting: ${1}" - "${DIR}/stop-mycroft.sh" ${1} + if ($_force_restart) ; then + echo "Restarting: ${1}" + "${DIR}/stop-mycroft.sh" ${1} + else + # Already running, no need to restart + return + fi else echo "Starting background service $1" fi @@ -107,25 +152,27 @@ function launch-all() { launch-background skills launch-background audio launch-background voice - - # Determine platform type - if [[ -r /etc/mycroft/mycroft.conf ]] ; then - mycroft_platform=$( jq -r ".enclosure.platform" < /etc/mycroft/mycroft.conf ) - if [[ $mycroft_platform = "mycroft_mark_1" ]] ; then - # running on a Mark 1, start enclosure service - launch-background enclosure - fi - fi + launch-background enclosure } _opt=$1 +_force_restart=false shift +if [[ "${1}" == "restart" ]] || [[ "${_opt}" == "restart" ]] ; then + _force_restart=true + if [[ "${_opt}" == "restart" ]] ; then + # Support "start-mycroft.sh restart all" as well as "start-mycroft.sh all restart" + _opt=$1 + fi + shift +fi _params=$@ case ${_opt} in "all") launch-all ;; + "bus") launch-background ${_opt} ;; @@ -138,24 +185,47 @@ case ${_opt} in "voice") launch-background ${_opt} ;; + "debug") launch-all launch-process cli ;; + "cli") + require-process bus + require-process skills launch-process ${_opt} ;; + + # TODO: Restore support for Wifi Setup on a Picroft, etc. + # "wifi") + # launch-background ${_opt} + # ;; + "unittest") + pytest test/unittests/ --cov=mycroft "$@" + ;; + "singleunittest") + pytest "$@" + ;; + "skillstest") + pytest test/integrationtests/skills/discover_tests.py "$@" + ;; "audiotest") launch-process ${_opt} ;; "audioaccuracytest") launch-process ${_opt} ;; + "sdkdoc") + cd doc + make ${opt} + cd .. + ;; "enclosure") launch-background ${_opt} ;; + *) help ;; esac - diff --git a/buildroot-external/rootfs-overlay/usr/bin/stop-mycroft.sh b/buildroot-external/package/mycroft-service/stop-mycroft.sh similarity index 83% rename from buildroot-external/rootfs-overlay/usr/bin/stop-mycroft.sh rename to buildroot-external/package/mycroft-service/stop-mycroft.sh index a71ccac7..17bb2e9f 100755 --- a/buildroot-external/rootfs-overlay/usr/bin/stop-mycroft.sh +++ b/buildroot-external/package/mycroft-service/stop-mycroft.sh @@ -31,7 +31,7 @@ function help() { echo " audio stop the audio playback service" echo " skills stop the skill service" echo " voice stop voice capture service" - echo " enclosure stop mark_1 enclosure service" + echo " enclosure stop enclosure (hardware/gui interface) service" echo echo "Examples:" echo " ${script}" @@ -50,8 +50,9 @@ function process-running() { function end-process() { if process-running $1 ; then - echo -n "Stopping $1..." - pid=$( pgrep -f "python3 -m mycroft.*${1}" ) + # Find the process by name, only returning the oldest if it has children + pid=$( pgrep -o -f "python3 -m mycroft.*${1}" ) + echo -n "Stopping $1 (${pid})..." kill -SIGINT ${pid} # Wait up to 5 seconds (50 * 0.1) for process to stop @@ -67,7 +68,8 @@ function end-process() { if process-running $1 ; then echo "failed to stop." - echo -n " Killing $1..." + pid=$( pgrep -o -f "python3 -m mycroft.*${1}" ) + echo -n " Killing $1 (${pid})..." kill -9 ${pid} echo "killed." result=120 @@ -80,8 +82,10 @@ function end-process() { fi } + result=0 # default, no change + OPT=$1 shift @@ -94,15 +98,8 @@ case ${OPT} in end-process skills end-process audio end-process speech - - # determine platform type - if [[ -r /etc/mycroft/mycroft.conf ]] ; then - mycroft_platform=$( jq -r ".enclosure.platform" < /etc/mycroft/mycroft.conf ) - if [[ $mycroft_platform == "mycroft_mark_1" ]] ; then - # running on a Mark 1, stop enclosure service - end-process enclosure - fi - fi + end-process enclosure + sudo fbv -f -d 1 /opt/mycroft/splash/background.png > /dev/null 2>&1 ;; "bus") end-process messagebus.service @@ -119,6 +116,7 @@ case ${OPT} in "enclosure") end-process enclosure ;; + *) help ;; diff --git a/buildroot-external/package/mycroft-splash/Config.in b/buildroot-external/package/mycroft-splash/Config.in new file mode 100644 index 00000000..7817135b --- /dev/null +++ b/buildroot-external/package/mycroft-splash/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_MYCROFT_SPLASH + bool "mycroft-splash" + help + Show Mycroft A.I. branded splash screens on boot/halt. + + https://mycroft.ai/ https://www.j1nx.nl diff --git a/buildroot-external/package/mycroft-splash/boot-splashscreen.service b/buildroot-external/package/mycroft-splash/boot-splashscreen.service new file mode 100644 index 00000000..f424c898 --- /dev/null +++ b/buildroot-external/package/mycroft-splash/boot-splashscreen.service @@ -0,0 +1,8 @@ +[Unit] +Description=Mycroft AI boot splash screen + +[Service] +ExecStart=fbv -f -d 1 /opt/mycroft/splash/boot.png > /dev/null 2>&1 + +[Install] +WantedBy=basic.target diff --git a/buildroot-external/package/mycroft-splash/halt-splashscreen.service b/buildroot-external/package/mycroft-splash/halt-splashscreen.service new file mode 100644 index 00000000..c4af7fd3 --- /dev/null +++ b/buildroot-external/package/mycroft-splash/halt-splashscreen.service @@ -0,0 +1,11 @@ +[Unit] +Description=Mycroft AI halt splash screen +DefaultDependencies=no +Before=halt.target + +[Service] +ExecStart=fbv -f -d 1 /opt/mycroft/splash/down.png > /dev/null 2>&1 +Type=oneshot + +[Install] +WantedBy=halt.target poweroff.target diff --git a/buildroot-external/package/mycroft-splash/mycroft-splash.mk b/buildroot-external/package/mycroft-splash/mycroft-splash.mk new file mode 100644 index 00000000..b4b41397 --- /dev/null +++ b/buildroot-external/package/mycroft-splash/mycroft-splash.mk @@ -0,0 +1,36 @@ +################################################################################ +# +# mycroft-splash +# +################################################################################ + +MYCROFT_SPLASH_VERSION = 0.1.0 +MYCROFT_SPLASH_SITE = $(BR2_EXTERNAL_MYCROFTOS_PATH)/package/mycroft-splash +MYCROFT_SPLASH_SITE_METHOD = local +MYCROFT_SPLASH_LICENSE = Apache License 2.0 +MYCROFT_SPLASH_LICENSE_FILES = LICENSE + +define MYCROFT_SPLASH_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 644 $(@D)/boot-splashscreen.service \ + $(TARGET_DIR)/usr/lib/systemd/system/boot-splashscreen.service + mkdir -p $(TARGET_DIR)/etc/systemd/system/basic.target.wants + ln -fs ../../../../usr/lib/systemd/system/boot-splashscreen.service \ + $(TARGET_DIR)/etc/systemd/system/basic.target.wants/boot-splashscreen.service + + $(INSTALL) -D -m 644 $(@D)/halt-splashscreen.service \ + $(TARGET_DIR)/usr/lib/systemd/system/halt-splashscreen.service + mkdir -p $(TARGET_DIR)/etc/systemd/system/halt.target.wants + ln -fs ../../../../usr/lib/systemd/system/halt-splashscreen.service \ + $(TARGET_DIR)/etc/systemd/system/halt.target.wants/halt-splashscreen.service + mkdir -p $(TARGET_DIR)/etc/systemd/system/poweroff.target.wants + ln -fs ../../../../usr/lib/systemd/system/halt-splashscreen.service \ + $(TARGET_DIR)/etc/systemd/system/poweroff.target.wants/halt-splashscreen.service + + $(INSTALL) -D -m 644 $(@D)/off-splashscreen.service \ + $(TARGET_DIR)/usr/lib/systemd/system/off-splashscreen.service + mkdir -p $(TARGET_DIR)/etc/systemd/system/shutdown.target.wants + ln -fs ../../../../usr/lib/systemd/system/off-splashscreen.service \ + $(TARGET_DIR)/etc/systemd/system/shutdown.target.wants/off-splashscreen.service +endef + +$(eval $(generic-package)) diff --git a/buildroot-external/package/mycroft-splash/off-splashscreen.service b/buildroot-external/package/mycroft-splash/off-splashscreen.service new file mode 100644 index 00000000..63b3cb88 --- /dev/null +++ b/buildroot-external/package/mycroft-splash/off-splashscreen.service @@ -0,0 +1,12 @@ +[Unit] +Description=Mycroft AI safe power off splash screen +DefaultDependencies=no +After=umount.target +Before=final.target + +[Service] +ExecStart=fbv -f -d 1 /opt/mycroft/splash/off.png > /dev/null 2>&1 +Type=oneshot + +[Install] +WantedBy=shutdown.target diff --git a/buildroot-external/package/prepare_system-service/Config.in b/buildroot-external/package/prepare_system-service/Config.in new file mode 100644 index 00000000..1c57d79f --- /dev/null +++ b/buildroot-external/package/prepare_system-service/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PREPARE_SYSTEM_SERVICE + bool "prepare_system-service" + help + A systemd service that prepares the system. + Used to change/move files before everything + gets loaded. diff --git a/buildroot-external/package/prepare_system-service/prepare_system b/buildroot-external/package/prepare_system-service/prepare_system new file mode 100755 index 00000000..34be8160 --- /dev/null +++ b/buildroot-external/package/prepare_system-service/prepare_system @@ -0,0 +1,21 @@ +#!/bin/bash +# +set -x +exec 1>/var/log/$(basename $0).log 2>&1 + +mkdir -p /boot +mount -t vfat /dev/mmcblk0p1 /boot + +echo performance > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor + +rm /var/lib/alsa/asound.state +rm /etc/pulse/default.pa +rm /etc/pulse/system.pa +rm /etc/pulse/daemon.conf + +ln -s /var/lib/alsa/default-asound.state /var/lib/alsa/asound.state +ln -s /etc/pulse/pulseaudio-default.pa /etc/pulse/default.pa +ln -s /etc/pulse/pulseaudio-system.pa /etc/pulse/system.pa +ln -s /etc/pulse/pulseaudio-daemon.conf /etc/pulse/daemon.conf + +alsactl restore diff --git a/buildroot-external/package/prepare_system-service/prepare_system-service.mk b/buildroot-external/package/prepare_system-service/prepare_system-service.mk new file mode 100644 index 00000000..71b979cf --- /dev/null +++ b/buildroot-external/package/prepare_system-service/prepare_system-service.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# prepare_system-service +# +################################################################################ + +PREPARE_SYSTEM_SERVICE_VERSION = 0.1.0 +PREPARE_SYSTEM_SERVICE_SITE = $(BR2_EXTERNAL_MYCROFTOS_PATH)/package/prepare_system-service +PREPARE_SYSTEM_SERVICE_SITE_METHOD = local +PREPARE_SYSTEM_SERVICE_LICENSE = Apache License 2.0 +PREPARE_SYSTEM_SERVICE_LICENSE_FILES = LICENSE + +define PREPARE_SYSTEM_SERVICE_INSTALL_TARGET_CMDS + $(INSTALL) -m 0755 $(@D)/prepare_system $(TARGET_DIR)/usr/sbin/ + $(INSTALL) -D -m 644 $(@D)/prepare_system.service \ + $(TARGET_DIR)/usr/lib/systemd/system/prepare_system.service + mkdir -p $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants + ln -fs ../../../../usr/lib/systemd/system/prepare_system.service \ + $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants/prepare_system.service +endef + +$(eval $(generic-package)) diff --git a/buildroot-external/package/prepare_system-service/prepare_system.service b/buildroot-external/package/prepare_system-service/prepare_system.service new file mode 100644 index 00000000..c0302548 --- /dev/null +++ b/buildroot-external/package/prepare_system-service/prepare_system.service @@ -0,0 +1,14 @@ +[Unit] +Description=System prepare run script +DefaultDependencies=no +Conflicts=shutdown.target +After=systemd-remount-fs.service +Before=sysinit.target shutdown.target + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/usr/sbin/prepare_system + +[Install] +WantedBy=sysinit.target diff --git a/buildroot-external/package/python-adapt-parser/python-adapt-parser.hash b/buildroot-external/package/python-adapt-parser/python-adapt-parser.hash index f19a579f..5a1341e2 100644 --- a/buildroot-external/package/python-adapt-parser/python-adapt-parser.hash +++ b/buildroot-external/package/python-adapt-parser/python-adapt-parser.hash @@ -1,3 +1,3 @@ # md5, sha256 from https://pypi.org/pypi/adapt-parser/json md5 f415b363a15c3077a9624280a5bc2d37 adapt-parser-0.3.0.tar.gz -sha256 9445c9be4fcf3c519d1fbc605ea289349e11c2eb581db72242b61d12cc4d337f adapt-parser-0.3.0.tar.gz +sha256 1d1f2340603f2146ccf1e005afbe2c4599b16f0c2939110125ccc09ef9721bbc adapt-parser-0.3.4.tar.gz diff --git a/buildroot-external/package/python-adapt-parser/python-adapt-parser.mk b/buildroot-external/package/python-adapt-parser/python-adapt-parser.mk index 7f61d4d6..240d107d 100644 --- a/buildroot-external/package/python-adapt-parser/python-adapt-parser.mk +++ b/buildroot-external/package/python-adapt-parser/python-adapt-parser.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ADAPT_PARSER_VERSION = 0.3.0 +PYTHON_ADAPT_PARSER_VERSION = 0.3.4 PYTHON_ADAPT_PARSER_SOURCE = adapt-parser-$(PYTHON_ADAPT_PARSER_VERSION).tar.gz -PYTHON_ADAPT_PARSER_SITE = https://files.pythonhosted.org/packages/36/a4/3ef82c754a8fb079a98d0adb66be1e3dc7a42d6faafdf1f106924a48c352 +PYTHON_ADAPT_PARSER_SITE = https://files.pythonhosted.org/packages/01/80/2a437b4b59ada21209a420e44d9597d13f3853df3f16040d3077e1a7976a PYTHON_ADAPT_PARSER_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/buildroot-external/package/python-appdirs/Config.in b/buildroot-external/package/python-appdirs/Config.in new file mode 100644 index 00000000..5585759a --- /dev/null +++ b/buildroot-external/package/python-appdirs/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_APPDIRS + bool "python-appdirs" + help + A small Python module for determining appropriate platform- + specific dirs, e.g. a "user data dir". + + http://github.com/ActiveState/appdirs diff --git a/buildroot-external/package/python-appdirs/python-appdirs.hash b/buildroot-external/package/python-appdirs/python-appdirs.hash new file mode 100644 index 00000000..857e3019 --- /dev/null +++ b/buildroot-external/package/python-appdirs/python-appdirs.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/appdirs/json +md5 44c679904082a2133f5566c8a0d3ab42 appdirs-1.4.3.tar.gz +sha256 9e5896d1372858f8dd3344faf4e5014d21849c756c8d5701f78f8a103b372d92 appdirs-1.4.3.tar.gz +# Locally computed sha256 checksums +sha256 36ddb4d0a745a93ab203203d7190814b1b89727d254caff48c7a7afbbd47000b LICENSE.txt diff --git a/buildroot-external/package/python-appdirs/python-appdirs.mk b/buildroot-external/package/python-appdirs/python-appdirs.mk new file mode 100644 index 00000000..7596c06b --- /dev/null +++ b/buildroot-external/package/python-appdirs/python-appdirs.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-appdirs +# +################################################################################ + +PYTHON_APPDIRS_VERSION = 1.4.3 +PYTHON_APPDIRS_SOURCE = appdirs-$(PYTHON_APPDIRS_VERSION).tar.gz +PYTHON_APPDIRS_SITE = https://files.pythonhosted.org/packages/48/69/d87c60746b393309ca30761f8e2b49473d43450b150cb08f3c6df5c11be5 +PYTHON_APPDIRS_SETUP_TYPE = setuptools +PYTHON_APPDIRS_LICENSE = MIT +PYTHON_APPDIRS_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) diff --git a/buildroot-external/package/python-casttube/python-casttube.hash b/buildroot-external/package/python-casttube/python-casttube.hash index a0d08f02..b198618c 100644 --- a/buildroot-external/package/python-casttube/python-casttube.hash +++ b/buildroot-external/package/python-casttube/python-casttube.hash @@ -1,3 +1,3 @@ # md5, sha256 from https://pypi.org/pypi/casttube/json md5 da6bc1693f9b343237e75760537b4c3c casttube-0.1.0.tar.gz -sha256 d3787a38eb3a2bb2c1dc82e9e26387ff056de214b26817cf0bbed2f2a83a5d5c casttube-0.1.0.tar.gz +sha256 f25b3c634efe702896233690f7590e8d6311590910f18dbb763b90419d9ef53c casttube-0.2.0.tar.gz diff --git a/buildroot-external/package/python-casttube/python-casttube.mk b/buildroot-external/package/python-casttube/python-casttube.mk index 5db6aa41..9df54899 100644 --- a/buildroot-external/package/python-casttube/python-casttube.mk +++ b/buildroot-external/package/python-casttube/python-casttube.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CASTTUBE_VERSION = 0.1.0 +PYTHON_CASTTUBE_VERSION = 0.2.0 PYTHON_CASTTUBE_SOURCE = casttube-$(PYTHON_CASTTUBE_VERSION).tar.gz -PYTHON_CASTTUBE_SITE = https://files.pythonhosted.org/packages/a1/57/00f76daff3a80f3e84ec25ac25e982f1aca77df16174b900a1c2ec1d9af1 +PYTHON_CASTTUBE_SITE = https://files.pythonhosted.org/packages/54/d1/8edc98ef2aa08eed8dd72e2ef31b6658ba222ea8d228a4c2c3e73a58991a PYTHON_CASTTUBE_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/buildroot-external/package/python-gtts/python-gtts.hash b/buildroot-external/package/python-gtts/python-gtts.hash index c171ab10..804b586a 100644 --- a/buildroot-external/package/python-gtts/python-gtts.hash +++ b/buildroot-external/package/python-gtts/python-gtts.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/gTTS/json md5 a74588d23840f07badb195bda8138b2d gTTS-2.0.1.tar.gz -sha256 c85ca77ad71181209068d7437275bd35182f38cfef5a2dd7b8fcd4ba1b78ec1a gTTS-2.0.1.tar.gz +sha256 79300af5a61936fd525a0805d5fa85ae77db7301932af251e52fcefddb14de60 gTTS-2.0.4.tar.gz sha256 124dfc447056cc622989319ebb553d56cfd5c197c345cee3397b675a6da84f58 gTTS-1.1.7.tar.gz # Locally computed sha256 checksums sha256 d762ddea99fa1eddb0a03d040a97e4e1404f432f7c70d4b49d391858230a22aa LICENSE diff --git a/buildroot-external/package/python-gtts/python-gtts.mk b/buildroot-external/package/python-gtts/python-gtts.mk index 2a203e16..22998654 100644 --- a/buildroot-external/package/python-gtts/python-gtts.mk +++ b/buildroot-external/package/python-gtts/python-gtts.mk @@ -4,12 +4,11 @@ # ################################################################################ -PYTHON_GTTS_VERSION = 2.0.1 +PYTHON_GTTS_VERSION = 2.0.4 PYTHON_GTTS_SOURCE = gTTS-$(PYTHON_GTTS_VERSION).tar.gz -PYTHON_GTTS_SITE = https://files.pythonhosted.org/packages/52/6e/ae8bd869f7166ab541721e9af7b31d7e54901ce96622620e23e2ae141055 +PYTHON_GTTS_SITE = https://files.pythonhosted.org/packages/6b/1c/4c4e9ddde4856e9ea44c6f2e5cb9785cca446ce9addd81ffd1cacad6ddec PYTHON_GTTS_SETUP_TYPE = setuptools PYTHON_GTTS_LICENSE = MIT PYTHON_GTTS_LICENSE_FILES = LICENSE $(eval $(python-package)) -$(eval $(host-python-package)) diff --git a/buildroot-external/package/python-ifaddr/Config.in b/buildroot-external/package/python-ifaddr/Config.in deleted file mode 100644 index 64e9a3aa..00000000 --- a/buildroot-external/package/python-ifaddr/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_IFADDR - bool "python-ifaddr" - help - Enumerates all IP addresses on all network adapters of the - system. - - https://github.com/pydron/ifaddr diff --git a/buildroot-external/package/python-ifaddr/python-ifaddr.hash b/buildroot-external/package/python-ifaddr/python-ifaddr.hash deleted file mode 100644 index 6c0a802b..00000000 --- a/buildroot-external/package/python-ifaddr/python-ifaddr.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/ifaddr/json -md5 37bf17655723fc085156bf7c595abd04 ifaddr-0.1.4.zip -sha256 cf2a8fbb578da2844d999a0a453825f660ed2d3fc47dcffc5f673dd8de4f0f8b ifaddr-0.1.4.zip diff --git a/buildroot-external/package/python-ifaddr/python-ifaddr.mk b/buildroot-external/package/python-ifaddr/python-ifaddr.mk deleted file mode 100644 index d2044f39..00000000 --- a/buildroot-external/package/python-ifaddr/python-ifaddr.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# python-ifaddr -# -################################################################################ - -PYTHON_IFADDR_VERSION = 0.1.4 -PYTHON_IFADDR_SOURCE = ifaddr-$(PYTHON_IFADDR_VERSION).zip -PYTHON_IFADDR_SITE = https://files.pythonhosted.org/packages/12/40/97ef30db32e0c798fc557af403ea263dbeae8d334571603f02e19f4021a0 -PYTHON_IFADDR_SETUP_TYPE = setuptools - -define PYTHON_IFADDR_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(DL_DIR)/python-ifaddr/$(PYTHON_IFADDR_SOURCE) - mv $(@D)/ifaddr-$(PYTHON_IFADDR_VERSION)/* $(@D) - $(RM) -r $(@D)/ifaddr-$(PYTHON_IFADDR_VERSION) -endef - -$(eval $(python-package)) diff --git a/buildroot-external/package/python-inflection/Config.in b/buildroot-external/package/python-inflection/Config.in deleted file mode 100644 index 78dbf257..00000000 --- a/buildroot-external/package/python-inflection/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_INFLECTION - bool "python-inflection" - help - A port of Ruby on Rails inflector to Python. - - http://github.com/jpvanhal/inflection diff --git a/buildroot-external/package/python-inflection/python-inflection.hash b/buildroot-external/package/python-inflection/python-inflection.hash deleted file mode 100644 index c5f575ab..00000000 --- a/buildroot-external/package/python-inflection/python-inflection.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/inflection/json -md5 7941165e9f148e0520023941c0886b40 inflection-0.3.1.tar.gz -sha256 18ea7fb7a7d152853386523def08736aa8c32636b047ade55f7578c4edeb16ca inflection-0.3.1.tar.gz -# Locally computed sha256 checksums -sha256 4a3f52ac1012a90db398e4c55f1d1bea501dddafef8a4b3adb7533b1d820e148 LICENSE diff --git a/buildroot-external/package/python-inflection/python-inflection.mk b/buildroot-external/package/python-inflection/python-inflection.mk deleted file mode 100644 index 255112c8..00000000 --- a/buildroot-external/package/python-inflection/python-inflection.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-inflection -# -################################################################################ - -PYTHON_INFLECTION_VERSION = 0.3.1 -PYTHON_INFLECTION_SOURCE = inflection-$(PYTHON_INFLECTION_VERSION).tar.gz -PYTHON_INFLECTION_SITE = https://files.pythonhosted.org/packages/d5/35/a6eb45b4e2356fe688b21570864d4aa0d0a880ce387defe9c589112077f8 -PYTHON_INFLECTION_SETUP_TYPE = setuptools -PYTHON_INFLECTION_LICENSE = MIT -PYTHON_INFLECTION_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/buildroot-external/package/python-lazy/Config.in b/buildroot-external/package/python-lazy/Config.in new file mode 100644 index 00000000..5f60bf3c --- /dev/null +++ b/buildroot-external/package/python-lazy/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_LAZY + bool "python-lazy" + help + Lazy attributes for Python objects. + + https://github.com/stefanholek/lazy diff --git a/buildroot-external/package/python-lazy/python-lazy.hash b/buildroot-external/package/python-lazy/python-lazy.hash new file mode 100644 index 00000000..c6b1fa20 --- /dev/null +++ b/buildroot-external/package/python-lazy/python-lazy.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/lazy/json +md5 f4e5a0a5d2add47352a7e10ee87f8211 lazy-1.4.zip +sha256 2c6d27a5ab130fb85435320651a47403adcb37ecbcc501b0c6606391f65f5b43 lazy-1.4.zip +# Locally computed sha256 checksums +sha256 8ba489d9fecfaabf369f6ee4394e689d21b313547531898e2942173f877bfee2 LICENSE diff --git a/buildroot-external/package/python-lazy/python-lazy.mk b/buildroot-external/package/python-lazy/python-lazy.mk new file mode 100644 index 00000000..f2ed19e0 --- /dev/null +++ b/buildroot-external/package/python-lazy/python-lazy.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# python-lazy +# +################################################################################ + +PYTHON_LAZY_VERSION = 1.4 +PYTHON_LAZY_SOURCE = lazy-$(PYTHON_LAZY_VERSION).zip +PYTHON_LAZY_SITE = https://files.pythonhosted.org/packages/ce/10/2c0cd8a601fff792f814b89233859e3fce2e266a5defd8af3bcadbe5c7ef +PYTHON_LAZY_SETUP_TYPE = setuptools +PYTHON_LAZY_LICENSE = BSD-2-Clause +PYTHON_LAZY_LICENSE_FILES = LICENSE + +define PYTHON_LAZY_EXTRACT_CMDS + $(UNZIP) -d $(@D) $(DL_DIR)/python-lazy/$(PYTHON_LAZY_SOURCE) + mv $(@D)/lazy-$(PYTHON_LAZY_VERSION)/* $(@D) + $(RM) -r $(@D)/lazy-$(PYTHON_LAZY_VERSION) +endef + +$(eval $(python-package)) diff --git a/buildroot-external/package/python-msk/0001-Only-install-typing-requirement-if-Python-version-3..patch b/buildroot-external/package/python-msk/0001-Only-install-typing-requirement-if-Python-version-3..patch new file mode 100644 index 00000000..c7663db0 --- /dev/null +++ b/buildroot-external/package/python-msk/0001-Only-install-typing-requirement-if-Python-version-3..patch @@ -0,0 +1,25 @@ +From a918c7274654865534f42590608407b2d61d1972 Mon Sep 17 00:00:00 2001 +From: Peter Steenbergen +Date: Sun, 8 Dec 2019 12:34:31 +0100 +Subject: [PATCH 1/1] Only install typing requirement if Python version < 3.5 + +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 62928e2..b4b6746 100644 +--- a/setup.py ++++ b/setup.py +@@ -26,7 +26,7 @@ setup( + version='0.3.14', # Also update in msk/__init__.py + packages=['msk', 'msk.actions'], + package_data={'msk': ['licenses/*']}, +- install_requires=['GitPython', 'typing', 'msm>=0.5.13', 'pygithub', 'requests', 'colorama'], ++ install_requires=['GitPython', 'typing;python_version<"3.5"', 'msm>=0.5.13', 'pygithub', 'requests', 'colorama'], + url='https://github.com/MycroftAI/mycroft-skills-kit', + license='Apache-2.0', + author='Mycroft AI', +-- +2.24.0.rc1 + diff --git a/buildroot-external/package/python-msk/Config.in b/buildroot-external/package/python-msk/Config.in index 26e48c5b..81bb7564 100644 --- a/buildroot-external/package/python-msk/Config.in +++ b/buildroot-external/package/python-msk/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_MSK bool "python-msk" select BR2_PACKAGE_PYTHON_GITPYTHON # runtime - select BR2_PACKAGE_PYTHON_TYPING # runtime select BR2_PACKAGE_PYTHON_MSM # runtime select BR2_PACKAGE_PYTHON_PYGITHUB # runtime help diff --git a/buildroot-external/package/python-msk/python-msk.hash b/buildroot-external/package/python-msk/python-msk.hash index 6ad0de78..28676b59 100644 --- a/buildroot-external/package/python-msk/python-msk.hash +++ b/buildroot-external/package/python-msk/python-msk.hash @@ -2,3 +2,5 @@ md5 1460094aeffac634008ba1dd12348c3b msk-0.3.11.tar.gz sha256 d5c157a60eecba4c3b07de89e43e85dec366b5ecdd3677f7e73c0c4cddf01b74 msk-0.3.11.tar.gz sha256 8e5a1fb7afa22977a9d6ee0835ac52420b74324c1d2088286aacc485a521e573 msk-0.3.12.tar.gz +sha256 55be86ff2cd0087016759f2b15b40861cda2a8d8a8d0c669fdacdf32a77a10da msk-0.3.13.tar.gz +sha256 6620b5412316cc4b3111d0720424ac6a1a837b2bc3e6fb0c11076e95b6496d29 msk-0.3.14.tar.gz diff --git a/buildroot-external/package/python-msk/python-msk.mk b/buildroot-external/package/python-msk/python-msk.mk index 7996fbe1..ef6ffbd3 100644 --- a/buildroot-external/package/python-msk/python-msk.mk +++ b/buildroot-external/package/python-msk/python-msk.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MSK_VERSION = 0.3.12 +PYTHON_MSK_VERSION = 0.3.14 PYTHON_MSK_SOURCE = msk-$(PYTHON_MSK_VERSION).tar.gz -PYTHON_MSK_SITE = https://files.pythonhosted.org/packages/34/91/fad24465ad7d07184d2b7e965415f62acf90e5488cfd3fec56c89430f01b +PYTHON_MSK_SITE = https://files.pythonhosted.org/packages/ef/de/d21d7d7c59f54b02910da5f4e5b77af9c40f5477079bcdfd0170e5ed4517 PYTHON_MSK_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/buildroot-external/package/python-msm/0001-Add-MycroftOS-enclosure-tag-to-SKILL_GROUPS.patch b/buildroot-external/package/python-msm/0001-Add-MycroftOS-enclosure-tag-to-SKILL_GROUPS.patch new file mode 100644 index 00000000..a0e6e97a --- /dev/null +++ b/buildroot-external/package/python-msm/0001-Add-MycroftOS-enclosure-tag-to-SKILL_GROUPS.patch @@ -0,0 +1,26 @@ +From 61a1116fc464df46bd934d45fc4a22dcfee52607 Mon Sep 17 00:00:00 2001 +From: Peter Steenbergen +Date: Sat, 21 Sep 2019 12:18:38 +0200 +Subject: [PATCH 1/1] Add MycroftOS enclosure tag to SKILL_GROUPS + +--- + msm/mycroft_skills_manager.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/msm/mycroft_skills_manager.py b/msm/mycroft_skills_manager.py +index b36540e..327f1fc 100644 +--- a/msm/mycroft_skills_manager.py ++++ b/msm/mycroft_skills_manager.py +@@ -86,7 +86,8 @@ def save_device_skill_state(func): + + class MycroftSkillsManager(object): + SKILL_GROUPS = {'default', 'mycroft_mark_1', 'picroft', 'kde', +- 'respeaker', 'mycroft_mark_2', 'mycroft_mark_2pi'} ++ 'respeaker', 'mycroft_mark_2', 'mycroft_mark_2pi', ++ 'MycroftOS'} + DEFAULT_SKILLS_DIR = "/opt/mycroft/skills" + + def __init__(self, platform='default', skills_dir=None, repo=None, +-- +2.11.0 + diff --git a/buildroot-external/package/python-msm/0002-Only-install-typing-if-Python-version-3.5.patch b/buildroot-external/package/python-msm/0002-Only-install-typing-if-Python-version-3.5.patch new file mode 100644 index 00000000..99eb0e5b --- /dev/null +++ b/buildroot-external/package/python-msm/0002-Only-install-typing-if-Python-version-3.5.patch @@ -0,0 +1,25 @@ +From 79bfc57404cd8d42236283b44f956209ff486e21 Mon Sep 17 00:00:00 2001 +From: Peter Steenbergen +Date: Sun, 8 Dec 2019 12:54:33 +0100 +Subject: [PATCH 1/1] Only install typing if Python version < 3.5 + +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 5e3167a..18eb0fc 100644 +--- a/setup.py ++++ b/setup.py +@@ -26,7 +26,7 @@ setup( + version='0.8.3', + packages=['msm'], + install_requires=[ +- 'GitPython', 'typing', 'fasteners', 'pyyaml', 'pako', ++ 'GitPython', 'typing;python_version<"3.5"', 'fasteners', 'pyyaml', 'pako', + 'lazy' + ], + url='https://github.com/MycroftAI/mycroft-skills-manager', +-- +2.24.0.rc1 + diff --git a/buildroot-external/package/python-msm/Config.in b/buildroot-external/package/python-msm/Config.in index 1d46aef8..3baede72 100644 --- a/buildroot-external/package/python-msm/Config.in +++ b/buildroot-external/package/python-msm/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_MSM bool "python-msm" select BR2_PACKAGE_PYTHON_GITPYTHON # runtime - select BR2_PACKAGE_PYTHON_TYPING # runtime help Mycroft Skills Manager. diff --git a/buildroot-external/package/python-msm/python-msm.hash b/buildroot-external/package/python-msm/python-msm.hash index f97d6cd2..5557df51 100644 --- a/buildroot-external/package/python-msm/python-msm.hash +++ b/buildroot-external/package/python-msm/python-msm.hash @@ -1,6 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/msm/json md5 fe54a2aecd6751bef66fdcd27ffd3cdc msm-0.5.19.tar.gz -sha256 0f67b73e277a73ff4c97ecdf0aa6e10b1202bc09d2666f69170f9aa20653c573 msm-0.5.19.tar.gz -sha256 5d58fadc96d8d0c7b5290875d5ba1859333f372c2069c14881aa2b32e5e0e37d msm-0.6.3.tar.gz +sha256 c201785997f3b766ec376a89bbb3367889ac542183ca26733ffe002bb94917b4 msm-0.8.3.tar.gz # Locally computed sha256 checksums sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 LICENSE diff --git a/buildroot-external/package/python-msm/python-msm.mk b/buildroot-external/package/python-msm/python-msm.mk index bce51d21..ba236da4 100644 --- a/buildroot-external/package/python-msm/python-msm.mk +++ b/buildroot-external/package/python-msm/python-msm.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MSM_VERSION = 0.6.3 +PYTHON_MSM_VERSION = 0.8.3 PYTHON_MSM_SOURCE = msm-$(PYTHON_MSM_VERSION).tar.gz -PYTHON_MSM_SITE = https://files.pythonhosted.org/packages/8d/07/7fd52f9c7690925d48fffea97ec594beee797a75afd1e082ffe7b90dd341 +PYTHON_MSM_SITE = https://files.pythonhosted.org/packages/d5/b5/a7b53d4fc7ccbca6fe41f19c26a61c4a67a38068fe823e571b3e3519eb4b PYTHON_MSM_SETUP_TYPE = setuptools PYTHON_MSM_LICENSE = Apache-2.0 PYTHON_MSM_LICENSE_FILES = LICENSE diff --git a/buildroot-external/package/python-mycroft/0003-Bump-python-dateutil-requirement-to-2.7.5.patch b/buildroot-external/package/python-mycroft/0001-Bump-python-dateutil-requirement-to-2.7.5.patch similarity index 61% rename from buildroot-external/package/python-mycroft/0003-Bump-python-dateutil-requirement-to-2.7.5.patch rename to buildroot-external/package/python-mycroft/0001-Bump-python-dateutil-requirement-to-2.7.5.patch index 80824a64..f2f6a243 100644 --- a/buildroot-external/package/python-mycroft/0003-Bump-python-dateutil-requirement-to-2.7.5.patch +++ b/buildroot-external/package/python-mycroft/0001-Bump-python-dateutil-requirement-to-2.7.5.patch @@ -1,6 +1,6 @@ -From e5c877740c298fc07fcbadd29ca00c02cfb49ca5 Mon Sep 17 00:00:00 2001 +From 840f9594d7876fbcb3a4b446a4b78618a032e774 Mon Sep 17 00:00:00 2001 From: Peter Steenbergen -Date: Tue, 29 Jan 2019 10:25:42 +0100 +Date: Fri, 6 Dec 2019 09:25:01 +0100 Subject: [PATCH 1/1] Bump python-dateutil requirement to 2.7.5 --- @@ -8,18 +8,18 @@ Subject: [PATCH 1/1] Bump python-dateutil requirement to 2.7.5 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt -index 5fe21dfa80..7f481ccb93 100644 +index 5d89f9fb11..f1be1a6724 100644 --- a/requirements.txt +++ b/requirements.txt -@@ -15,7 +15,7 @@ psutil==5.2.1 +@@ -14,7 +14,7 @@ psutil==5.2.1 pocketsphinx==0.1.0 inflection==0.3.1 - pillow==4.1.1 + pillow==6.2.1 -python-dateutil==2.6.0 +python-dateutil==2.7.5 - pychromecast==0.7.7 + pychromecast==3.2.2 python-vlc==1.1.2 - pulsectl==17.7.4 + google-api-python-client==1.6.4 -- -2.11.0 +2.24.0.rc1 diff --git a/buildroot-external/package/python-mycroft/0002-Bump-python-tornado-requirement-to-5.1.1.patch b/buildroot-external/package/python-mycroft/0002-Bump-python-tornado-requirement-to-5.1.1.patch deleted file mode 100644 index 96d70b08..00000000 --- a/buildroot-external/package/python-mycroft/0002-Bump-python-tornado-requirement-to-5.1.1.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 9fbd29b3c0442191706468fdd14270749e358211 Mon Sep 17 00:00:00 2001 -From: Peter Steenbergen -Date: Fri, 25 Jan 2019 13:04:53 +0100 -Subject: [PATCH 1/1] Bump python-tornado requirement to 5.1.1 This because - 4.5.3 does not compile on the host with Python 3.7 - ---- - requirements.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/requirements.txt b/requirements.txt -index 94ffe987e8..5fe21dfa80 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -5,7 +5,7 @@ gTTS-token==1.1.3 - PyAudio==0.2.11 - pyee==1.0.1 - SpeechRecognition==3.8.1 --tornado==4.5.3 -+tornado==5.1.1 - websocket-client==0.32.0 - requests-futures==0.9.5 - pyalsaaudio==0.8.2 --- -2.11.0 - diff --git a/buildroot-external/package/python-mycroft/python-mycroft.hash b/buildroot-external/package/python-mycroft/python-mycroft.hash index 11f24613..c46f6fe4 100644 --- a/buildroot-external/package/python-mycroft/python-mycroft.hash +++ b/buildroot-external/package/python-mycroft/python-mycroft.hash @@ -1,8 +1 @@ -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 -sha256 35d6c2d6155ea9b1887b296164a8ee7f1abf8e58b192a4829aaa59a7592909fa python-mycroft-v18.8.5.tar.gz -sha256 14d936dea78379a58c80b2d8268be87e5e89b3147a6f48fa85c6db4c37dc8b56 python-mycroft-v18.8.10.tar.gz -sha256 f3a4dcfbf4690df6a885cab40c7069d67b61e8cd5d81f85cf892dd38b3902aff python-mycroft-v18.8.11.tar.gz -sha256 b7ddc81be63310c28bc5da1e39745429941311362364dc44b67e3bc69139bb94 python-mycroft-v18.8.12.tar.gz +sha256 879c8c5ecb3aabe20480569b791ddcf22f105b9e8156ccad7d5c4eb17a2a452a python-mycroft-599fc576905b2dfc22bfdecbf9f478cc68ebd480.tar.gz diff --git a/buildroot-external/package/python-mycroft/python-mycroft.mk b/buildroot-external/package/python-mycroft/python-mycroft.mk index be32aed0..b4ae2d66 100644 --- a/buildroot-external/package/python-mycroft/python-mycroft.mk +++ b/buildroot-external/package/python-mycroft/python-mycroft.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MYCROFT_VERSION = v18.8.12 -PYTHON_MYCROFT_SITE = $(call github,MycroftAI,mycroft-core,release/$(PYTHON_MYCROFT_VERSION)) +PYTHON_MYCROFT_VERSION = 599fc576905b2dfc22bfdecbf9f478cc68ebd480 +PYTHON_MYCROFT_SITE = $(call github,MycroftAI,mycroft-core,$(PYTHON_MYCROFT_VERSION)) PYTHON_MYCROFT_SETUP_TYPE = setuptools -PYTHON_MYCROFT_LICENSE_FILES = +PYTHON_MYCROFT_LICENSE_FILES = LICENSE $(eval $(python-package)) diff --git a/buildroot-external/package/python-padaos/python-padaos.hash b/buildroot-external/package/python-padaos/python-padaos.hash index 3e500b70..11ff9fb1 100644 --- a/buildroot-external/package/python-padaos/python-padaos.hash +++ b/buildroot-external/package/python-padaos/python-padaos.hash @@ -3,3 +3,4 @@ sha256 06fb231807f1c82d6fe8014e81d8a97124219fe6bcbccc020d445ca22d437146 padaos- md5 5dbb47982c859449f06decde6d240bd9 padaos-0.1.7.tar.gz sha256 0703a5fec01a5b40038e90a32c39ac4c2c59b2a91b9bd1624408f017a2f61db3 padaos-0.1.7.tar.gz sha256 287310c7299a1c3ea2d0f8193caf83944d297a30a131b298bc29379acc46714e padaos-0.1.8.tar.gz +sha256 47be66fed43f35b5347722aa45ee3c2df64ea1718cf805b2f1da81ed2c98ee83 padaos-0.1.9.tar.gz diff --git a/buildroot-external/package/python-padaos/python-padaos.mk b/buildroot-external/package/python-padaos/python-padaos.mk index d3589561..d87d75a6 100644 --- a/buildroot-external/package/python-padaos/python-padaos.mk +++ b/buildroot-external/package/python-padaos/python-padaos.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PADAOS_VERSION = 0.1.8 +PYTHON_PADAOS_VERSION = 0.1.9 PYTHON_PADAOS_SOURCE = padaos-$(PYTHON_PADAOS_VERSION).tar.gz -PYTHON_PADAOS_SITE = https://files.pythonhosted.org/packages/1b/5a/8b9053ef320f958b52c8881e0a8147faea5dd87e0fbf26958b7069ab7f76 +PYTHON_PADAOS_SITE = https://files.pythonhosted.org/packages/5d/d9/f1e366c164c551c79e988c43fa282aea6e671d7842e6f70164ae09ad6376 PYTHON_PADAOS_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/buildroot-external/package/python-padatious/python-padatious.hash b/buildroot-external/package/python-padatious/python-padatious.hash index 99d6189d..e6503374 100644 --- a/buildroot-external/package/python-padatious/python-padatious.hash +++ b/buildroot-external/package/python-padatious/python-padatious.hash @@ -1,3 +1,3 @@ # md5, sha256 from https://pypi.org/pypi/padatious/json -md5 6e9d8b85814090a1c3c39774ef24124e padatious-0.4.5.tar.gz -sha256 81cefa5c3baf5fe8e3c6987216c1c438eff59f2026bce8ae6302871c7edbd69b padatious-0.4.5.tar.gz +md5 cf7bbc745f6689d53f0646d8747f744b padatious-0.4.6.tar.gz +sha256 03bebbe81ebf67526b7e7300cfb8fa5ad2f30ed0aa71e4e54e6e8ed292ff9883 padatious-0.4.6.tar.gz diff --git a/buildroot-external/package/python-padatious/python-padatious.mk b/buildroot-external/package/python-padatious/python-padatious.mk index b96ada00..ea04923b 100644 --- a/buildroot-external/package/python-padatious/python-padatious.mk +++ b/buildroot-external/package/python-padatious/python-padatious.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PADATIOUS_VERSION = 0.4.5 +PYTHON_PADATIOUS_VERSION = 0.4.6 PYTHON_PADATIOUS_SOURCE = padatious-$(PYTHON_PADATIOUS_VERSION).tar.gz -PYTHON_PADATIOUS_SITE = https://files.pythonhosted.org/packages/00/ca/5d2262ec5ca90afa94706b78c770de9f48298d3048cd65dc0ad79ffcfb10 +PYTHON_PADATIOUS_SITE = https://files.pythonhosted.org/packages/1f/37/0022764d88b1aacb7f42a9e3ba5250b10212d8b6cf6223c58e639d669a6c PYTHON_PADATIOUS_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/buildroot-external/package/python-pako/Config.in b/buildroot-external/package/python-pako/Config.in new file mode 100644 index 00000000..bb190eff --- /dev/null +++ b/buildroot-external/package/python-pako/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_PAKO + bool "python-pako" + select BR2_PACKAGE_PYTHON_APPDIRS # runtime + help + The universal package manager library. + + https://github.com/MycroftAI/pako diff --git a/buildroot-external/package/python-pako/python-pako.hash b/buildroot-external/package/python-pako/python-pako.hash new file mode 100644 index 00000000..e7952124 --- /dev/null +++ b/buildroot-external/package/python-pako/python-pako.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/pako/json +md5 8eb7077075091c50e4b8a9f939607277 pako-0.2.3.tar.gz +sha256 6be55fd8c5a2a6f02974f37438c1c47a3d9e764ce81c9d0a1a8c9a1815a59778 pako-0.2.3.tar.gz +# Locally computed sha256 checksums +sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 LICENSE diff --git a/buildroot-external/package/python-pako/python-pako.mk b/buildroot-external/package/python-pako/python-pako.mk new file mode 100644 index 00000000..ae4936b2 --- /dev/null +++ b/buildroot-external/package/python-pako/python-pako.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-pako +# +################################################################################ + +PYTHON_PAKO_VERSION = 0.2.3 +PYTHON_PAKO_SOURCE = pako-$(PYTHON_PAKO_VERSION).tar.gz +PYTHON_PAKO_SITE = https://files.pythonhosted.org/packages/96/91/bf16a2f64a6628dfbfd9218f0331fbf73655530608ddd2f8fb597fdb9458 +PYTHON_PAKO_SETUP_TYPE = setuptools +PYTHON_PAKO_LICENSE = Apache-2.0 +PYTHON_PAKO_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/buildroot-external/package/python-pychromecast/python-pychromecast.hash b/buildroot-external/package/python-pychromecast/python-pychromecast.hash index ab4226d7..13c02a75 100644 --- a/buildroot-external/package/python-pychromecast/python-pychromecast.hash +++ b/buildroot-external/package/python-pychromecast/python-pychromecast.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pychromecast/json -sha256 addc87ecb769c6883756081e0e775d6cac0b45b6698419d7419c589ff7f55244 PyChromecast-0.7.7.tar.gz +sha256 da8a5a5a0d6c1046e818b586b247dd41f556ffa2a2e80f09cff6497c2db5879e PyChromecast-3.2.2.tar.gz md5 4449701d330e33b8694aa7582662958c PyChromecast-2.3.0.tar.gz sha256 f385168e34d2ef47f976c8e41bad2f58f5ca004634c0ccb1a12623d8beb2fa38 PyChromecast-2.3.0.tar.gz # Locally computed sha256 checksums diff --git a/buildroot-external/package/python-pychromecast/python-pychromecast.mk b/buildroot-external/package/python-pychromecast/python-pychromecast.mk index 540ba32a..fdb57998 100644 --- a/buildroot-external/package/python-pychromecast/python-pychromecast.mk +++ b/buildroot-external/package/python-pychromecast/python-pychromecast.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYCHROMECAST_VERSION = 0.7.7 +PYTHON_PYCHROMECAST_VERSION = 3.2.2 PYTHON_PYCHROMECAST_SOURCE = PyChromecast-$(PYTHON_PYCHROMECAST_VERSION).tar.gz -PYTHON_PYCHROMECAST_SITE = https://files.pythonhosted.org/packages/cf/07/9a95c424e080f4b4e3b0b58cc91e67b03ce67e7f1a4f204e886d2838665f +PYTHON_PYCHROMECAST_SITE = https://files.pythonhosted.org/packages/3d/56/21a75152eb64c16d9379639c408869ae15de553e25af18db3c3bbcfc4bfa PYTHON_PYCHROMECAST_SETUP_TYPE = setuptools PYTHON_PYCHROMECAST_LICENSE = MIT PYTHON_PYCHROMECAST_LICENSE_FILES = LICENSE diff --git a/buildroot-external/package/python-pyee/python-pyee.mk b/buildroot-external/package/python-pyee/python-pyee.mk index b024ee11..7cf93726 100644 --- a/buildroot-external/package/python-pyee/python-pyee.mk +++ b/buildroot-external/package/python-pyee/python-pyee.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYEE_VERSION = 1.0.1 +PYTHON_PYEE_VERSION = 5.0.0 PYTHON_PYEE_SOURCE = pyee-$(PYTHON_PYEE_VERSION).tar.gz -PYTHON_PYEE_SITE = https://files.pythonhosted.org/packages/0b/94/6820b8b1a21ce4d6a1c807342ac35cf4d5fd89b94b3f12e10de3c34d5507 +PYTHON_PYEE_SITE = https://files.pythonhosted.org/packages/c6/35/b37e4ffbf46063c883675e028e38e2a24b67433fd587f188e2a5005d9329 PYTHON_PYEE_SETUP_TYPE = distutils PYTHON_PYEE_LICENSE = MIT diff --git a/buildroot-external/package/python-pyjwt/Config.in b/buildroot-external/package/python-pyjwt/Config.in deleted file mode 100644 index 510875ce..00000000 --- a/buildroot-external/package/python-pyjwt/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYJWT - bool "python-pyjwt" - help - JSON Web Token implementation in Python. - - http://github.com/jpadilla/pyjwt diff --git a/buildroot-external/package/python-pyjwt/python-pyjwt.hash b/buildroot-external/package/python-pyjwt/python-pyjwt.hash deleted file mode 100644 index 2fa5175c..00000000 --- a/buildroot-external/package/python-pyjwt/python-pyjwt.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/pyjwt/json -md5 2731c6b66b67b95d1944f072f5fa35a9 PyJWT-1.6.4.tar.gz -sha256 4ee413b357d53fd3fb44704577afac88e72e878716116270d722723d65b42176 PyJWT-1.6.4.tar.gz -# Locally computed sha256 checksums -sha256 ec82af815b5f9da8685afb300cc5beb7949e1c22b79b6c1c054796cefdf6cac6 LICENSE diff --git a/buildroot-external/package/python-pyjwt/python-pyjwt.mk b/buildroot-external/package/python-pyjwt/python-pyjwt.mk deleted file mode 100644 index 18b7976b..00000000 --- a/buildroot-external/package/python-pyjwt/python-pyjwt.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pyjwt -# -################################################################################ - -PYTHON_PYJWT_VERSION = 1.6.4 -PYTHON_PYJWT_SOURCE = PyJWT-$(PYTHON_PYJWT_VERSION).tar.gz -PYTHON_PYJWT_SITE = https://files.pythonhosted.org/packages/00/5e/b358c9bb24421e6155799d995b4aa3aa3307ffc7ecae4ad9d29fd7e07a73 -PYTHON_PYJWT_SETUP_TYPE = setuptools -PYTHON_PYJWT_LICENSE = MIT -PYTHON_PYJWT_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/buildroot-external/package/python-pymplayer/Config.in b/buildroot-external/package/python-pymplayer/Config.in new file mode 100644 index 00000000..a4bbaff7 --- /dev/null +++ b/buildroot-external/package/python-pymplayer/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_PYMPLAYER + bool "python-pymplayer" + help + mplayer python api. + + https://github.com/JarbasAl/py_mplayer diff --git a/buildroot-external/package/python-pymplayer/python-pymplayer.hash b/buildroot-external/package/python-pymplayer/python-pymplayer.hash new file mode 100644 index 00000000..6215b7b5 --- /dev/null +++ b/buildroot-external/package/python-pymplayer/python-pymplayer.hash @@ -0,0 +1,2 @@ +# sha256 from https://pypi.org +sha256 f4048a6e882a093affc52469889fbbfa0514fec2e4b01b39446f9d795ab44333 python-pymplayer-eaa0a1dbfc60cb0f4f1b3e495d665714c089474a.tar.gz diff --git a/buildroot-external/package/python-pymplayer/python-pymplayer.mk b/buildroot-external/package/python-pymplayer/python-pymplayer.mk new file mode 100644 index 00000000..09324504 --- /dev/null +++ b/buildroot-external/package/python-pymplayer/python-pymplayer.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# python-pymplayer +# +################################################################################ + +PYTHON_PYMPLAYER_VERSION = eaa0a1dbfc60cb0f4f1b3e495d665714c089474a +PYTHON_PYMPLAYER_SITE = git://github.com/JarbasAl/py_mplayer.git +PYTHON_PYMPLAYER_SETUP_TYPE = distutils +PYTHON_PYMPLAYER_LICENSE = MIT + +$(eval $(python-package)) diff --git a/buildroot-external/package/python-speechrecognition/python-speechrecognition.mk b/buildroot-external/package/python-speechrecognition/python-speechrecognition.mk index 30bd7526..93514930 100644 --- a/buildroot-external/package/python-speechrecognition/python-speechrecognition.mk +++ b/buildroot-external/package/python-speechrecognition/python-speechrecognition.mk @@ -6,9 +6,13 @@ PYTHON_SPEECHRECOGNITION_VERSION = 3.8.1 PYTHON_SPEECHRECOGNITION_SITE = $(call github,Uberi,speech_recognition,$(PYTHON_SPEECHRECOGNITION_VERSION)) +PYTHON_SPEECHRECOGNITION_INSTALL_STAGING = YES +PYTHON_SPEECHRECOGNITION_DEPENDENCIES = flac \ + python-pyaudio \ + python-pocketsphinx \ + python-google-api-python-client PYTHON_SPEECHRECOGNITION_LICENSE = Apache-2.0 PYTHON_SPEECHRECOGNITION_LICENSE_FILES = LICENSE PYTHON_SPEECHRECOGNITION_SETUP_TYPE = setuptools $(eval $(python-package)) -$(eval $(host-python-package)) diff --git a/buildroot-external/package/respeaker/S16respeaker_modules b/buildroot-external/package/respeaker/S16respeaker_modules deleted file mode 100755 index d659cfcd..00000000 --- a/buildroot-external/package/respeaker/S16respeaker_modules +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# -# Load seeed-voicecard modules.... -# - -modprobe snd-soc-seeed-voicecard -modprobe snd-soc-ac108 -modprobe snd-soc-wm8960 diff --git a/buildroot-external/package/respeaker/S60seeed_voicecard b/buildroot-external/package/respeaker/S60seeed_voicecard deleted file mode 100755 index 960228e4..00000000 --- a/buildroot-external/package/respeaker/S60seeed_voicecard +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# -# Configure seeed-voicecard.... -# - -echo "Starting seeed-voicecard..." -mount -t configfs none /sys/kernel/config -mkdir -p /boot -mount -t vfat /dev/mmcblk0p1 /boot -/usr/bin/seeed-voicecard -touch /var/lock/seeed-voicecard diff --git a/buildroot-external/package/respeaker/respeaker.conf b/buildroot-external/package/respeaker/respeaker.conf new file mode 100644 index 00000000..3096f833 --- /dev/null +++ b/buildroot-external/package/respeaker/respeaker.conf @@ -0,0 +1,3 @@ +snd-soc-seeed-voicecard +snd-soc-ac108 +snd-soc-wm8960 diff --git a/buildroot-external/package/respeaker/respeaker.hash b/buildroot-external/package/respeaker/respeaker.hash index c5e6ee43..a6797b7a 100644 --- a/buildroot-external/package/respeaker/respeaker.hash +++ b/buildroot-external/package/respeaker/respeaker.hash @@ -1,2 +1,4 @@ # Locally computed sha256 9f38d832acbfc7f07a58f15222d2fdcc0a9215ede488ccafb5c89a3e8223883d respeaker-be0812c70be29b0666a89f22a9d403cfb4c48fca.tar.gz +sha256 b68fb60cc173dc18e15bfc8eff97b57c3ef3085f2738c463ca9fa52d13d13896 respeaker-6c6b9ab7deb607aa985048ea170428729afc07a9.tar.gz +sha256 981002329f1227334a166e0fec0f547831bca5e9d840ef096499cce8f063752c respeaker-277aeacb81f4252767f234ae813ea535411f6138.tar.gz diff --git a/buildroot-external/package/respeaker/respeaker.mk b/buildroot-external/package/respeaker/respeaker.mk index 2bc936e7..39bbeae4 100644 --- a/buildroot-external/package/respeaker/respeaker.mk +++ b/buildroot-external/package/respeaker/respeaker.mk @@ -4,7 +4,7 @@ # ################################################################################ -RESPEAKER_VERSION = be0812c70be29b0666a89f22a9d403cfb4c48fca +RESPEAKER_VERSION = 277aeacb81f4252767f234ae813ea535411f6138 RESPEAKER_SITE = $(call github,respeaker,seeed-voicecard,$(RESPEAKER_VERSION)) RESPEAKER_LICENSE = GNU General Public License v3.0 RESPEAKER_DEPENDENCIES = rpi-firmware rpi-userland dtc @@ -12,20 +12,41 @@ RESPEAKER_DEPENDENCIES = rpi-firmware rpi-userland dtc $(eval $(kernel-module)) define RESPEAKER_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(BR2_EXTERNAL_MYCROFTOS_PATH)/package/respeaker/S16respeaker_modules \ - $(TARGET_DIR)/etc/init.d/S16respeaker_modules - $(INSTALL) -D -m 0755 $(BR2_EXTERNAL_MYCROFTOS_PATH)/package/respeaker/S60seeed_voicecard \ - $(TARGET_DIR)/etc/init.d/S60seeed_voicecard + $(INSTALL) -D -m 0644 $(BR2_EXTERNAL_MYCROFTOS_PATH)/package/respeaker/seeed-voicecard.service \ + $(TARGET_DIR)/usr/lib/systemd/system/seeed-voicecard.service + mkdir -p $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants + ln -fs ../../../../usr/lib/systemd/system/seeed-voicecard.service \ + $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants/seeed-voicecard.service + + $(INSTALL) -D -m 0644 $(BR2_EXTERNAL_MYCROFTOS_PATH)/package/respeaker/respeaker.conf \ + $(TARGET_DIR)/etc/modules-load.d/respeaker.conf mkdir -p $(TARGET_DIR)/etc/voicecard - rm $(@D)/dkms.conf - $(INSTALL) -D -m 0644 $(@D)/*.conf $(TARGET_DIR)/etc/voicecard $(INSTALL) -D -m 0644 $(@D)/*.state $(TARGET_DIR)/etc/voicecard - $(INSTALL) -D -m 0755 $(@D)/seeed-voicecard $(TARGET_DIR)/usr/bin + + $(INSTALL) -D -m 0755 $(BR2_EXTERNAL_MYCROFTOS_PATH)/package/respeaker/seeed-voicecard \ + $(TARGET_DIR)/usr/bin $(INSTALL) -D -m 0644 $(@D)/seeed-2mic-voicecard.dtbo $(BINARIES_DIR)/rpi-firmware/overlays/ $(INSTALL) -D -m 0644 $(@D)/seeed-4mic-voicecard.dtbo $(BINARIES_DIR)/rpi-firmware/overlays/ $(INSTALL) -D -m 0644 $(@D)/seeed-8mic-voicecard.dtbo $(BINARIES_DIR)/rpi-firmware/overlays/ + + mkdir -p $(TARGET_DIR)/usr/share/pulseaudio/alsa-mixer/profile-sets/ + $(INSTALL) -D -m 0644 $(@D)/pulseaudio/pulse_config_4mic/seeed-voicecard.conf \ + $(TARGET_DIR)/usr/share/pulseaudio/alsa-mixer/profile-sets/seeed-voicecard-4mic.conf + $(INSTALL) -D -m 0644 $(@D)/pulseaudio/pulse_config_6mic/seeed-voicecard.conf \ + $(TARGET_DIR)/usr/share/pulseaudio/alsa-mixer/profile-sets/seeed-voicecard-8mic.conf + $(INSTALL) -D -m 0644 $(@D)/pulseaudio/91-seeedvoicecard.rules \ + $(TARGET_DIR)/etc/udev/rules.d/91-seeedvoicecard.rules + + $(INSTALL) -D -m 0644 $(@D)/pulseaudio/pulse_config_4mic/default.pa \ + $(TARGET_DIR)/etc/pulse/seeed-voicecard-4mic-default.pa + $(INSTALL) -D -m 0644 $(@D)/pulseaudio/pulse_config_4mic/daemon.conf \ + $(TARGET_DIR)/etc/pulse/seeed-voicecard-4mic-daemon.conf + $(INSTALL) -D -m 0644 $(@D)/pulseaudio/pulse_config_6mic/default.pa \ + $(TARGET_DIR)/etc/pulse/seeed-voicecard-8mic-default.pa + $(INSTALL) -D -m 0644 $(@D)/pulseaudio/pulse_config_6mic/daemon.conf \ + $(TARGET_DIR)/etc/pulse/seeed-voicecard-8mic-daemon.conf endef $(eval $(generic-package)) diff --git a/buildroot-external/package/respeaker/seeed-voicecard b/buildroot-external/package/respeaker/seeed-voicecard new file mode 100755 index 00000000..3d12309f --- /dev/null +++ b/buildroot-external/package/respeaker/seeed-voicecard @@ -0,0 +1,155 @@ +#!/bin/bash +# +# Copyright (c) 2018 Baozhu Zuo +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +set -x +exec 1>/var/log/$(basename $0).log 2>&1 + +#enable i2c interface +dtparam i2c_arm=on +modprobe i2c-dev + +#enable spi interface +dtparam spi=on + +_VER_RUN= +function get_kernel_version() { + local ZIMAGE IMG_OFFSET + + _VER_RUN="" + [ -z "$_VER_RUN" ] && { + ZIMAGE=/boot/kernel.img + IMG_OFFSET=$(LC_ALL=C grep -abo $'\x1f\x8b\x08\x00' $ZIMAGE | head -n 1 | cut -d ':' -f 1) + _VER_RUN=$(dd if=$ZIMAGE obs=64K ibs=4 skip=$(( IMG_OFFSET / 4)) | zcat | grep -a -m1 "Linux version" | strings | awk '{ print $3; }') + } + echo "$_VER_RUN" + return 0 +} + +CONFIG=/boot/config.txt +get_overlay() { + ov=$1 + if grep -q -E "^dtoverlay=$ov" $CONFIG; then + echo 0 + else + echo 1 + fi +} + +do_overlay() { + ov=$1 + RET=$2 + DEFAULT=--defaultno + CURRENT=0 + if [ $(get_overlay $ov) -eq 0 ]; then + DEFAULT= + CURRENT=1 + fi + if [ $RET -eq $CURRENT ]; then + ASK_TO_REBOOT=1 + fi + if [ $RET -eq 0 ]; then + sed $CONFIG -i -e "s/^#dtoverlay=$ov/dtoverlay=$ov/" + if ! grep -q -E "^dtoverlay=$ov" $CONFIG; then + printf "dtoverlay=$ov\n" >> $CONFIG + fi + STATUS=enabled + elif [ $RET -eq 1 ]; then + sed $CONFIG -i -e "s/^dtoverlay=$ov/#dtoverlay=$ov/" + STATUS=disabled + else + return $RET + fi +} + + +is_1a=$(i2cdetect -y 1 0x1a 0x1a | egrep "(1a|UU)" | awk '{print $2}') +is_35=$(i2cdetect -y 1 0x35 0x35 | egrep "(35|UU)" | awk '{print $2}') +is_3b=$(i2cdetect -y 1 0x3b 0x3b | egrep "(3b|UU)" | awk '{print $2}') + +RPI_HATS="seeed-2mic-voicecard seeed-4mic-voicecard seeed-8mic-voicecard" +overlay="" + +if [ "x${is_1a}" != "x" ] && [ "x${is_35}" == "x" ] ; then + echo "install 2mic" + overlay=seeed-2mic-voicecard + asound_state=/etc/voicecard/wm8960_asound.state +fi + +if [ "x${is_3b}" != "x" ] && [ "x${is_35}" == "x" ] ; then + echo "install 4mic" + overlay=seeed-4mic-voicecard + asound_state=/etc/voicecard/ac108_asound.state + pulse_default=/etc/pulse/seeed-voicecard-4mic-default.pa + pulse_daemon=/etc/pulse/seeed-voicecard-4mic-daemon.conf +fi + +if [ "x${is_3b}" != "x" ] && [ "x${is_35}" != "x" ] ; then + echo "install 6mic" + overlay=seeed-8mic-voicecard + asound_state=/etc/voicecard/ac108_6mic.state + pulse_default=/etc/pulse/seeed-voicecard-8mic-default.pa + pulse_daemon=/etc/pulse/seeed-voicecard-8mic-daemon.conf +fi + +if [ "$overlay" ]; then + echo Install $overlay ... + + # Remove old configuration + rm /var/lib/alsa/asound.state + rm /etc/pulse/default.pa + rm /etc/pulse/system.pa + rm /etc/pulse/daemon.conf + + kernel_ver=$(get_kernel_version) + # echo kernel_ver=$kernel_ver + + # TODO: dynamic dtoverlay Bug of v4.19.x + # no DT node phandle inserted. + if [[ "$kernel_ver" =~ ^4\.19.*$ ]]; then + for i in $RPI_HATS; do + if [ "$i" == "$overlay" ]; then + do_overlay $overlay 0 + else + echo Uninstall $i ... + do_overlay $i 1 + fi + done + fi + #make sure the driver loads correctly + dtoverlay $overlay || true + + #install soundstate + echo "create $overlay asound status file" + ln -s $asound_state /var/lib/alsa/asound.state + + #install pulseaudio files + echo "create $overlay pulse default file" + ln -s $pulse_default /etc/pulse/default.pa + echo "create $overlay pulse system file" + ln -s $pulse_default /etc/pulse/system.pa + echo "create $overlay pulse daemon file" + ln -s $pulse_daemon /etc/pulse/daemon.conf +fi + +alsactl restore + +touch /var/lock/seeed-voicecard diff --git a/buildroot-external/package/respeaker/seeed-voicecard.service b/buildroot-external/package/respeaker/seeed-voicecard.service new file mode 100644 index 00000000..298fac66 --- /dev/null +++ b/buildroot-external/package/respeaker/seeed-voicecard.service @@ -0,0 +1,12 @@ +[Unit] +Description=Seeed Voicecard service +After=alsa-restore.service + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/usr/bin/seeed-voicecard +User=root + +[Install] +WantedBy=sysinit.target diff --git a/buildroot-external/rootfs-overlay/.bash_profile b/buildroot-external/rootfs-overlay/.bash_profile new file mode 100644 index 00000000..49c25bda --- /dev/null +++ b/buildroot-external/rootfs-overlay/.bash_profile @@ -0,0 +1,6 @@ +if [ -n "$BASH_VERSION" ]; then + # include .bashrc if it exists + if [ -f "$HOME/.bashrc" ]; then + . "$HOME/.bashrc" + fi +fi diff --git a/buildroot-external/rootfs-overlay/.bashrc b/buildroot-external/rootfs-overlay/.bashrc new file mode 100644 index 00000000..bfa82949 --- /dev/null +++ b/buildroot-external/rootfs-overlay/.bashrc @@ -0,0 +1,5 @@ +export TERM=xterm-xfree86 + +PS1='\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w \$\[\033[00m\] ' + +export NODE_PATH=/usr/lib/node_modules diff --git a/buildroot-external/rootfs-overlay/.profile b/buildroot-external/rootfs-overlay/.profile new file mode 100644 index 00000000..49c25bda --- /dev/null +++ b/buildroot-external/rootfs-overlay/.profile @@ -0,0 +1,6 @@ +if [ -n "$BASH_VERSION" ]; then + # include .bashrc if it exists + if [ -f "$HOME/.bashrc" ]; then + . "$HOME/.bashrc" + fi +fi diff --git a/buildroot-external/rootfs-overlay/etc/asound.conf b/buildroot-external/rootfs-overlay/etc/asound.conf index a6e739b0..23e1f11e 100644 --- a/buildroot-external/rootfs-overlay/etc/asound.conf +++ b/buildroot-external/rootfs-overlay/etc/asound.conf @@ -1,19 +1,14 @@ -defaults.ctl.card 0 -defaults.pcm.card 0 -defaults.pcm.device 0 - -pcm.!default { - type plug - slave.pcm "master" +# Use PulseAudio by default +pcm.!default { + type pulse + fallback "sysdefault" + hint { + show on + description "Default ALSA Output (currently PulseAudio Sound Server)" + } } ctl.!default { - type hw card 0 -} - -pcm.master { - type softvol - slave.pcm "plughw:0" - control.name "Master" - control.card 0 + type pulse + fallback "sysdefault" } diff --git a/buildroot-external/rootfs-overlay/etc/init.d/S00asplash b/buildroot-external/rootfs-overlay/etc/init.d/S00asplash deleted file mode 100755 index 2c52ed5f..00000000 --- a/buildroot-external/rootfs-overlay/etc/init.d/S00asplash +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -# -# Loading boot splash -# - -start() { - printf "Loading boot splash ..." - cat /dev/zero 1> /dev/fb0 2>/dev/null - fbv -f -d 1 /opt/mycroft/splash/boot.png > /dev/null 2>&1 - echo "[OK]" -} - -case "$1" in - start) - start - ;; - *) - echo "Usage: $0 {start}" - exit 1 -esac - -exit $? diff --git a/buildroot-external/rootfs-overlay/etc/init.d/S00resize_sdcard b/buildroot-external/rootfs-overlay/etc/init.d/S00resize_sdcard deleted file mode 100755 index 085e5be6..00000000 --- a/buildroot-external/rootfs-overlay/etc/init.d/S00resize_sdcard +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -# -# Resize SD card -# - -start() { - printf "Resize data partition ..." - parted /dev/mmcblk0 unit % resizepart 2 yes 100% && - partprobe /dev/mmcblk0 && - sync && - resize2fs /dev/mmcblk0p2 && - chmod -x /etc/init.d/S00resize_sdcard && - echo "[OK]" -} - -case "$1" in - start) - start - ;; - *) - echo "Usage: $0 {start}" - exit 1 -esac - -exit $? diff --git a/buildroot-external/rootfs-overlay/etc/init.d/S15modules b/buildroot-external/rootfs-overlay/etc/init.d/S15modules deleted file mode 100755 index 8eb8efad..00000000 --- a/buildroot-external/rootfs-overlay/etc/init.d/S15modules +++ /dev/null @@ -1,3 +0,0 @@ -modprobe snd-bcm2835 -modprobe spi-bcm2835 -#modprobe snd-usb-audio diff --git a/buildroot-external/rootfs-overlay/etc/init.d/S45alsasound b/buildroot-external/rootfs-overlay/etc/init.d/S45alsasound deleted file mode 100755 index d5c89b24..00000000 --- a/buildroot-external/rootfs-overlay/etc/init.d/S45alsasound +++ /dev/null @@ -1,4 +0,0 @@ -alsactl init -amixer cset numid=3 1 -amixer sset PCM 95% - diff --git a/buildroot-external/rootfs-overlay/etc/init.d/S90mycroft_prepare b/buildroot-external/rootfs-overlay/etc/init.d/S90mycroft_prepare deleted file mode 100755 index 0553ae9a..00000000 --- a/buildroot-external/rootfs-overlay/etc/init.d/S90mycroft_prepare +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh -# -# Prepare Mycroft software stack. -# - -start() { - # set the right locale / language settings - export LC_ALL=en_US.UTF-8 - export LANG=en_US.UTF-8 - export LANGUAGE=en_US.UTF-8 - - # Check if Mycroft log folders are present and if not - # create those logging folders - if [[ ! -w /var/log/mycroft/ ]] ; then - # Creating needed folders - printf "Creating /var/log/mycroft/ directory" - if [[ ! -d /var/log/mycroft/ ]] ; then - mkdir /var/log/mycroft/ - fi - fi - - # Check if /.mycroft exist already and if not - # create a symbolic link to /root/.mycroft - if [[ ! -w /.mycroft/ ]] ; then - # Creating .mycroft symlink - printf "Creating /.mycroft/ symlink" - if [[ ! -d /.mycroft/ ]] ; then - ln -s /root/.mycroft /.mycroft - fi - fi -} -case "$1" in - start) - start - ;; - *) - echo "Usage: $0 {start}" - exit 1 -esac - -exit $? diff --git a/buildroot-external/rootfs-overlay/etc/init.d/S91mycroft_services b/buildroot-external/rootfs-overlay/etc/init.d/S91mycroft_services deleted file mode 100755 index 00a8dfc6..00000000 --- a/buildroot-external/rootfs-overlay/etc/init.d/S91mycroft_services +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -# -# Starts Mycroft services. -# - -start() { - printf "Starting Mycroft services: " - umask 077 - bash /usr/bin/start-mycroft.sh all - echo "OK" -} -stop() { - printf "Stopping Mycroft services: " - bash /usr/bin/stop-mycroft.sh all - echo "OK" -} -restart() { - stop - start -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - restart - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? diff --git a/buildroot-external/rootfs-overlay/etc/mycroft/mycroft.conf b/buildroot-external/rootfs-overlay/etc/mycroft/mycroft.conf index 15e7e745..de4dda0f 100644 --- a/buildroot-external/rootfs-overlay/etc/mycroft/mycroft.conf +++ b/buildroot-external/rootfs-overlay/etc/mycroft/mycroft.conf @@ -1,10 +1,25 @@ { - "play_wav_cmdline": "aplay -Dhw:0,0 %1", - "play_mp3_cmdline": "mpg123 -a hw:0,0 %1", - "ipc_path": "/ramdisk/mycroft/ipc/", - "listener": { - "mute_during_output": false - }, - "ignore_logs": ["enclosure.mouth.viseme", "enclosure.mouth.display"], - "log_level": "DEBUG" + "play_wav_cmdline": "paplay %1", + "play_mp3_cmdline": "mpg123 %1", + "ipc_path": "/ramdisk/mycroft/ipc/", + "enclosure": { + "platform": "MycroftOS", + "platform_build": 1 + }, + "listener": { + "mute_during_output": false + }, + "tts": { + "module": "mimic2", + "mimic2": { + "lang": "en-us", + "url": "https://mimic-api.mycroft.ai/synthesize?text=", + "preloaded_cache": "/opt/mycroft/preloaded_cache/Mimic2" + }, + "pulse_duck": true + }, + "skills": { + "priority_skills": ["mycroft-pairing", "mycroft-volume"] + }, + "log_level": "INFO" } diff --git a/buildroot-external/rootfs-overlay/etc/network/interfaces b/buildroot-external/rootfs-overlay/etc/network/interfaces new file mode 100644 index 00000000..b36eb71a --- /dev/null +++ b/buildroot-external/rootfs-overlay/etc/network/interfaces @@ -0,0 +1,15 @@ +# interface file auto-generated by buildroot + +auto lo +iface lo inet loopback + +auto eth0 +iface eth0 inet dhcp + pre-up /etc/network/nfs_check + wait-delay 15 + +auto wlan0 +iface wlan0 inet dhcp + pre-up wpa_supplicant -B -Dnl80211 -iwlan0 -c/etc/wpa_supplicant.conf + post-down killall -q wpa_supplicant + wait-delay 15 diff --git a/buildroot-external/rootfs-overlay/etc/pulse/pulseaudio-daemon.conf b/buildroot-external/rootfs-overlay/etc/pulse/pulseaudio-daemon.conf new file mode 100644 index 00000000..16dedc66 --- /dev/null +++ b/buildroot-external/rootfs-overlay/etc/pulse/pulseaudio-daemon.conf @@ -0,0 +1,95 @@ +# This file is part of PulseAudio. +# +# PulseAudio is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PulseAudio is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with PulseAudio; if not, see . + +## Configuration file for the PulseAudio daemon. See pulse-daemon.conf(5) for +## more information. Default values are commented out. Use either ; or # for +## commenting. + +; daemonize = no +; fail = yes +; allow-module-loading = yes +; allow-exit = yes +; use-pid-file = yes +; system-instance = no +; local-server-type = user +; enable-shm = yes +; enable-memfd = yes +; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB +; lock-memory = no +; cpu-limit = no + +; high-priority = yes +; nice-level = -11 + +; realtime-scheduling = yes +; realtime-priority = 5 + +; exit-idle-time = 20 +; scache-idle-time = 20 + +; dl-search-path = (depends on architecture) + +; load-default-script-file = yes +; default-script-file = /etc/pulse/default.pa + +; log-target = auto +; log-level = notice +; log-meta = no +; log-time = no +; log-backtrace = 0 + +; resample-method = speex-float-1 +; avoid-resampling = false +; enable-remixing = yes +; remixing-use-all-sink-channels = yes +; enable-lfe-remixing = no +; lfe-crossover-freq = 0 + +; flat-volumes = yes + +; rlimit-fsize = -1 +; rlimit-data = -1 +; rlimit-stack = -1 +; rlimit-core = -1 +; rlimit-as = -1 +; rlimit-rss = -1 +; rlimit-nproc = -1 +; rlimit-nofile = 256 +; rlimit-memlock = -1 +; rlimit-locks = -1 +; rlimit-sigpending = -1 +; rlimit-msgqueue = -1 +; rlimit-nice = 31 +; rlimit-rtprio = 9 +; rlimit-rttime = 200000 + +; default-sample-format = s16le +; default-sample-rate = 44100 +; alternate-sample-rate = 48000 +; default-sample-channels = 2 +; default-channel-map = front-left,front-right + +; default-fragments = 4 +; default-fragment-size-msec = 25 + +; enable-deferred-volume = yes +; deferred-volume-safety-margin-usec = 8000 +; deferred-volume-extra-delay-usec = 0 + +# MycroftOS Audio Settings +resample-method = ffmpeg +default-sample-format = s24le +default-sample-rate = 48000 +alternate-sample-rate = 44100 diff --git a/buildroot-external/rootfs-overlay/etc/pulse/pulseaudio-default.pa b/buildroot-external/rootfs-overlay/etc/pulse/pulseaudio-default.pa new file mode 100644 index 00000000..667b5400 --- /dev/null +++ b/buildroot-external/rootfs-overlay/etc/pulse/pulseaudio-default.pa @@ -0,0 +1,151 @@ +#!/usr/bin/pulseaudio -nF +# +# This file is part of PulseAudio. +# +# PulseAudio is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PulseAudio is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with PulseAudio; if not, see . + +# This startup script is used only if PulseAudio is started per-user +# (i.e. not in system mode) + +.fail + +### Automatically restore the volume of streams and devices +load-module module-device-restore +load-module module-stream-restore +load-module module-card-restore + +### Automatically augment property information from .desktop files +### stored in /usr/share/application +load-module module-augment-properties + +### Should be after module-*-restore but before module-*-detect +load-module module-switch-on-port-available + +### Load audio drivers statically +### (it's probably better to not load these drivers manually, but instead +### use module-udev-detect -- see below -- for doing this automatically) +#load-module module-alsa-sink +#load-module module-alsa-source device=hw:1,0 +#load-module module-oss device="/dev/dsp" sink_name=output source_name=input +#load-module module-oss-mmap device="/dev/dsp" sink_name=output source_name=input +#load-module module-null-sink +#load-module module-pipe-sink + +### Automatically load driver modules depending on the hardware available +.ifexists module-udev-detect.so +load-module module-udev-detect +.else +### Use the static hardware detection module (for systems that lack udev support) +load-module module-detect +.endif + +### Automatically connect sink and source if JACK server is present +.ifexists module-jackdbus-detect.so +.nofail +load-module module-jackdbus-detect channels=2 +.fail +.endif + +### Automatically load driver modules for Bluetooth hardware +.ifexists module-bluetooth-policy.so +load-module module-bluetooth-policy +.endif + +.ifexists module-bluetooth-discover.so +load-module module-bluetooth-discover +.endif + +### Load several protocols +.ifexists module-esound-protocol-unix.so +load-module module-esound-protocol-unix +.endif +load-module module-native-protocol-unix auth-anonymous=1 + +### Network access (may be configured with paprefs, so leave this commented +### here if you plan to use paprefs) +#load-module module-esound-protocol-tcp +load-module module-native-protocol-tcp auth-ip-acl=127.0.0.1;192.168.0.0/16;172.16.0.0/12;10.0.0.0/8 auth-anonymous=1 +load-module module-zeroconf-publish + +### Load the RTP receiver module (also configured via paprefs, see above) +#load-module module-rtp-recv + +### Load the RTP sender module (also configured via paprefs, see above) +#load-module module-null-sink sink_name=rtp format=s16be channels=2 rate=44100 sink_properties="device.description='RTP Multicast Sink'" +#load-module module-rtp-send source=rtp.monitor + +### Load additional modules from GSettings. This can be configured with the paprefs tool. +### Please keep in mind that the modules configured by paprefs might conflict with manually +### loaded modules. +.ifexists module-gsettings.so +.nofail +load-module module-gsettings +.fail +.endif + + +### Automatically restore the default sink/source when changed by the user +### during runtime +### NOTE: This should be loaded as early as possible so that subsequent modules +### that look up the default sink/source get the right value +load-module module-default-device-restore + +### Automatically move streams to the default sink if the sink they are +### connected to dies, similar for sources +load-module module-rescue-streams + +### Make sure we always have a sink around, even if it is a null sink. +load-module module-always-sink + +### Honour intended role device property +load-module module-intended-roles + +### Automatically suspend sinks/sources that become idle for too long +load-module module-suspend-on-idle + +### If autoexit on idle is enabled we want to make sure we only quit +### when no local session needs us anymore. +.ifexists module-console-kit.so +load-module module-console-kit +.endif +.ifexists module-systemd-login.so +load-module module-systemd-login +.endif + +### Enable positioned event sounds +load-module module-position-event-sounds + +### Cork music/video streams when a phone stream is active +load-module module-role-cork + +### Modules to allow autoloading of filters (such as echo cancellation) +### on demand. module-filter-heuristics tries to determine what filters +### make sense, and module-filter-apply does the heavy-lifting of +### loading modules and rerouting streams. +load-module module-filter-heuristics +load-module module-filter-apply + +### Make some devices default +#set-default-sink output +#set-default-source input + +### MycroftOS Audio Settings +unload-module module-suspend-on-idle +unload-module module-role-cork +load-module module-role-ducking + +### Enable Echo/Noise-Cancellation +load-module module-echo-cancel aec_method=webrtc source_name=echoCancel_source sink_name=echoCancel_sink +set-default-source echoCancel_source +set-default-sink echoCancel_sink diff --git a/buildroot-external/rootfs-overlay/etc/pulse/pulseaudio-system.pa b/buildroot-external/rootfs-overlay/etc/pulse/pulseaudio-system.pa new file mode 100644 index 00000000..4e0c9ffc --- /dev/null +++ b/buildroot-external/rootfs-overlay/etc/pulse/pulseaudio-system.pa @@ -0,0 +1,73 @@ +#!/usr/bin/pulseaudio -nF +# +# This file is part of PulseAudio. +# +# PulseAudio is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PulseAudio is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with PulseAudio; if not, see . + +# This startup script is used only if PulseAudio is started in system +# mode. + +### Automatically restore the volume of streams and devices +load-module module-device-restore +load-module module-stream-restore +load-module module-card-restore + +### Automatically load driver modules depending on the hardware available +.ifexists module-udev-detect.so +load-module module-udev-detect +.else +### Use the static hardware detection module (for systems that lack udev/hal support) +load-module module-detect +.endif + +### Load several protocols +.ifexists module-esound-protocol-unix.so +load-module module-esound-protocol-unix +.endif +load-module module-native-protocol-unix auth-anonymous=1 + +### Network access (may be configured with paprefs, so leave this commented +### here if you plan to use paprefs) +#load-module module-esound-protocol-tcp +load-module module-native-protocol-tcp auth-ip-acl=127.0.0.1;192.168.0.0/16;172.16.0.0/12;10.0.0.0/8 auth-anonymous=1 +load-module module-zeroconf-publish + +### Automatically restore the default sink/source when changed by the user +### during runtime +### NOTE: This should be loaded as early as possible so that subsequent modules +### that look up the default sink/source get the right value +load-module module-default-device-restore + +### Automatically move streams to the default sink if the sink they are +### connected to dies, similar for sources +load-module module-rescue-streams + +### Make sure we always have a sink around, even if it is a null sink. +load-module module-always-sink + +### Automatically suspend sinks/sources that become idle for too long +load-module module-suspend-on-idle + +### Enable positioned event sounds +load-module module-position-event-sounds + +### MycroftOS Audio Settings +unload-module module-suspend-on-idle +unload-module module-role-cork +load-module module-role-ducking + +### Enable Echo/Noise-Cancellation +load-module module-echo-cancel aec_method=webrtc source_name=echoCancel_source sink_name=echoCancel_sink +set-default-source echoCancel_source +set-default-sink echoCancel_sink diff --git a/buildroot-external/rootfs-overlay/etc/pulse/seeed-voicecard-4mic-daemon.conf b/buildroot-external/rootfs-overlay/etc/pulse/seeed-voicecard-4mic-daemon.conf new file mode 100644 index 00000000..ca3a3c3e --- /dev/null +++ b/buildroot-external/rootfs-overlay/etc/pulse/seeed-voicecard-4mic-daemon.conf @@ -0,0 +1,94 @@ +# This file is part of PulseAudio. +# +# PulseAudio is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PulseAudio is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with PulseAudio; if not, see . + +## Configuration file for the PulseAudio daemon. See pulse-daemon.conf(5) for +## more information. Default values are commented out. Use either ; or # for +## commenting. + +; daemonize = no +; fail = yes +; allow-module-loading = yes +; allow-exit = yes +; use-pid-file = yes +; system-instance = no +; local-server-type = user +; enable-shm = yes +; enable-memfd = yes +; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB +; lock-memory = no +; cpu-limit = no + +; high-priority = yes +; nice-level = -11 + +; realtime-scheduling = yes +; realtime-priority = 5 + +; exit-idle-time = 20 +; scache-idle-time = 20 + +; dl-search-path = (depends on architecture) + +; load-default-script-file = yes +; default-script-file = /etc/pulse/default.pa + +; log-target = auto +; log-level = notice +; log-meta = no +; log-time = no +; log-backtrace = 0 + +; resample-method = speex-float-1 +; enable-remixing = yes +; enable-lfe-remixing = no +; lfe-crossover-freq = 0 + +; flat-volumes = yes + +; rlimit-fsize = -1 +; rlimit-data = -1 +; rlimit-stack = -1 +; rlimit-core = -1 +; rlimit-as = -1 +; rlimit-rss = -1 +; rlimit-nproc = -1 +; rlimit-nofile = 256 +; rlimit-memlock = -1 +; rlimit-locks = -1 +; rlimit-sigpending = -1 +; rlimit-msgqueue = -1 +; rlimit-nice = 31 +; rlimit-rtprio = 9 +; rlimit-rttime = 200000 + +; default-sample-format = s16le +; default-sample-rate = 96000 +; alternate-sample-rate = 48000 +; default-sample-channels = 4 +; default-channel-map = front-left,front-right + +; default-fragments = 4 +; default-fragment-size-msec = 25 + +; enable-deferred-volume = yes +; deferred-volume-safety-margin-usec = 8000 +; deferred-volume-extra-delay-usec = 0 + +# MycroftOS Audio Settings +resample-method = ffmpeg +default-sample-format = s24le +default-sample-rate = 48000 +alternate-sample-rate = 44100 +default-sample-channels = 4 diff --git a/buildroot-external/rootfs-overlay/etc/pulse/seeed-voicecard-4mic-default.pa b/buildroot-external/rootfs-overlay/etc/pulse/seeed-voicecard-4mic-default.pa new file mode 100644 index 00000000..706d4c29 --- /dev/null +++ b/buildroot-external/rootfs-overlay/etc/pulse/seeed-voicecard-4mic-default.pa @@ -0,0 +1,153 @@ +#!/usr/bin/pulseaudio -nF +# +# This file is part of PulseAudio. +# +# PulseAudio is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PulseAudio is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with PulseAudio; if not, see . + +# This startup script is used only if PulseAudio is started per-user +# (i.e. not in system mode) + +.fail + +### Automatically restore the volume of streams and devices +load-module module-device-restore +load-module module-stream-restore +load-module module-card-restore + +### Automatically augment property information from .desktop files +### stored in /usr/share/application +load-module module-augment-properties + +### Should be after module-*-restore but before module-*-detect +load-module module-switch-on-port-available + +### Load audio drivers statically +### (it's probably better to not load these drivers manually, but instead +### use module-udev-detect -- see below -- for doing this automatically) +#load-module module-alsa-sink device="hw:1,0" channels=8 rate=48000 format=s32le +#load-module module-alsa-source device="hw:1,0" channels=8 rate=48000 format=s32le +#load-module module-oss device="/dev/dsp" sink_name=output source_name=input +#load-module module-oss-mmap device="/dev/dsp" sink_name=output source_name=input +#load-module module-null-sink +#load-module module-pipe-sink + +### Automatically load driver modules depending on the hardware available +.ifexists module-udev-detect.so +load-module module-udev-detect +#channels=8 rate=48000 format=s32le +.else +### Use the static hardware detection module (for systems that lack udev support) +load-module module-detect +.endif + +### Automatically connect sink and source if JACK server is present +.ifexists module-jackdbus-detect.so +.nofail +load-module module-jackdbus-detect channels=2 +.fail +.endif + +### Automatically load driver modules for Bluetooth hardware +.ifexists module-bluetooth-policy.so +load-module module-bluetooth-policy +.endif + +.ifexists module-bluetooth-discover.so +load-module module-bluetooth-discover +.endif + +### Load several protocols +.ifexists module-esound-protocol-unix.so +load-module module-esound-protocol-unix +.endif +load-module module-native-protocol-unix auth-anonymous=1 + +### Network access (may be configured with paprefs, so leave this commented +### here if you plan to use paprefs) +#load-module module-esound-protocol-tcp +load-module module-native-protocol-tcp auth-ip-acl=127.0.0.1;192.168.0.0/16;172.16.0.0/12;10.0.0.0/8 auth-anonymous=1 +load-module module-zeroconf-publish + +### Load the RTP receiver module (also configured via paprefs, see above) +#load-module module-rtp-recv + +### Load the RTP sender module (also configured via paprefs, see above) +#load-module module-null-sink sink_name=rtp format=s16be channels=2 rate=44100 sink_properties="device.description='RTP Multicast Sink'" +#load-module module-rtp-send source=rtp.monitor + +### Load additional modules from GConf settings. This can be configured with the paprefs tool. +### Please keep in mind that the modules configured by paprefs might conflict with manually +### loaded modules. +.ifexists module-gconf.so +.nofail +load-module module-gconf +.fail +.endif + +### Automatically restore the default sink/source when changed by the user +### during runtime +### NOTE: This should be loaded as early as possible so that subsequent modules +### that look up the default sink/source get the right value +load-module module-default-device-restore + +### Automatically move streams to the default sink if the sink they are +### connected to dies, similar for sources +load-module module-rescue-streams + +### Make sure we always have a sink around, even if it is a null sink. +load-module module-always-sink + +### Honour intended role device property +load-module module-intended-roles + +### Automatically suspend sinks/sources that become idle for too long +load-module module-suspend-on-idle + +### If autoexit on idle is enabled we want to make sure we only quit +### when no local session needs us anymore. +.ifexists module-console-kit.so +load-module module-console-kit +.endif +.ifexists module-systemd-login.so +load-module module-systemd-login +.endif + +### Enable positioned event sounds +load-module module-position-event-sounds + +### Cork music/video streams when a phone stream is active +load-module module-role-cork + +### Modules to allow autoloading of filters (such as echo cancellation) +### on demand. module-filter-heuristics tries to determine what filters +### make sense, and module-filter-apply does the heavy-lifting of +### loading modules and rerouting streams. +load-module module-filter-heuristics +load-module module-filter-apply + +### Make some devices default +#set-default-sink output +#set-default-source input +#set-default-source alsa_input.platform-soc_sound.seeed-source +#set-default-sink alsa_output.platform-soc_sound.seeed-sink + +### MycroftOS Audio Settings +unload-module module-suspend-on-idle +unload-module module-role-cork +load-module module-role-ducking + +### Enable Echo/Noise-Cancellation +load-module module-echo-cancel aec_method=webrtc source_name=echoCancel_source sink_name=echoCancel_sink +set-default-source echoCancel_source +set-default-sink echoCancel_sink diff --git a/buildroot-external/rootfs-overlay/etc/pulse/seeed-voicecard-8mic-daemon.conf b/buildroot-external/rootfs-overlay/etc/pulse/seeed-voicecard-8mic-daemon.conf new file mode 100644 index 00000000..75d46168 --- /dev/null +++ b/buildroot-external/rootfs-overlay/etc/pulse/seeed-voicecard-8mic-daemon.conf @@ -0,0 +1,94 @@ +# This file is part of PulseAudio. +# +# PulseAudio is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PulseAudio is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with PulseAudio; if not, see . + +## Configuration file for the PulseAudio daemon. See pulse-daemon.conf(5) for +## more information. Default values are commented out. Use either ; or # for +## commenting. + +; daemonize = no +; fail = yes +; allow-module-loading = yes +; allow-exit = yes +; use-pid-file = yes +; system-instance = no +; local-server-type = user +; enable-shm = yes +; enable-memfd = yes +; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB +; lock-memory = no +; cpu-limit = no + +; high-priority = yes +; nice-level = -11 + +; realtime-scheduling = yes +; realtime-priority = 5 + +; exit-idle-time = 20 +; scache-idle-time = 20 + +; dl-search-path = (depends on architecture) + +; load-default-script-file = yes +; default-script-file = /etc/pulse/default.pa + +; log-target = auto +; log-level = notice +; log-meta = no +; log-time = no +; log-backtrace = 0 + +; resample-method = speex-float-1 +; enable-remixing = yes +; enable-lfe-remixing = no +; lfe-crossover-freq = 0 + +; flat-volumes = yes + +; rlimit-fsize = -1 +; rlimit-data = -1 +; rlimit-stack = -1 +; rlimit-core = -1 +; rlimit-as = -1 +; rlimit-rss = -1 +; rlimit-nproc = -1 +; rlimit-nofile = 256 +; rlimit-memlock = -1 +; rlimit-locks = -1 +; rlimit-sigpending = -1 +; rlimit-msgqueue = -1 +; rlimit-nice = 31 +; rlimit-rtprio = 9 +; rlimit-rttime = 200000 + +; default-sample-format = s32le +; default-sample-rate = 96000 +; alternate-sample-rate = 48000 +; default-sample-channels = 8 +; default-channel-map = front-left,front-right + +; default-fragments = 4 +; default-fragment-size-msec = 25 + +; enable-deferred-volume = yes +; deferred-volume-safety-margin-usec = 8000 +; deferred-volume-extra-delay-usec = 0 + +# MycroftOS Audio Settings +resample-method = ffmpeg +default-sample-format = s24le +default-sample-rate = 48000 +alternate-sample-rate = 44100 +default-sample-channels = 8 diff --git a/buildroot-external/rootfs-overlay/etc/pulse/seeed-voicecard-8mic-default.pa b/buildroot-external/rootfs-overlay/etc/pulse/seeed-voicecard-8mic-default.pa new file mode 100644 index 00000000..d3330615 --- /dev/null +++ b/buildroot-external/rootfs-overlay/etc/pulse/seeed-voicecard-8mic-default.pa @@ -0,0 +1,154 @@ +#!/usr/bin/pulseaudio -nF +# +# This file is part of PulseAudio. +# +# PulseAudio is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PulseAudio is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with PulseAudio; if not, see . + +# This startup script is used only if PulseAudio is started per-user +# (i.e. not in system mode) + +.fail + +### Automatically restore the volume of streams and devices +load-module module-device-restore +load-module module-stream-restore +load-module module-card-restore + +### Automatically augment property information from .desktop files +### stored in /usr/share/application +load-module module-augment-properties + +### Should be after module-*-restore but before module-*-detect +load-module module-switch-on-port-available + +### Load audio drivers statically +### (it's probably better to not load these drivers manually, but instead +### use module-udev-detect -- see below -- for doing this automatically) +#load-module module-alsa-sink device="hw:1,0" channels=8 rate=48000 format=s32le +#load-module module-alsa-source device="hw:1,0" channels=8 rate=48000 format=s32le +#load-module module-oss device="/dev/dsp" sink_name=output source_name=input +#load-module module-oss-mmap device="/dev/dsp" sink_name=output source_name=input +#load-module module-null-sink +#load-module module-pipe-sink + +### Automatically load driver modules depending on the hardware available +.ifexists module-udev-detect.so +load-module module-udev-detect +#channels=8 rate=48000 format=s32le +.else +### Use the static hardware detection module (for systems that lack udev support) +load-module module-detect +.endif + +### Automatically connect sink and source if JACK server is present +.ifexists module-jackdbus-detect.so +.nofail +load-module module-jackdbus-detect channels=2 +.fail +.endif + +### Automatically load driver modules for Bluetooth hardware +.ifexists module-bluetooth-policy.so +load-module module-bluetooth-policy +.endif + +.ifexists module-bluetooth-discover.so +load-module module-bluetooth-discover +.endif + +### Load several protocols +.ifexists module-esound-protocol-unix.so +load-module module-esound-protocol-unix +.endif +load-module module-native-protocol-unix auth-anonymous=1 + +### Network access (may be configured with paprefs, so leave this commented +### here if you plan to use paprefs) +#load-module module-esound-protocol-tcp +load-module module-native-protocol-tcp auth-ip-acl=127.0.0.1;192.168.0.0/16;172.16.0.0/12;10.0.0.0/8 auth-anonymous=1 +load-module module-zeroconf-publish + +### Load the RTP receiver module (also configured via paprefs, see above) +#load-module module-rtp-recv + +### Load the RTP sender module (also configured via paprefs, see above) +#load-module module-null-sink sink_name=rtp format=s16be channels=2 rate=44100 sink_properties="device.description='RTP Multicast Sink'" +#load-module module-rtp-send source=rtp.monitor + +### Load additional modules from GConf settings. This can be configured with the paprefs tool. +### Please keep in mind that the modules configured by paprefs might conflict with manually +### loaded modules. +.ifexists module-gconf.so +.nofail +load-module module-gconf +.fail +.endif + +### Automatically restore the default sink/source when changed by the user +### during runtime +### NOTE: This should be loaded as early as possible so that subsequent modules +### that look up the default sink/source get the right value +load-module module-default-device-restore + +### Automatically move streams to the default sink if the sink they are +### connected to dies, similar for sources +load-module module-rescue-streams + +### Make sure we always have a sink around, even if it is a null sink. +load-module module-always-sink + +### Honour intended role device property +load-module module-intended-roles + +### Automatically suspend sinks/sources that become idle for too long +load-module module-suspend-on-idle + +### If autoexit on idle is enabled we want to make sure we only quit +### when no local session needs us anymore. +.ifexists module-console-kit.so +load-module module-console-kit +.endif +.ifexists module-systemd-login.so +load-module module-systemd-login +.endif + +### Enable positioned event sounds +load-module module-position-event-sounds + +### Cork music/video streams when a phone stream is active +load-module module-role-cork + +### Modules to allow autoloading of filters (such as echo cancellation) +### on demand. module-filter-heuristics tries to determine what filters +### make sense, and module-filter-apply does the heavy-lifting of +### loading modules and rerouting streams. +load-module module-filter-heuristics +load-module module-filter-apply + +### Make some devices default +#set-default-sink output +#set-default-source input +#set-default-source alsa_input.platform-soc_sound.seeed-8ch +#set-default-sink alsa_output.platform-soc_sound.seeed-2ch + +### MycroftOS Audio Settings +unload-module module-suspend-on-idle +unload-module module-role-cork +load-module module-role-ducking + +### Enable Echo/Noise-Cancellation +load-module module-echo-cancel aec_method=webrtc source_name=echoCancel_source sink_name=echoCancel_sink +set-default-source echoCancel_source +set-default-sink echoCancel_sink + diff --git a/buildroot-external/rootfs-overlay/etc/ssh/sshd_config b/buildroot-external/rootfs-overlay/etc/ssh/sshd_config index 44fff67b..3807b886 100644 --- a/buildroot-external/rootfs-overlay/etc/ssh/sshd_config +++ b/buildroot-external/rootfs-overlay/etc/ssh/sshd_config @@ -29,10 +29,11 @@ # Authentication: #LoginGraceTime 2m -PermitRootLogin yes +PermitRootLogin no #StrictModes yes #MaxAuthTries 6 #MaxSessions 10 +AllowUsers *@* #PubkeyAuthentication yes diff --git a/buildroot-external/rootfs-overlay/etc/sudoers b/buildroot-external/rootfs-overlay/etc/sudoers new file mode 100644 index 00000000..c1563c91 --- /dev/null +++ b/buildroot-external/rootfs-overlay/etc/sudoers @@ -0,0 +1,97 @@ +## sudoers file. +## +## This file MUST be edited with the 'visudo' command as root. +## Failure to use 'visudo' may result in syntax or file permission errors +## that prevent sudo from running. +## +## See the sudoers man page for the details on how to write a sudoers file. +## + +## +## Host alias specification +## +## Groups of machines. These may include host names (optionally with wildcards), +## IP addresses, network numbers or netgroups. +# Host_Alias WEBSERVERS = www1, www2, www3 + +## +## User alias specification +## +## Groups of users. These may consist of user names, uids, Unix groups, +## or netgroups. +# User_Alias ADMINS = millert, dowdy, mikef + +## +## Cmnd alias specification +## +## Groups of commands. Often used to group related commands together. +# Cmnd_Alias PROCESSES = /usr/bin/nice, /bin/kill, /usr/bin/renice, \ +# /usr/bin/pkill, /usr/bin/top +# Cmnd_Alias REBOOT = /sbin/halt, /sbin/reboot, /sbin/poweroff + +## +## Defaults specification +## +## You may wish to keep some of the following environment variables +## when running commands via sudo. +## +## Locale settings +# Defaults env_keep += "LANG LANGUAGE LINGUAS LC_* _XKB_CHARSET" +## +## Run X applications through sudo; HOME is used to find the +## .Xauthority file. Note that other programs use HOME to find +## configuration files and this may lead to privilege escalation! +# Defaults env_keep += "HOME" +## +## X11 resource path settings +# Defaults env_keep += "XAPPLRESDIR XFILESEARCHPATH XUSERFILESEARCHPATH" +## +## Desktop path settings +# Defaults env_keep += "QTDIR KDEDIR" +## +## Allow sudo-run commands to inherit the callers' ConsoleKit session +# Defaults env_keep += "XDG_SESSION_COOKIE" +## +## Uncomment to enable special input methods. Care should be taken as +## this may allow users to subvert the command being run via sudo. +# Defaults env_keep += "XMODIFIERS GTK_IM_MODULE QT_IM_MODULE QT_IM_SWITCHER" +## +## Uncomment to use a hard-coded PATH instead of the user's to find commands +# Defaults secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" +## +## Uncomment to send mail if the user does not enter the correct password. +# Defaults mail_badpass +## +## Uncomment to enable logging of a command's output, except for +## sudoreplay and reboot. Use sudoreplay to play back logged sessions. +# Defaults log_output +# Defaults!/usr/bin/sudoreplay !log_output +# Defaults!/usr/local/bin/sudoreplay !log_output +# Defaults!REBOOT !log_output + +## +## Runas alias specification +## + +## +## User privilege specification +## +root ALL=(ALL) ALL + +## Uncomment to allow members of group wheel to execute any command +# %wheel ALL=(ALL) ALL + +## Same thing without a password +# %wheel ALL=(ALL) NOPASSWD: ALL + +## Uncomment to allow members of group sudo to execute any command +# %sudo ALL=(ALL) ALL + +## Uncomment to allow any user to run sudo if they know the password +## of the user they are running the command as (root by default). +# Defaults targetpw # Ask for the password of the target user +# ALL ALL=(ALL) ALL # WARNING: only use this together with 'Defaults targetpw' + +## Read drop-in files from /etc/sudoers.d +## (the '#' here does not indicate a comment) +#includedir /etc/sudoers.d diff --git a/buildroot-external/rootfs-overlay/etc/sudoers.d/mycroft b/buildroot-external/rootfs-overlay/etc/sudoers.d/mycroft new file mode 100644 index 00000000..51413bf5 --- /dev/null +++ b/buildroot-external/rootfs-overlay/etc/sudoers.d/mycroft @@ -0,0 +1 @@ +mycroft 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 new file mode 100644 index 00000000..78f8b414 --- /dev/null +++ b/buildroot-external/rootfs-overlay/etc/tmpfiles.d/mycroft.conf @@ -0,0 +1,4 @@ +d /var/log/mycroft 700 mycroft mycroft +d /opt/mycroft 755 mycroft mycroft +d /opt/mycroft/skills 755 mycroft mycroft +d /opt/mycroft/splash 755 mycroft mycroft diff --git a/buildroot-external/rootfs-overlay/etc/udev/rules.d/99-com.rules b/buildroot-external/rootfs-overlay/etc/udev/rules.d/99-com.rules new file mode 100644 index 00000000..6904e602 --- /dev/null +++ b/buildroot-external/rootfs-overlay/etc/udev/rules.d/99-com.rules @@ -0,0 +1,13 @@ +SUBSYSTEM=="input", GROUP="input", MODE="0660" +SUBSYSTEM=="i2c-dev", GROUP="i2c", MODE="0660" +SUBSYSTEM=="spidev", GROUP="spi", MODE="0660" +SUBSYSTEM=="bcm2835-gpiomem", GROUP="gpio", MODE="0660" +SUBSYSTEM=="argon-*", GROUP="video", MODE="0660" +SUBSYSTEM=="rpivid-*", GROUP="video", MODE="0660" + +SUBSYSTEM=="gpio", GROUP="gpio", MODE="0660" +SUBSYSTEM=="gpio*", PROGRAM="/bin/sh -c '\ + chown -R root:gpio /sys/class/gpio && chmod -R 770 /sys/class/gpio;\ + chown -R root:gpio /sys/devices/virtual/gpio && chmod -R 770 /sys/devices/virtual/gpio;\ + chown -R root:gpio /sys$devpath && chmod -R 770 /sys$devpath\ +'" diff --git a/buildroot-external/rootfs-overlay/home/mycroft/.bash_profile b/buildroot-external/rootfs-overlay/home/mycroft/.bash_profile new file mode 100644 index 00000000..49c25bda --- /dev/null +++ b/buildroot-external/rootfs-overlay/home/mycroft/.bash_profile @@ -0,0 +1,6 @@ +if [ -n "$BASH_VERSION" ]; then + # include .bashrc if it exists + if [ -f "$HOME/.bashrc" ]; then + . "$HOME/.bashrc" + fi +fi diff --git a/buildroot-external/rootfs-overlay/home/mycroft/.bashrc b/buildroot-external/rootfs-overlay/home/mycroft/.bashrc new file mode 100644 index 00000000..63a035e9 --- /dev/null +++ b/buildroot-external/rootfs-overlay/home/mycroft/.bashrc @@ -0,0 +1,12 @@ +export TERM=xterm-xfree86 + +PS1='\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w \$\[\033[00m\] ' + +export NODE_PATH=/usr/lib/node_modules + +alias ll='ls -l' + +###################################################################### +# Initialize MycroftOS CLI Environment +###################################################################### +source cli_login.sh diff --git a/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/mycroft.conf b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/mycroft.conf new file mode 100644 index 00000000..2ffdf318 --- /dev/null +++ b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/mycroft.conf @@ -0,0 +1,3 @@ +{ + "max_allowed_core_version": 19.8 +} diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/hey-mycroft.pb b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/hey-mycroft.pb similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/hey-mycroft.pb rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/hey-mycroft.pb diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/hey-mycroft.pb.params b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/hey-mycroft.pb.params similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/hey-mycroft.pb.params rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/hey-mycroft.pb.params diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/hey-mycroft.tar.gz b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/hey-mycroft.tar.gz similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/hey-mycroft.tar.gz rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/hey-mycroft.tar.gz diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/_bz2.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/_bz2.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/_bz2.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/_bz2.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/_codecs_cn.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/_codecs_cn.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/_codecs_cn.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/_codecs_cn.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/_codecs_hk.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/_codecs_hk.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/_codecs_hk.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/_codecs_hk.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/_codecs_iso2022.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/_codecs_iso2022.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/_codecs_iso2022.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/_codecs_iso2022.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/_codecs_jp.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/_codecs_jp.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/_codecs_jp.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/_codecs_jp.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/_codecs_kr.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/_codecs_kr.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/_codecs_kr.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/_codecs_kr.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/_codecs_tw.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/_codecs_tw.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/_codecs_tw.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/_codecs_tw.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/_csv.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/_csv.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/_csv.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/_csv.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/_ctypes.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/_ctypes.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/_ctypes.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/_ctypes.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/_curses.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/_curses.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/_curses.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/_curses.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/_decimal.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/_decimal.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/_decimal.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/_decimal.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/_hashlib.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/_hashlib.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/_hashlib.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/_hashlib.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/_json.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/_json.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/_json.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/_json.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/_lzma.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/_lzma.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/_lzma.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/_lzma.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/_multibytecodec.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/_multibytecodec.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/_multibytecodec.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/_multibytecodec.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/_multiprocessing.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/_multiprocessing.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/_multiprocessing.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/_multiprocessing.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/_opcode.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/_opcode.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/_opcode.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/_opcode.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/_pywrap_tensorflow_internal.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/_pywrap_tensorflow_internal.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/_pywrap_tensorflow_internal.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/_pywrap_tensorflow_internal.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/_ssl.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/_ssl.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/_ssl.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/_ssl.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/audioop.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/audioop.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/audioop.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/audioop.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/base_library.zip b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/base_library.zip similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/base_library.zip rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/base_library.zip diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py._conv.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py._conv.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py._conv.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py._conv.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py._errors.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py._errors.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py._errors.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py._errors.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py._objects.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py._objects.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py._objects.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py._objects.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py._proxy.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py._proxy.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py._proxy.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py._proxy.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py.defs.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py.defs.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py.defs.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py.defs.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py.h5.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py.h5.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py.h5.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py.h5.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py.h5a.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py.h5a.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py.h5a.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py.h5a.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py.h5ac.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py.h5ac.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py.h5ac.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py.h5ac.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py.h5d.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py.h5d.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py.h5d.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py.h5d.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py.h5ds.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py.h5ds.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py.h5ds.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py.h5ds.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py.h5f.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py.h5f.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py.h5f.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py.h5f.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py.h5fd.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py.h5fd.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py.h5fd.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py.h5fd.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py.h5g.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py.h5g.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py.h5g.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py.h5g.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py.h5i.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py.h5i.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py.h5i.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py.h5i.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py.h5l.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py.h5l.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py.h5l.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py.h5l.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py.h5o.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py.h5o.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py.h5o.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py.h5o.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py.h5p.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py.h5p.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py.h5p.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py.h5p.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py.h5r.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py.h5r.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py.h5r.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py.h5r.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py.h5s.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py.h5s.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py.h5s.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py.h5s.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py.h5t.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py.h5t.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py.h5t.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py.h5t.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py.h5z.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py.h5z.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py.h5z.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py.h5z.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py.utils.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py.utils.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/h5py.utils.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/h5py.utils.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/include/python3.4m/pyconfig.h b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/include/python3.4m/pyconfig.h similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/include/python3.4m/pyconfig.h rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/include/python3.4m/pyconfig.h diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/lib/python3.4/config-3.4m-arm-linux-gnueabihf/Makefile b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/lib/python3.4/config-3.4m-arm-linux-gnueabihf/Makefile similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/lib/python3.4/config-3.4m-arm-linux-gnueabihf/Makefile rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/lib/python3.4/config-3.4m-arm-linux-gnueabihf/Makefile diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/lib2to3/Grammar.txt b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/lib2to3/Grammar.txt similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/lib2to3/Grammar.txt rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/lib2to3/Grammar.txt diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/lib2to3/PatternGrammar.txt b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/lib2to3/PatternGrammar.txt similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/lib2to3/PatternGrammar.txt rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/lib2to3/PatternGrammar.txt diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/libbz2.so.1.0 b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/libbz2.so.1.0 similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/libbz2.so.1.0 rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/libbz2.so.1.0 diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/libcrypto.so.1.0.0 b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/libcrypto.so.1.0.0 similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/libcrypto.so.1.0.0 rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/libcrypto.so.1.0.0 diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/libexpat.so.1 b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/libexpat.so.1 similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/libexpat.so.1 rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/libexpat.so.1 diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/libffi.so.6 b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/libffi.so.6 similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/libffi.so.6 rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/libffi.so.6 diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/libgcc_s.so.1 b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/libgcc_s.so.1 similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/libgcc_s.so.1 rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/libgcc_s.so.1 diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/libgfortran.so.3 b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/libgfortran.so.3 similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/libgfortran.so.3 rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/libgfortran.so.3 diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/libhdf5_serial.so.8 b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/libhdf5_serial.so.8 similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/libhdf5_serial.so.8 rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/libhdf5_serial.so.8 diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/libhdf5_serial_hl.so.8 b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/libhdf5_serial_hl.so.8 similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/libhdf5_serial_hl.so.8 rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/libhdf5_serial_hl.so.8 diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/liblapack.so.3 b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/liblapack.so.3 similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/liblapack.so.3 rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/liblapack.so.3 diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/liblzma.so.5 b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/liblzma.so.5 similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/liblzma.so.5 rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/liblzma.so.5 diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/libmpdec.so.2 b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/libmpdec.so.2 similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/libmpdec.so.2 rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/libmpdec.so.2 diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/libncursesw.so.5 b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/libncursesw.so.5 similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/libncursesw.so.5 rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/libncursesw.so.5 diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/libopenblas.so.0 b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/libopenblas.so.0 similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/libopenblas.so.0 rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/libopenblas.so.0 diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/libpython3.4m.so.1.0 b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/libpython3.4m.so.1.0 similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/libpython3.4m.so.1.0 rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/libpython3.4m.so.1.0 diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/libreadline.so.6 b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/libreadline.so.6 similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/libreadline.so.6 rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/libreadline.so.6 diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/libssl.so.1.0.0 b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/libssl.so.1.0.0 similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/libssl.so.1.0.0 rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/libssl.so.1.0.0 diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/libstdc++.so.6 b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/libstdc++.so.6 similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/libstdc++.so.6 rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/libstdc++.so.6 diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/libtinfo.so.5 b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/libtinfo.so.5 similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/libtinfo.so.5 rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/libtinfo.so.5 diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/libz.so.1 b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/libz.so.1 similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/libz.so.1 rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/libz.so.1 diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/mmap.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/mmap.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/mmap.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/mmap.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/numpy.core.multiarray.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/numpy.core.multiarray.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/numpy.core.multiarray.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/numpy.core.multiarray.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/numpy.core.multiarray_tests.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/numpy.core.multiarray_tests.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/numpy.core.multiarray_tests.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/numpy.core.multiarray_tests.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/numpy.core.umath.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/numpy.core.umath.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/numpy.core.umath.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/numpy.core.umath.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/numpy.fft.fftpack_lite.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/numpy.fft.fftpack_lite.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/numpy.fft.fftpack_lite.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/numpy.fft.fftpack_lite.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/numpy.linalg._umath_linalg.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/numpy.linalg._umath_linalg.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/numpy.linalg._umath_linalg.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/numpy.linalg._umath_linalg.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/numpy.linalg.lapack_lite.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/numpy.linalg.lapack_lite.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/numpy.linalg.lapack_lite.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/numpy.linalg.lapack_lite.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/numpy.random.mtrand.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/numpy.random.mtrand.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/numpy.random.mtrand.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/numpy.random.mtrand.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/parser.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/parser.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/parser.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/parser.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/precise-engine b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/precise-engine similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/precise-engine rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/precise-engine diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/readline.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/readline.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/readline.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/readline.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/resource.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/resource.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/resource.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/resource.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy._lib._ccallback_c.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy._lib._ccallback_c.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy._lib._ccallback_c.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy._lib._ccallback_c.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.fftpack._fftpack.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.fftpack._fftpack.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.fftpack._fftpack.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.fftpack._fftpack.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.fftpack.convolve.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.fftpack.convolve.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.fftpack.convolve.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.fftpack.convolve.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.integrate._dop.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.integrate._dop.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.integrate._dop.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.integrate._dop.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.integrate._odepack.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.integrate._odepack.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.integrate._odepack.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.integrate._odepack.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.integrate._quadpack.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.integrate._quadpack.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.integrate._quadpack.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.integrate._quadpack.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.integrate.lsoda.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.integrate.lsoda.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.integrate.lsoda.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.integrate.lsoda.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.integrate.vode.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.integrate.vode.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.integrate.vode.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.integrate.vode.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.interpolate._bspl.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.interpolate._bspl.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.interpolate._bspl.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.interpolate._bspl.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.interpolate._fitpack.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.interpolate._fitpack.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.interpolate._fitpack.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.interpolate._fitpack.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.interpolate._ppoly.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.interpolate._ppoly.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.interpolate._ppoly.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.interpolate._ppoly.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.interpolate.dfitpack.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.interpolate.dfitpack.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.interpolate.dfitpack.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.interpolate.dfitpack.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.interpolate.interpnd.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.interpolate.interpnd.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.interpolate.interpnd.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.interpolate.interpnd.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.linalg._cblas.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.linalg._cblas.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.linalg._cblas.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.linalg._cblas.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.linalg._clapack.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.linalg._clapack.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.linalg._clapack.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.linalg._clapack.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.linalg._decomp_update.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.linalg._decomp_update.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.linalg._decomp_update.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.linalg._decomp_update.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.linalg._fblas.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.linalg._fblas.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.linalg._fblas.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.linalg._fblas.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.linalg._flapack.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.linalg._flapack.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.linalg._flapack.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.linalg._flapack.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.linalg._flinalg.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.linalg._flinalg.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.linalg._flinalg.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.linalg._flinalg.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.linalg._solve_toeplitz.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.linalg._solve_toeplitz.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.linalg._solve_toeplitz.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.linalg._solve_toeplitz.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.linalg.cython_blas.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.linalg.cython_blas.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.linalg.cython_blas.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.linalg.cython_blas.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.linalg.cython_lapack.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.linalg.cython_lapack.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.linalg.cython_lapack.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.linalg.cython_lapack.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.ndimage._nd_image.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.ndimage._nd_image.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.ndimage._nd_image.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.ndimage._nd_image.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.ndimage._ni_label.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.ndimage._ni_label.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.ndimage._ni_label.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.ndimage._ni_label.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.optimize._cobyla.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.optimize._cobyla.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.optimize._cobyla.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.optimize._cobyla.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.optimize._group_columns.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.optimize._group_columns.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.optimize._group_columns.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.optimize._group_columns.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.optimize._lbfgsb.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.optimize._lbfgsb.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.optimize._lbfgsb.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.optimize._lbfgsb.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.optimize._lsq.givens_elimination.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.optimize._lsq.givens_elimination.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.optimize._lsq.givens_elimination.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.optimize._lsq.givens_elimination.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.optimize._minpack.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.optimize._minpack.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.optimize._minpack.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.optimize._minpack.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.optimize._nnls.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.optimize._nnls.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.optimize._nnls.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.optimize._nnls.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.optimize._slsqp.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.optimize._slsqp.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.optimize._slsqp.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.optimize._slsqp.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.optimize._trlib._trlib.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.optimize._trlib._trlib.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.optimize._trlib._trlib.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.optimize._trlib._trlib.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.optimize._zeros.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.optimize._zeros.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.optimize._zeros.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.optimize._zeros.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.optimize.minpack2.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.optimize.minpack2.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.optimize.minpack2.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.optimize.minpack2.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.optimize.moduleTNC.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.optimize.moduleTNC.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.optimize.moduleTNC.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.optimize.moduleTNC.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.sparse._csparsetools.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.sparse._csparsetools.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.sparse._csparsetools.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.sparse._csparsetools.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.sparse._sparsetools.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.sparse._sparsetools.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.sparse._sparsetools.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.sparse._sparsetools.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.sparse.csgraph._min_spanning_tree.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.sparse.csgraph._min_spanning_tree.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.sparse.csgraph._min_spanning_tree.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.sparse.csgraph._min_spanning_tree.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.sparse.csgraph._reordering.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.sparse.csgraph._reordering.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.sparse.csgraph._reordering.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.sparse.csgraph._reordering.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.sparse.csgraph._shortest_path.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.sparse.csgraph._shortest_path.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.sparse.csgraph._shortest_path.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.sparse.csgraph._shortest_path.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.sparse.csgraph._tools.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.sparse.csgraph._tools.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.sparse.csgraph._tools.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.sparse.csgraph._tools.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.sparse.csgraph._traversal.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.sparse.csgraph._traversal.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.sparse.csgraph._traversal.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.sparse.csgraph._traversal.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.sparse.linalg.dsolve._superlu.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.sparse.linalg.dsolve._superlu.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.sparse.linalg.dsolve._superlu.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.sparse.linalg.dsolve._superlu.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.sparse.linalg.eigen.arpack._arpack.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.sparse.linalg.eigen.arpack._arpack.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.sparse.linalg.eigen.arpack._arpack.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.sparse.linalg.eigen.arpack._arpack.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.sparse.linalg.isolve._iterative.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.sparse.linalg.isolve._iterative.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.sparse.linalg.isolve._iterative.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.sparse.linalg.isolve._iterative.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.spatial._distance_wrap.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.spatial._distance_wrap.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.spatial._distance_wrap.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.spatial._distance_wrap.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.spatial._hausdorff.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.spatial._hausdorff.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.spatial._hausdorff.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.spatial._hausdorff.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.spatial._voronoi.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.spatial._voronoi.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.spatial._voronoi.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.spatial._voronoi.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.spatial.ckdtree.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.spatial.ckdtree.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.spatial.ckdtree.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.spatial.ckdtree.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.spatial.qhull.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.spatial.qhull.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.spatial.qhull.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.spatial.qhull.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.special._comb.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.special._comb.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.special._comb.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.special._comb.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.special._ellip_harm_2.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.special._ellip_harm_2.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.special._ellip_harm_2.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.special._ellip_harm_2.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.special._ufuncs.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.special._ufuncs.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.special._ufuncs.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.special._ufuncs.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.special._ufuncs_cxx.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.special._ufuncs_cxx.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.special._ufuncs_cxx.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.special._ufuncs_cxx.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.special.specfun.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.special.specfun.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.special.specfun.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.special.specfun.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.stats._stats.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.stats._stats.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.stats._stats.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.stats._stats.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.stats.mvn.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.stats.mvn.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.stats.mvn.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.stats.mvn.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.stats.statlib.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.stats.statlib.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/scipy.stats.statlib.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/scipy.stats.statlib.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/tensorflow.python.framework.fast_tensor_util.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/tensorflow.python.framework.fast_tensor_util.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/tensorflow.python.framework.fast_tensor_util.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/tensorflow.python.framework.fast_tensor_util.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/termios.so b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/termios.so similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine/termios.so rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine/termios.so diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine_0.2.0_armv7l.tar.gz b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine_0.2.0_armv7l.tar.gz similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft/precise/precise-engine_0.2.0_armv7l.tar.gz rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft/precise/precise-engine_0.2.0_armv7l.tar.gz diff --git a/buildroot-external/rootfs-overlay/root/.mycroft_cli.conf b/buildroot-external/rootfs-overlay/home/mycroft/.mycroft_cli.conf similarity index 100% rename from buildroot-external/rootfs-overlay/root/.mycroft_cli.conf rename to buildroot-external/rootfs-overlay/home/mycroft/.mycroft_cli.conf diff --git a/buildroot-external/rootfs-overlay/home/mycroft/.profile b/buildroot-external/rootfs-overlay/home/mycroft/.profile new file mode 100644 index 00000000..49c25bda --- /dev/null +++ b/buildroot-external/rootfs-overlay/home/mycroft/.profile @@ -0,0 +1,6 @@ +if [ -n "$BASH_VERSION" ]; then + # include .bashrc if it exists + if [ -f "$HOME/.bashrc" ]; then + . "$HOME/.bashrc" + fi +fi diff --git a/buildroot-external/rootfs-overlay/home/mycroft/cli_login.sh b/buildroot-external/rootfs-overlay/home/mycroft/cli_login.sh new file mode 100644 index 00000000..45deaa77 --- /dev/null +++ b/buildroot-external/rootfs-overlay/home/mycroft/cli_login.sh @@ -0,0 +1,20 @@ +#!/bin/bash +echo -e "\e[36m" +echo " ███╗ ███╗██╗ ██╗ ██████╗██████╗ ██████╗ ███████╗████████╗" +echo " ████╗ ████║╚██╗ ██╔╝██╔════╝██╔══██╗██╔═══██╗██╔════╝╚══██╔══╝" +echo " ██╔████╔██║ ╚████╔╝ ██║ ██████╔╝██║ ██║█████╗ ██║ " +echo " ██║╚██╔╝██║ ╚██╔╝ ██║ ██╔══██╗██║ ██║██╔══╝ ██║ " +echo " ██║ ╚═╝ ██║ ██║ ╚██████╗██║ ██║╚██████╔╝██║ ██║ " +echo " ╚═╝ ╚═╝ ╚═╝ ╚═════╝╚═╝ ╚═╝ ╚═════╝ ╚═╝ ╚═╝ " +echo -e "\e[0m" +echo +echo "***************************************************************" +echo "** **" +echo "** MycroftOS Version 0.1.0 **" +echo "** **" +echo "***************************************************************" +echo +echo "Welcome to MycroftOS, you can start the mycroft CLI by; " +echo +echo "mycroft-cli-client" + diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/preloaded_cache/Mimic2/.empty b/buildroot-external/rootfs-overlay/opt/mycroft/preloaded_cache/Mimic2/.empty new file mode 100644 index 00000000..e69de29b diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/.gitignore b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/.gitignore new file mode 100644 index 00000000..03fd10e9 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/.gitignore @@ -0,0 +1,7 @@ +settings.json + +# python compiled files +*.pyc + +# Vim temp files +.*.sw? diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/LICENSE b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/LICENSE new file mode 100644 index 00000000..7a4a3ea2 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/README.md b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/README.md new file mode 100644 index 00000000..f86c099b --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/README.md @@ -0,0 +1,25 @@ +# Volume Control +Control the volume of your system + +## About +Control the volume of Mycroft with verbal commands or by spinning the physical +button on a Mark 1. + +## Examples +* "Turn up the volume" +* "Decrease the audio" +* "Mute audio" +* "Set volume to 5" +* "Set volume to 75 percent" + +## Credits +Mycroft AI (@MycroftAI) + +## Category +**Configuration** + +## Tags +#volume +#volume-control +#sound +#system diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/__init__.py b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/__init__.py new file mode 100644 index 00000000..97f6c217 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/__init__.py @@ -0,0 +1,399 @@ +# Copyright 2017 Mycroft AI Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +from alsaaudio import Mixer, mixers as alsa_mixers +from os.path import dirname, join + +from adapt.intent import IntentBuilder +from mycroft.audio import wait_while_speaking +from mycroft.messagebus.message import Message +from mycroft.skills.core import MycroftSkill, intent_handler +from mycroft.util import play_wav +from mycroft.util.parse import extract_number + + +ALSA_PLATFORMS = ['MycroftOS', 'mycroft_mark_1', 'picroft', 'unknown'] + + +class VolumeSkill(MycroftSkill): + """ + Control the audio volume for the Mycroft system + + Terminology: + "Level" = Mycroft volume levels, from 0 to 10 + "Volume" = ALSA mixer setting, from 0 to 100 + """ + + MIN_LEVEL = 0 + MAX_LEVEL = 10 + + # TODO: Translation layer (have to match word in Level.voc) + VOLUME_WORDS = { + 'loud': 9, + 'normal': 6, + 'quiet': 3 + } + + def __init__(self): + super(VolumeSkill, self).__init__("VolumeSkill") + self.settings["default_level"] = 6 # can be 0 (off) to 10 (max) + self.settings["min_volume"] = 0 # can be 0 to 100 + if self.config_core['enclosure'].get('platform') == 'mycroft_mark_1': + self.settings["max_volume"] = 83 # can be 0 to 83 + else: + self.settings["max_volume"] = 100 # can be 0 to 100 + self.volume_sound = join(dirname(__file__), "blop-mark-diangelo.wav") + self.vol_before_mute = None + self._mixer = None + + def _clear_mixer(self): + """For Unknown platforms reinstantiate the mixer. + + For mycroft_mark_1 do not reinstantiate the mixer. + """ + platform = self.config_core['enclosure'].get('platform', 'unknown') + if platform != 'mycroft_mark_1': + self._mixer = None + + def _get_mixer(self): + self.log.debug('Finding Alsa Mixer for control...') + mixer = None + try: + # If there are only 1 mixer use that one + mixers = alsa_mixers() + if len(mixers) == 1: + mixer = Mixer(mixers[0]) + elif 'Master' in mixers: + # Try using the default mixer (Master) + mixer = Mixer('Master') + elif 'PCM' in mixers: + # PCM is another common one + mixer = Mixer('PCM') + elif 'Digital' in mixers: + # My mixer is called 'Digital' (JustBoom DAC) + mixer = Mixer('Digital') + else: + # should be equivalent to 'Master' + mixer = Mixer() + except Exception: + # Retry instanciating the mixer with the built-in default + try: + mixer = Mixer() + except Exception as e: + self.log.error('Couldn\'t allocate mixer, {}'.format(repr(e))) + self._mixer = mixer + return mixer + + def initialize(self): + # Register handlers to detect percentages as reported by STT + for i in range(101): # numbers 0 to 100 + self.register_vocabulary(str(i) + '%', 'Percent') + + # Register handlers for messagebus events + self.add_event('mycroft.volume.increase', + self.handle_increase_volume) + self.add_event('mycroft.volume.decrease', + self.handle_decrease_volume) + self.add_event('mycroft.volume.mute', + self.handle_mute_volume) + self.add_event('mycroft.volume.unmute', + self.handle_unmute_volume) + self.add_event('recognizer_loop:record_begin', + self.duck) + self.add_event('recognizer_loop:record_end', + self.unduck) + + self.vol_before_mute = self.__get_system_volume() + + @property + def mixer(self): + platform = self.config_core['enclosure'].get('platform', 'unknown') + if platform in ALSA_PLATFORMS: + return self._mixer or self._get_mixer() + else: + return None + + def _setvolume(self, vol, emit=True): + # Update ALSA + if self.mixer: + self.log.debug(vol) + self.mixer.setvolume(vol) + # TODO: Remove this and control volume at the Enclosure level in + # response to the mycroft.volume.set message. + + if emit: + # Notify non-ALSA systems of volume change + self.bus.emit(Message('mycroft.volume.set', + data={"percent": vol/100.0})) + + # Change Volume to X (Number 0 to) Intent Handlers + @intent_handler(IntentBuilder("SetVolume").require("Volume") + .optionally("Increase").optionally("Decrease") + .optionally("To").require("Level")) + def handle_set_volume(self, message): + self._clear_mixer() + default_vol = self.__get_system_volume(50) + + level = self.__get_volume_level(message, default_vol) + self._setvolume(self.__level_to_volume(level)) + if level == self.MAX_LEVEL: + self.speak_dialog('max.volume') + else: + self.speak_dialog('set.volume', data={'volume': level}) + + # Set Volume Percent Intent Handlers + @intent_handler(IntentBuilder("SetVolumePercent").require("Volume") + .optionally("Increase").optionally("Decrease") + .optionally("To").require("Percent")) + def handle_set_volume_percent(self, message): + self._clear_mixer() + percent = extract_number(message.data['utterance'].replace('%', '')) + percent = int(percent) + self._setvolume(percent) + self.speak_dialog('set.volume.percent', data={'level': percent}) + + # Volume Status Intent Handlers + @intent_handler(IntentBuilder("QueryVolume").optionally("Query") + .require("Volume")) + def handle_query_volume(self, message): + self._clear_mixer() + level = self.__volume_to_level(self.__get_system_volume(0, show=True)) + self.speak_dialog('volume.is', data={'volume': round(level)}) + + @intent_handler(IntentBuilder("QueryVolumePhrase").require("QueryPhrase") + .optionally("Volume")) + def handle_query_volume_phrase(self, message): + self.handle_query_volume(message) + + def __communicate_volume_change(self, message, dialog, code, changed): + play_sound = message.data.get('play_sound', False) + if play_sound: + if changed: + play_wav(self.volume_sound) + else: + if (not changed) and (code != 0): + self.speak_dialog('already.max.volume', data={'volume': code}) + + # Increase Volume Intent Handlers + @intent_handler(IntentBuilder("IncreaseVolume").require("Volume") + .require("Increase")) + def handle_increase_volume(self, message): + self.__communicate_volume_change(message, 'increase.volume', + *self.__update_volume(+1)) + + @intent_handler(IntentBuilder("IncreaseVolumeSet").require("Set") + .optionally("Volume").require("Increase")) + def handle_increase_volume_set(self, message): + self._clear_mixer() + self.handle_increase_volume(message) + + @intent_handler(IntentBuilder("IncreaseVolumePhrase") + .require("IncreasePhrase")) + def handle_increase_volume_phrase(self, message): + self._clear_mixer() + self.handle_increase_volume(message) + + # Decrease Volume Intent Handlers + @intent_handler(IntentBuilder("DecreaseVolume").require("Volume") + .require("Decrease")) + def handle_decrease_volume(self, message): + self.__communicate_volume_change(message, 'decrease.volume', + *self.__update_volume(-1)) + + @intent_handler(IntentBuilder("DecreaseVolumeSet").require("Set") + .optionally("Volume").require("Decrease")) + def handle_decrease_volume_set(self, message): + self.handle_decrease_volume(message) + + @intent_handler(IntentBuilder("DecreaseVolumePhrase") + .require("DecreasePhrase")) + def handle_decrease_volume_phrase(self, message): + self.handle_decrease_volume(message) + + # Maximum Volume Intent Handlers + @intent_handler(IntentBuilder("MaxVolume").optionally("Set") + .require("Volume").optionally("Increase") + .require("MaxVolume")) + def handle_max_volume(self, message): + self._clear_mixer() + self._setvolume(self.settings["max_volume"]) + speak_message = message.data.get('speak_message', True) + if speak_message: + self.speak_dialog('max.volume') + wait_while_speaking() + self.bus.emit(Message('mycroft.volume.duck')) + + @intent_handler(IntentBuilder("MaxVolumeIncreaseMax") + .require("MaxVolumePhrase").optionally("Volume") + .require("Increase").optionally("MaxVolume")) + def handle_max_volume_increase_to_max(self, message): + self.handle_max_volume(message) + + def duck(self, message): + self._clear_mixer() + if self.settings.get('ducking', True): + self._mute_volume() + + def unduck(self, message): + self._clear_mixer() + if self.settings.get('ducking', True): + self._unmute_volume() + + def _mute_volume(self, message=None, speak=False): + self.log.debug('MUTING!') + self.vol_before_mute = self.__get_system_volume() + self.log.debug(self.vol_before_mute) + if speak: + self.speak_dialog('mute.volume') + wait_while_speaking() + self._setvolume(0, emit=False) + self.bus.emit(Message('mycroft.volume.duck')) + + # Mute Volume Intent Handlers + @intent_handler(IntentBuilder("MuteVolume").require( + "Volume").require("Mute")) + def handle_mute_volume(self, message): + self._clear_mixer() + self._mute_volume(speak=message.data.get('speak_message', True)) + + def _unmute_volume(self, message=None, speak=False): + if self.vol_before_mute is None: + vol = self.__level_to_volume(self.settings["default_level"]) + else: + vol = self.vol_before_mute + self.vol_before_mute = None + + self._setvolume(vol, emit=False) + self.bus.emit(Message('mycroft.volume.unduck')) + + if speak: + self.speak_dialog('reset.volume', + data={'volume': + self.settings["default_level"]}) + + # Unmute/Reset Volume Intent Handlers + @intent_handler(IntentBuilder("UnmuteVolume").require("Volume") + .require("Unmute")) + def handle_unmute_volume(self, message): + self._clear_mixer() + self._unmute_volume(speak=message.data.get('speak_message', True)) + + def __volume_to_level(self, volume): + """ + Convert a 'volume' to a 'level' + + Args: + volume (int): min_volume..max_volume + Returns: + int: the equivalent level + """ + range = self.MAX_LEVEL - self.MIN_LEVEL + min_vol = self.settings["min_volume"] + max_vol = self.settings["max_volume"] + prop = float(volume - min_vol) / max_vol + level = int(round(self.MIN_LEVEL + range * prop)) + if level > self.MAX_LEVEL: + level = self.MAX_LEVEL + elif level < self.MIN_LEVEL: + level = self.MIN_LEVEL + return level + + def __level_to_volume(self, level): + """ + Convert a 'level' to a 'volume' + + Args: + level (int): 0..MAX_LEVEL + Returns: + int: the equivalent volume + """ + range = self.settings["max_volume"] - self.settings["min_volume"] + prop = float(level) / self.MAX_LEVEL + volume = int(round(self.settings["min_volume"] + int(range) * prop)) + + return volume + + @staticmethod + def __bound_level(level): + if level > VolumeSkill.MAX_LEVEL: + level = VolumeSkill.MAX_LEVEL + elif level < VolumeSkill.MIN_LEVEL: + level = VolumeSkill.MIN_LEVEL + return level + + def __update_volume(self, change=0): + """ + Attempt to change audio level + + Args: + change (int): +1 or -1; the step to change by + + Returns: tuple(new level code int(0..10), + whether level changed (bool)) + """ + old_level = self.__volume_to_level(self.__get_system_volume(0)) + new_level = self.__bound_level(old_level + change) + self.enclosure.eyes_volume(new_level) + self._setvolume(self.__level_to_volume(new_level)) + return new_level, new_level != old_level + + def __get_system_volume(self, default=50, show=False): + """ Get volume, either from mixer or ask on messagebus. + + The show parameter should only be True when a user is requesting + the volume and not the system. + TODO: Remove usage of Mixer and move that stuff to enclosure. + """ + vol = default + if self.mixer: + vol = min(self.mixer.getvolume()[0], 100) + self.log.debug('Volume before mute: {}'.format(vol)) + else: + vol_msg = self.bus.wait_for_response( + Message("mycroft.volume.get", {'show': show})) + if vol_msg: + vol = int(vol_msg.data["percent"] * 100) + + return vol + + def __get_volume_level(self, message, default=None): + """ Retrievs volume from message. """ + level_str = message.data.get('Level', default) + level = self.settings["default_level"] + + try: + level = self.VOLUME_WORDS[level_str] + except KeyError: + try: + level = int(extract_number(level_str)) + if (level == self.MAX_LEVEL + 1): + # Assume that user meant max volume + level = self.MAX_LEVEL + elif (level > self.MAX_LEVEL): + # Guess that the user said something like 100 percent + # so convert that into a level value + level = self.MAX_LEVEL * level/100 + except ValueError: + pass + + level = self.__bound_level(level) + return level + + def shutdown(self): + if self.vol_before_mute is not None: + self._unmute_volume() + + +def create_skill(): + return VolumeSkill() diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/blop-mark-diangelo.wav b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/blop-mark-diangelo.wav new file mode 100644 index 00000000..49b046f1 Binary files /dev/null and b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/blop-mark-diangelo.wav differ diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/da-dk/already.max.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/da-dk/already.max.volume.dialog new file mode 100644 index 00000000..2de2e7e1 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/da-dk/already.max.volume.dialog @@ -0,0 +1,2 @@ +Lydstyrken er allerede på maximum +Jeg kan ikke blive højere diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/da-dk/decrease.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/da-dk/decrease.volume.dialog new file mode 100644 index 00000000..0108f4af --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/da-dk/decrease.volume.dialog @@ -0,0 +1,3 @@ +Volume resuceret to {{volume}} +Volume mindsket til {{volume}} +Volume er nu {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/da-dk/increase.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/da-dk/increase.volume.dialog new file mode 100644 index 00000000..3aa33ae5 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/da-dk/increase.volume.dialog @@ -0,0 +1,2 @@ +Volume er nu {{volume}} +Lydstyrke forøget til {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/da-dk/mute.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/da-dk/mute.volume.dialog new file mode 100644 index 00000000..fdb4270a --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/da-dk/mute.volume.dialog @@ -0,0 +1,2 @@ +Audio bliver muted +Lyd bliver muted diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/da-dk/reset.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/da-dk/reset.volume.dialog new file mode 100644 index 00000000..1cab0851 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/da-dk/reset.volume.dialog @@ -0,0 +1,2 @@ +Lydstyrke nulstillet til {{volume} +Lydstyrke nulstillet til {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/da-dk/set.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/da-dk/set.volume.dialog new file mode 100644 index 00000000..6cda7090 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/da-dk/set.volume.dialog @@ -0,0 +1,3 @@ +Lydstyrke stillet til {{volume}} +Lydstyrke indstillet til {{volume}} +Lydstyrken ændret til {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/da-dk/set.volume.percent.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/da-dk/set.volume.percent.dialog new file mode 100644 index 00000000..e6dd2b75 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/da-dk/set.volume.percent.dialog @@ -0,0 +1,3 @@ +Lydstyrken er sat til {{level}} procent +Lydstyrkem er opdateret til {{level}} procent +Lydstyrken er ændret til {{evel}} percent diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/da-dk/volume.is.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/da-dk/volume.is.dialog new file mode 100644 index 00000000..1775b3ef --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/da-dk/volume.is.dialog @@ -0,0 +1,2 @@ +Lydstyrken er sat til {{volume}} +Lydstyrken er {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/de-de/already.max.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/de-de/already.max.volume.dialog new file mode 100644 index 00000000..7da0a847 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/de-de/already.max.volume.dialog @@ -0,0 +1,2 @@ +Die Lautstärke ist bereits auf Maximum +Ich kann nicht lauter werden diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/de-de/decrease.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/de-de/decrease.volume.dialog new file mode 100644 index 00000000..9c573188 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/de-de/decrease.volume.dialog @@ -0,0 +1,3 @@ +Lautstärke auf {{volume}} reduziert +Lautstärke auf {{volume}} reduziert +Lautstärke ist jetzt {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/de-de/increase.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/de-de/increase.volume.dialog new file mode 100644 index 00000000..a7377307 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/de-de/increase.volume.dialog @@ -0,0 +1,2 @@ +Lautstärke ist jetzt {{volume}} +Lautstärke auf {{volume}} erhöht diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/de-de/max.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/de-de/max.volume.dialog new file mode 100644 index 00000000..be55fadd --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/de-de/max.volume.dialog @@ -0,0 +1,3 @@ +Lautstärke auf maximum eingestellt +Lautstärke auf Maximum gesetzt +Lautstärke auf maximum geändert diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/de-de/mute.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/de-de/mute.volume.dialog new file mode 100644 index 00000000..d917107e --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/de-de/mute.volume.dialog @@ -0,0 +1,2 @@ +Audio wird gedämpft +Der Ton wird gedämpft diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/de-de/reset.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/de-de/reset.volume.dialog new file mode 100644 index 00000000..02747bb9 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/de-de/reset.volume.dialog @@ -0,0 +1,2 @@ +Lautstärke auf {{volume}} zurückgesetzt +Lautstärke auf {{volume}} wiederhergestellt diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/de-de/set.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/de-de/set.volume.dialog new file mode 100644 index 00000000..ce42a2cc --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/de-de/set.volume.dialog @@ -0,0 +1,3 @@ +Lautstärke auf {{volume}} eingestellt +Lautstärke auf {{volume}} aktualisiert +Lautstärke auf {{volume}} geändert diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/de-de/set.volume.percent.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/de-de/set.volume.percent.dialog new file mode 100644 index 00000000..e98d3210 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/de-de/set.volume.percent.dialog @@ -0,0 +1,3 @@ +Lautstärke gesetzt auf {{level}} Prozent +Lautstärke aktualisiert auf {{level}} Prozent +Lautstärke auf {{level}} Prozent geändert diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/de-de/volume.is.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/de-de/volume.is.dialog new file mode 100644 index 00000000..4f198e53 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/de-de/volume.is.dialog @@ -0,0 +1,2 @@ +Die Lautstärke ist auf {{volume}} gesetzt +Die Lautstärke ist bei {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/en-us/already.max.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/en-us/already.max.volume.dialog new file mode 100644 index 00000000..51975981 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/en-us/already.max.volume.dialog @@ -0,0 +1,2 @@ +Volume is already at maximum +I can't get any louder diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/en-us/decrease.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/en-us/decrease.volume.dialog new file mode 100644 index 00000000..9a0e6614 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/en-us/decrease.volume.dialog @@ -0,0 +1,3 @@ +Volume reduced to {{volume}} +Volume decreased to {{volume}} +Volume is now {{volume}} \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/en-us/increase.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/en-us/increase.volume.dialog new file mode 100644 index 00000000..b2996a19 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/en-us/increase.volume.dialog @@ -0,0 +1,2 @@ +Volume is now {{volume}} +Volume increased to {{volume}} \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/en-us/max.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/en-us/max.volume.dialog new file mode 100644 index 00000000..43bd30dd --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/en-us/max.volume.dialog @@ -0,0 +1,3 @@ +Volume set to maximum level +Volume updated to maximum level +Volume changed to maximum level \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/en-us/mute.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/en-us/mute.volume.dialog new file mode 100644 index 00000000..8fab7ada --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/en-us/mute.volume.dialog @@ -0,0 +1,2 @@ +Audio is going to be muted +Sound is going to be muted \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/en-us/reset.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/en-us/reset.volume.dialog new file mode 100644 index 00000000..9e085062 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/en-us/reset.volume.dialog @@ -0,0 +1,2 @@ +Volume reset to {{volume}} +Volume restored to {{volume}} \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/en-us/set.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/en-us/set.volume.dialog new file mode 100644 index 00000000..570765d4 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/en-us/set.volume.dialog @@ -0,0 +1,3 @@ +Volume set to {{volume}} +Volume updated to {{volume}} +Volume changed to {{volume}} \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/en-us/set.volume.percent.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/en-us/set.volume.percent.dialog new file mode 100644 index 00000000..fed269f0 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/en-us/set.volume.percent.dialog @@ -0,0 +1,3 @@ +Volume set to {{level}} percent +Volume updated to {{level}} percent +Volume changed to {{level}} percent diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/en-us/volume.is.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/en-us/volume.is.dialog new file mode 100644 index 00000000..e859102c --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/en-us/volume.is.dialog @@ -0,0 +1,2 @@ +The volume is set to {{volume}} +The volume is at {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/es-es/already.max.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/es-es/already.max.volume.dialog new file mode 100644 index 00000000..72cdd91d --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/es-es/already.max.volume.dialog @@ -0,0 +1,2 @@ +El volumen ya está al máximo +No se puede poner más fuerte diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/es-es/decrease.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/es-es/decrease.volume.dialog new file mode 100644 index 00000000..16db6d89 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/es-es/decrease.volume.dialog @@ -0,0 +1,3 @@ +Volumen reducido a {{volume}} +Volumen bajado a {{volume}} +El volumen está al {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/es-es/increase.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/es-es/increase.volume.dialog new file mode 100644 index 00000000..caaacc01 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/es-es/increase.volume.dialog @@ -0,0 +1,2 @@ +El volumen está al {{volume}} +Volumen subido al {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/es-es/max.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/es-es/max.volume.dialog new file mode 100644 index 00000000..33b5b151 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/es-es/max.volume.dialog @@ -0,0 +1,3 @@ +Volumen a máximo nivel +Volumen actualizado a máximo nivel +Volumen cambiado a máximo nivel diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/es-es/mute.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/es-es/mute.volume.dialog new file mode 100644 index 00000000..3713821e --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/es-es/mute.volume.dialog @@ -0,0 +1,2 @@ +El audio se silenciará +El sonido se silenciará diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/es-es/reset.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/es-es/reset.volume.dialog new file mode 100644 index 00000000..6a429933 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/es-es/reset.volume.dialog @@ -0,0 +1,2 @@ +El volumen se volverá a poner al {{volume}} +El volumen restaurado al {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/es-es/set.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/es-es/set.volume.dialog new file mode 100644 index 00000000..48eb9b89 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/es-es/set.volume.dialog @@ -0,0 +1,3 @@ +Volumen puesto al {{volume}} +Volumen actualizado al {{volume}} +Volumen cambiado al {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/es-es/set.volume.percent.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/es-es/set.volume.percent.dialog new file mode 100644 index 00000000..063d0ed0 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/es-es/set.volume.percent.dialog @@ -0,0 +1,3 @@ +Volumen establecido al {{level}} por ciento +Volumen actualizado al {{level}} por ciento +Volumen cambiado al {{level}} por ciento diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/es-es/volume.is.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/es-es/volume.is.dialog new file mode 100644 index 00000000..6fb0baa6 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/es-es/volume.is.dialog @@ -0,0 +1,2 @@ +El volumen está establecido al {{volume}} +El volumen está al {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/fr-fr/already.max.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/fr-fr/already.max.volume.dialog new file mode 100644 index 00000000..5c05d915 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/fr-fr/already.max.volume.dialog @@ -0,0 +1,2 @@ +Le volume est déjà au maximum +Je ne peux pas être plus fort diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/fr-fr/decrease.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/fr-fr/decrease.volume.dialog new file mode 100644 index 00000000..0858825a --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/fr-fr/decrease.volume.dialog @@ -0,0 +1,3 @@ +Le volume a été réduit à {{volume}} +Le volume a été baissé à {{volume}} +Le volume est maintenant à {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/fr-fr/increase.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/fr-fr/increase.volume.dialog new file mode 100644 index 00000000..ca68e4a7 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/fr-fr/increase.volume.dialog @@ -0,0 +1,2 @@ +Le volume est maintenant à {{volume}} +Le volume a été augmenté à {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/fr-fr/mute.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/fr-fr/mute.volume.dialog new file mode 100644 index 00000000..d87ccfb2 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/fr-fr/mute.volume.dialog @@ -0,0 +1,2 @@ +L'audio va être mis en muet +Le son va être mis en muet diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/fr-fr/reset.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/fr-fr/reset.volume.dialog new file mode 100644 index 00000000..c3028f40 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/fr-fr/reset.volume.dialog @@ -0,0 +1,2 @@ +Volume réinitialisé à {{volume}} +Volume restauré à {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/fr-fr/set.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/fr-fr/set.volume.dialog new file mode 100644 index 00000000..11fb8469 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/fr-fr/set.volume.dialog @@ -0,0 +1,3 @@ +Volume définit à {{volume}} +Volume mis à jour à {{volume}} +Volume changé à {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/fr-fr/volume.is.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/fr-fr/volume.is.dialog new file mode 100644 index 00000000..b9cf0f40 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/fr-fr/volume.is.dialog @@ -0,0 +1,2 @@ +Le volume a été définit à {{volume}} +Le volume est à {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/hu-hu/already.max.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/hu-hu/already.max.volume.dialog new file mode 100644 index 00000000..5ce10afe --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/hu-hu/already.max.volume.dialog @@ -0,0 +1,2 @@ +A hangerő már maximumon van +Hangosabbra nem megy diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/hu-hu/decrease.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/hu-hu/decrease.volume.dialog new file mode 100644 index 00000000..7964a315 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/hu-hu/decrease.volume.dialog @@ -0,0 +1,3 @@ +A hangerő csökkentve. Új szint: {{volume}} +A hangerő lecsökkent a következő szintre: {{volume}} +A hangerő új szintje: {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/hu-hu/increase.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/hu-hu/increase.volume.dialog new file mode 100644 index 00000000..c3766a76 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/hu-hu/increase.volume.dialog @@ -0,0 +1,2 @@ +A hangerő új szintje: {{volume}} +A hangerő megnövelve. Új szint: {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/hu-hu/mute.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/hu-hu/mute.volume.dialog new file mode 100644 index 00000000..0a1003a5 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/hu-hu/mute.volume.dialog @@ -0,0 +1,2 @@ +A hang elnémul +A hang elnémítva diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/hu-hu/reset.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/hu-hu/reset.volume.dialog new file mode 100644 index 00000000..f5e3cb7d --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/hu-hu/reset.volume.dialog @@ -0,0 +1,2 @@ +A hangerő visszaállítva, értéke: {{volume}} +A hangerőt visszaállítottam, az új szint: {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/hu-hu/set.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/hu-hu/set.volume.dialog new file mode 100644 index 00000000..bbd80fb1 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/hu-hu/set.volume.dialog @@ -0,0 +1,3 @@ +A hangerő beállítva a következő szintre: {{volume}} +A hangerő megváltozott. Új értéke: {{volume}} +A hangerő új értéke a következő: {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/hu-hu/volume.is.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/hu-hu/volume.is.dialog new file mode 100644 index 00000000..5a1cb87e --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/hu-hu/volume.is.dialog @@ -0,0 +1,2 @@ +A hangerő szintje: {{volume}} +A hangerő értéke {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/it-it/already.max.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/it-it/already.max.volume.dialog new file mode 100644 index 00000000..cd6156ee --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/it-it/already.max.volume.dialog @@ -0,0 +1,2 @@ +Il volume è già al massimo +Non posso aumentare di più il volume diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/it-it/decrease.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/it-it/decrease.volume.dialog new file mode 100644 index 00000000..98f0edde --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/it-it/decrease.volume.dialog @@ -0,0 +1,3 @@ +Volume ridotto a {{volume}} +Volume diminuito a {{volume}} +Il volume adesso è {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/it-it/increase.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/it-it/increase.volume.dialog new file mode 100644 index 00000000..6f7a92ff --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/it-it/increase.volume.dialog @@ -0,0 +1,2 @@ +Il volume adesso è {{volume}} +Volume aumentato a {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/it-it/max.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/it-it/max.volume.dialog new file mode 100644 index 00000000..a14760ee --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/it-it/max.volume.dialog @@ -0,0 +1,3 @@ +Volume impostato a livello massimo +Volume aggiornato al massimo livello +Volume cambiato su livello massimo diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/it-it/mute.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/it-it/mute.volume.dialog new file mode 100644 index 00000000..09e9197e --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/it-it/mute.volume.dialog @@ -0,0 +1,2 @@ +L'audio sta per essere disattivato +Il suono sta per essere disattivato diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/it-it/reset.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/it-it/reset.volume.dialog new file mode 100644 index 00000000..93b4ccc1 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/it-it/reset.volume.dialog @@ -0,0 +1,2 @@ +Volume reimpostato a {{volume}} +Volume ripristinato a {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/it-it/set.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/it-it/set.volume.dialog new file mode 100644 index 00000000..a578a993 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/it-it/set.volume.dialog @@ -0,0 +1,3 @@ +Volume impostato a {{volume}} +Volume aggiornato a {{volume}} +Volume modificato a {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/it-it/set.volume.percent.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/it-it/set.volume.percent.dialog new file mode 100644 index 00000000..0951dbd9 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/it-it/set.volume.percent.dialog @@ -0,0 +1,3 @@ +Volume impostato a {{level}} percento +Volume aggiornato al {{level}} percento +Volume modificato al {{level}} percento diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/it-it/volume.is.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/it-it/volume.is.dialog new file mode 100644 index 00000000..cfa66888 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/it-it/volume.is.dialog @@ -0,0 +1,2 @@ +Il volume è impostato a {{volume}} +Il volume è a {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/nl-nl/already.max.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/nl-nl/already.max.volume.dialog new file mode 100644 index 00000000..4ff93190 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/nl-nl/already.max.volume.dialog @@ -0,0 +1,2 @@ +Het geluidsniveau is al op maximum +Ik kan niet harder diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/nl-nl/decrease.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/nl-nl/decrease.volume.dialog new file mode 100644 index 00000000..f5d6c52a --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/nl-nl/decrease.volume.dialog @@ -0,0 +1,3 @@ +Geluidsniveau verlaagd naar {{volume}} +Geluidsniveau afgenomen tot {{volume}} +Geluidsniveau is nu {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/nl-nl/increase.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/nl-nl/increase.volume.dialog new file mode 100644 index 00000000..c58a84e5 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/nl-nl/increase.volume.dialog @@ -0,0 +1,2 @@ +Geluidsniveau is nu {{volume}} +Geluidsniveau toegenomen tot {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/nl-nl/mute.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/nl-nl/mute.volume.dialog new file mode 100644 index 00000000..3bfa6631 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/nl-nl/mute.volume.dialog @@ -0,0 +1,2 @@ +Audio zal worden gedempt +Geluid zal worden gedempt diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/nl-nl/reset.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/nl-nl/reset.volume.dialog new file mode 100644 index 00000000..b60e78f6 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/nl-nl/reset.volume.dialog @@ -0,0 +1,2 @@ +Geluidsniveau reset naar {{volume}} +Geluidsniveau hersteld naar {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/nl-nl/set.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/nl-nl/set.volume.dialog new file mode 100644 index 00000000..e3216d46 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/nl-nl/set.volume.dialog @@ -0,0 +1,3 @@ +Geluidsniveau gezet op {{volume}} +Geluidsniveau bijgewerkt naar {{volume}} +Geluidsniveau gewijzigd naar {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/nl-nl/set.volume.percent.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/nl-nl/set.volume.percent.dialog new file mode 100644 index 00000000..0572ec64 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/nl-nl/set.volume.percent.dialog @@ -0,0 +1,3 @@ +Volume op {{level}} procent ingesteld +Volume naar {{level}} procent bijgewerkt +Volume in {{level}} procent veranderd diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/nl-nl/volume.is.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/nl-nl/volume.is.dialog new file mode 100644 index 00000000..67489197 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/nl-nl/volume.is.dialog @@ -0,0 +1,2 @@ +Het geluidsniveau is gezet op {{volume}} +Het geluidsniveau staat op {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/ru-ru/already.max.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/ru-ru/already.max.volume.dialog new file mode 100644 index 00000000..74867c98 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/ru-ru/already.max.volume.dialog @@ -0,0 +1,2 @@ +Громкость уже на максимуме +Я не могу быть громче diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/ru-ru/decrease.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/ru-ru/decrease.volume.dialog new file mode 100644 index 00000000..63687e63 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/ru-ru/decrease.volume.dialog @@ -0,0 +1,3 @@ +Громкость уменьшена к {{volume}} +Громкость убавлена до {{volume}} +Громкость теперь {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/ru-ru/increase.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/ru-ru/increase.volume.dialog new file mode 100644 index 00000000..a3fba643 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/ru-ru/increase.volume.dialog @@ -0,0 +1,2 @@ +Громкость теперь {{volume}} +Громкость увеличена до {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/ru-ru/mute.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/ru-ru/mute.volume.dialog new file mode 100644 index 00000000..aa8d9acf --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/ru-ru/mute.volume.dialog @@ -0,0 +1,2 @@ +Перехожу в режим без звука +Звук будет выключен diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/ru-ru/reset.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/ru-ru/reset.volume.dialog new file mode 100644 index 00000000..405b3b2b --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/ru-ru/reset.volume.dialog @@ -0,0 +1,2 @@ +Громкость перезагружена на {{volume}} +Громкость восстановлена до {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/ru-ru/set.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/ru-ru/set.volume.dialog new file mode 100644 index 00000000..c6b16f2a --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/ru-ru/set.volume.dialog @@ -0,0 +1,3 @@ +Громкость установлена на {{volume}} +Громкость обновлена до {{volume}} +Громкость изменена на {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/ru-ru/volume.is.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/ru-ru/volume.is.dialog new file mode 100644 index 00000000..252892a7 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/ru-ru/volume.is.dialog @@ -0,0 +1,2 @@ +Уровень звука установлен на {{volume}} +Уровень звука {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/sv-se/already.max.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/sv-se/already.max.volume.dialog new file mode 100644 index 00000000..f3695182 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/sv-se/already.max.volume.dialog @@ -0,0 +1,2 @@ +Volymen är redan på max +Jag kan inte höja mer diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/sv-se/decrease.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/sv-se/decrease.volume.dialog new file mode 100644 index 00000000..f8536d6b --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/sv-se/decrease.volume.dialog @@ -0,0 +1,3 @@ +Volymen har sänkts till {{volume}} +Volymen sänktes till {{volume}} +Volymen är nu {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/sv-se/increase.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/sv-se/increase.volume.dialog new file mode 100644 index 00000000..cd30a273 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/sv-se/increase.volume.dialog @@ -0,0 +1,2 @@ +Volymen är nu {{volume}} +Volymen ökades till {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/sv-se/mute.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/sv-se/mute.volume.dialog new file mode 100644 index 00000000..3396c052 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/sv-se/mute.volume.dialog @@ -0,0 +1,2 @@ +Audio kommer att tystas +Ljudet kommer att tystas diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/sv-se/reset.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/sv-se/reset.volume.dialog new file mode 100644 index 00000000..898ce972 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/sv-se/reset.volume.dialog @@ -0,0 +1,2 @@ +Volymen har återställts till {{volume}} +Volymen har återställts till {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/sv-se/set.volume.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/sv-se/set.volume.dialog new file mode 100644 index 00000000..21720dd7 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/sv-se/set.volume.dialog @@ -0,0 +1,3 @@ +Volymen har satts till {{volume}} +Volymen har ändrats till {{volume}} +Volymen är nu {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/sv-se/set.volume.percent.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/sv-se/set.volume.percent.dialog new file mode 100644 index 00000000..9a23835d --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/sv-se/set.volume.percent.dialog @@ -0,0 +1,3 @@ +Volymen har satts till {{level}} procent +Volymen har ändrats till {{level}} procent +Volymen är nu {{level}} procent diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/sv-se/volume.is.dialog b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/sv-se/volume.is.dialog new file mode 100644 index 00000000..68d8b8b8 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/dialog/sv-se/volume.is.dialog @@ -0,0 +1,2 @@ +Volymen är satt till {{volume}} +Volymen är satt till {{volume}} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/settingsmeta.yaml b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/settingsmeta.yaml new file mode 100644 index 00000000..3a1f33c3 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/settingsmeta.yaml @@ -0,0 +1,8 @@ +skillMetadata: + sections: + - name: Ducking + fields: + - name: ducking + type: checkbox + label: Duck while listening + value: "true" diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/test/intent/sample1.intent.json b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/test/intent/sample1.intent.json new file mode 100644 index 00000000..a1cb2498 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/test/intent/sample1.intent.json @@ -0,0 +1,8 @@ +{ + "utterance": "set volume to 3", + "intent_type": "SetVolume", + "intent": { + "Volume": "volume", + "Level": "3" + } +} \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/test/intent/sample10.intent.json b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/test/intent/sample10.intent.json new file mode 100644 index 00000000..ab81aea9 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/test/intent/sample10.intent.json @@ -0,0 +1,8 @@ +{ + "utterance": "reset volume", + "intent_type": "UnmuteVolume", + "intent": { + "Volume": "volume", + "Unmute": "reset" + } +} diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/test/intent/sample2.intent.json b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/test/intent/sample2.intent.json new file mode 100644 index 00000000..403760f6 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/test/intent/sample2.intent.json @@ -0,0 +1,8 @@ +{ + "utterance": "update volume to 11", + "intent_type": "SetVolume", + "intent": { + "Volume": "volume", + "Level": "11" + } +} \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/test/intent/sample3.intent.json b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/test/intent/sample3.intent.json new file mode 100644 index 00000000..f588794b --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/test/intent/sample3.intent.json @@ -0,0 +1,8 @@ +{ + "utterance": "increase volume", + "intent_type": "IncreaseVolume", + "intent": { + "Volume": "volume", + "Increase": "increase" + } +} \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/test/intent/sample4.intent.json b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/test/intent/sample4.intent.json new file mode 100644 index 00000000..27ce94d3 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/test/intent/sample4.intent.json @@ -0,0 +1,8 @@ +{ + "utterance": "rise volume", + "intent_type": "IncreaseVolume", + "intent": { + "Volume": "volume", + "Increase": "rise" + } +} \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/test/intent/sample5.intent.json b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/test/intent/sample5.intent.json new file mode 100644 index 00000000..cc29c55f --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/test/intent/sample5.intent.json @@ -0,0 +1,8 @@ +{ + "utterance": "decrease volume", + "intent_type": "DecreaseVolume", + "intent": { + "Volume": "volume", + "Decrease": "decrease" + } +} \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/test/intent/sample6.intent.json b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/test/intent/sample6.intent.json new file mode 100644 index 00000000..d3a970c4 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/test/intent/sample6.intent.json @@ -0,0 +1,8 @@ +{ + "utterance": "reduce volume", + "intent_type": "DecreaseVolume", + "intent": { + "Volume": "volume", + "Decrease": "reduce" + } +} \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/test/intent/sample7.intent.json b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/test/intent/sample7.intent.json new file mode 100644 index 00000000..618fac75 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/test/intent/sample7.intent.json @@ -0,0 +1,8 @@ +{ + "utterance": "set volume to quiet", + "intent_type": "SetVolume", + "intent": { + "Volume": "volume", + "Level": "quiet" + } +} \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/test/intent/sample8.intent.json b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/test/intent/sample8.intent.json new file mode 100644 index 00000000..a775f96a --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/test/intent/sample8.intent.json @@ -0,0 +1,8 @@ +{ + "utterance": "update volume to normal", + "intent_type": "SetVolume", + "intent": { + "Volume": "volume", + "Level": "normal" + } +} \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/test/intent/sample9.intent.json b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/test/intent/sample9.intent.json new file mode 100644 index 00000000..53689544 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/test/intent/sample9.intent.json @@ -0,0 +1,8 @@ +{ + "utterance": "change volume to loud", + "intent_type": "SetVolume", + "intent": { + "Volume": "volume", + "Level": "loud" + } +} \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/da-dk/Decrease.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/da-dk/Decrease.voc new file mode 100644 index 00000000..89462984 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/da-dk/Decrease.voc @@ -0,0 +1,5 @@ +sænk +reducere +sænk +sænk +lavere diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/da-dk/Increase.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/da-dk/Increase.voc new file mode 100644 index 00000000..6acf2a93 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/da-dk/Increase.voc @@ -0,0 +1,6 @@ +hæv +hæv +boost +øg +skru op +højere diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/da-dk/Level.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/da-dk/Level.voc new file mode 100644 index 00000000..b610e13f --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/da-dk/Level.voc @@ -0,0 +1,15 @@ +0 +1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +stille +normal +højt diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/da-dk/Mute.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/da-dk/Mute.voc new file mode 100644 index 00000000..4473900f --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/da-dk/Mute.voc @@ -0,0 +1,2 @@ +mute +stille diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/da-dk/Percent.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/da-dk/Percent.voc new file mode 100644 index 00000000..bbf722c7 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/da-dk/Percent.voc @@ -0,0 +1,2 @@ +procent +% diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/da-dk/Query.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/da-dk/Query.voc new file mode 100644 index 00000000..6bc1c012 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/da-dk/Query.voc @@ -0,0 +1,2 @@ +hvad +fortæl diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/da-dk/Unmute.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/da-dk/Unmute.voc new file mode 100644 index 00000000..0f187df9 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/da-dk/Unmute.voc @@ -0,0 +1,3 @@ +nulstil +unmute +genskab diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/da-dk/Volume.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/da-dk/Volume.voc new file mode 100644 index 00000000..1ceaeaef --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/da-dk/Volume.voc @@ -0,0 +1,3 @@ +volume +højtaler +lyd diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/Decrease.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/Decrease.voc new file mode 100644 index 00000000..c7fa7cfe --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/Decrease.voc @@ -0,0 +1,7 @@ +leiser +reduziere +verringere +leiser +weicher +Weniger +runter diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/DecreasePhrase.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/DecreasePhrase.voc new file mode 100644 index 00000000..4fc14bce --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/DecreasePhrase.voc @@ -0,0 +1,2 @@ +leiser +weicher diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/Increase.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/Increase.voc new file mode 100644 index 00000000..2aaeec27 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/Increase.voc @@ -0,0 +1,8 @@ +höher +anheben +erhöhen +erhöhen +steigern +lauter +mehr +auf diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/IncreasePhrase.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/IncreasePhrase.voc new file mode 100644 index 00000000..c7a63faf --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/IncreasePhrase.voc @@ -0,0 +1 @@ +lauter diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/Level.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/Level.voc new file mode 100644 index 00000000..ae7f9853 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/Level.voc @@ -0,0 +1,15 @@ +0 +1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +leise +standard +laut diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/MaxVolume.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/MaxVolume.voc new file mode 100644 index 00000000..122a4566 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/MaxVolume.voc @@ -0,0 +1,6 @@ +max +Maximum +lauteste +höchste +alles was geht +kurble diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/MaxVolumePhrase.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/MaxVolumePhrase.voc new file mode 100644 index 00000000..87dd6c40 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/MaxVolumePhrase.voc @@ -0,0 +1,2 @@ +kurble +Drehe diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/Mute.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/Mute.voc new file mode 100644 index 00000000..45050e99 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/Mute.voc @@ -0,0 +1,2 @@ +stumm +still diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/Percent.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/Percent.voc new file mode 100644 index 00000000..cd759bce --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/Percent.voc @@ -0,0 +1,2 @@ +Prozent +% diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/Query.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/Query.voc new file mode 100644 index 00000000..be287ae0 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/Query.voc @@ -0,0 +1,2 @@ +was +sagen diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/QueryPhrase.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/QueryPhrase.voc new file mode 100644 index 00000000..25eea018 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/QueryPhrase.voc @@ -0,0 +1,2 @@ +wie hoch +wie laut diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/Set.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/Set.voc new file mode 100644 index 00000000..38b3ae70 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/Set.voc @@ -0,0 +1,3 @@ +Drehe +mache +setzte diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/To.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/To.voc new file mode 100644 index 00000000..dc3e3572 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/To.voc @@ -0,0 +1 @@ +auf diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/Unmute.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/Unmute.voc new file mode 100644 index 00000000..0018ce3e --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/Unmute.voc @@ -0,0 +1,4 @@ +aufheben +zurücksetzen +wiederherstellen +Standard diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/Volume.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/Volume.voc new file mode 100644 index 00000000..2e54fbcc --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/de-de/Volume.voc @@ -0,0 +1,4 @@ +Lautstärke +Lautsprecher +ton +Audio diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/Decrease.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/Decrease.voc new file mode 100644 index 00000000..eb2fa633 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/Decrease.voc @@ -0,0 +1,7 @@ +lower +reduce +decrease +quieter +softer +less +down \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/DecreasePhrase.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/DecreasePhrase.voc new file mode 100644 index 00000000..9e50ba5b --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/DecreasePhrase.voc @@ -0,0 +1,2 @@ +quieter +softer \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/Increase.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/Increase.voc new file mode 100644 index 00000000..e82b3e22 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/Increase.voc @@ -0,0 +1,8 @@ +higher +rise +increase +raise +boost +louder +more +up \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/IncreasePhrase.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/IncreasePhrase.voc new file mode 100644 index 00000000..10df3e10 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/IncreasePhrase.voc @@ -0,0 +1 @@ +louder \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/Level.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/Level.voc new file mode 100644 index 00000000..428fa83f --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/Level.voc @@ -0,0 +1,27 @@ +0 +1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +zero +one +two +three +four +five +six +seven +eight +nine +ten +eleven +quiet +normal +loud diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/MaxVolume.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/MaxVolume.voc new file mode 100644 index 00000000..d00e2205 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/MaxVolume.voc @@ -0,0 +1,6 @@ +max +maximum +loudest +highest +all the way +crank \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/MaxVolumePhrase.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/MaxVolumePhrase.voc new file mode 100644 index 00000000..ee7d09c4 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/MaxVolumePhrase.voc @@ -0,0 +1,2 @@ +crank +turn \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/Mute.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/Mute.voc new file mode 100644 index 00000000..65969051 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/Mute.voc @@ -0,0 +1,2 @@ +mute +silence \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/Percent.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/Percent.voc new file mode 100644 index 00000000..84b3bb35 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/Percent.voc @@ -0,0 +1,2 @@ +percent +% diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/Query.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/Query.voc new file mode 100644 index 00000000..2b586ad9 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/Query.voc @@ -0,0 +1,2 @@ +what +tell \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/QueryPhrase.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/QueryPhrase.voc new file mode 100644 index 00000000..cb37a264 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/QueryPhrase.voc @@ -0,0 +1,2 @@ +how high +how loud \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/Set.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/Set.voc new file mode 100644 index 00000000..1aac274f --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/Set.voc @@ -0,0 +1,3 @@ +turn +make +set \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/To.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/To.voc new file mode 100644 index 00000000..788636ff --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/To.voc @@ -0,0 +1 @@ +to \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/Unmute.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/Unmute.voc new file mode 100644 index 00000000..487adf9d --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/Unmute.voc @@ -0,0 +1,4 @@ +unmute +reset +restore +default diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/Volume.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/Volume.voc new file mode 100644 index 00000000..36e93b8f --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/en-us/Volume.voc @@ -0,0 +1,4 @@ +volume +speaker +sound +audio \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/Decrease.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/Decrease.voc new file mode 100644 index 00000000..10aaefe6 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/Decrease.voc @@ -0,0 +1,7 @@ +más bajo +reduce +baja +más bajo +más blando +menor +abajo diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/DecreasePhrase.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/DecreasePhrase.voc new file mode 100644 index 00000000..69401381 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/DecreasePhrase.voc @@ -0,0 +1,2 @@ +más bajo +más blando diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/Increase.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/Increase.voc new file mode 100644 index 00000000..43737778 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/Increase.voc @@ -0,0 +1,8 @@ +más alto +sube +aumenta +sube +incrementa +mas fuerte +más +arriba diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/IncreasePhrase.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/IncreasePhrase.voc new file mode 100644 index 00000000..4e1a91e4 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/IncreasePhrase.voc @@ -0,0 +1 @@ +mas fuerte diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/Level.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/Level.voc new file mode 100644 index 00000000..4766dcdd --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/Level.voc @@ -0,0 +1,15 @@ +0 +1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +suave +normal +fuerte diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/MaxVolume.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/MaxVolume.voc new file mode 100644 index 00000000..25abb3aa --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/MaxVolume.voc @@ -0,0 +1,6 @@ +máx +máximo +más fuerte +el más alto +a fondo +ruido diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/MaxVolumePhrase.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/MaxVolumePhrase.voc new file mode 100644 index 00000000..a5265eaa --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/MaxVolumePhrase.voc @@ -0,0 +1,2 @@ +ruido +mueve diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/Mute.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/Mute.voc new file mode 100644 index 00000000..b056aa63 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/Mute.voc @@ -0,0 +1,2 @@ +en silencio +silencio diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/Percent.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/Percent.voc new file mode 100644 index 00000000..4c114a35 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/Percent.voc @@ -0,0 +1,2 @@ +por ciento +% diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/Query.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/Query.voc new file mode 100644 index 00000000..ef146763 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/Query.voc @@ -0,0 +1,2 @@ +qué +di diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/QueryPhrase.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/QueryPhrase.voc new file mode 100644 index 00000000..5501b8cf --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/QueryPhrase.voc @@ -0,0 +1,2 @@ +cuán alto +cuán fuerte diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/Set.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/Set.voc new file mode 100644 index 00000000..da5c13f6 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/Set.voc @@ -0,0 +1,3 @@ +mueve +haz +pon diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/To.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/To.voc new file mode 100644 index 00000000..78981922 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/To.voc @@ -0,0 +1 @@ +a diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/Unmute.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/Unmute.voc new file mode 100644 index 00000000..083375ce --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/Unmute.voc @@ -0,0 +1,4 @@ +con volumen +reiniciar +restaura +predeterminado diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/Volume.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/Volume.voc new file mode 100644 index 00000000..8a917849 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/es-es/Volume.voc @@ -0,0 +1,4 @@ +volumen +parlante +sonido +audio diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/fr-fr/Decrease.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/fr-fr/Decrease.voc new file mode 100644 index 00000000..f87be1f6 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/fr-fr/Decrease.voc @@ -0,0 +1,5 @@ +reduire +reduire +abaisser +couper +moins fort diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/fr-fr/Increase.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/fr-fr/Increase.voc new file mode 100644 index 00000000..9addfab0 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/fr-fr/Increase.voc @@ -0,0 +1,6 @@ +augmenter +élever +boost +augmenter +relever +plus fort diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/fr-fr/Level.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/fr-fr/Level.voc new file mode 100644 index 00000000..9a19ab9d --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/fr-fr/Level.voc @@ -0,0 +1,15 @@ +0 +1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +silencieux +normal +fort diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/fr-fr/Mute.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/fr-fr/Mute.voc new file mode 100644 index 00000000..9431b1b0 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/fr-fr/Mute.voc @@ -0,0 +1,2 @@ +muet +silence diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/fr-fr/Unmute.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/fr-fr/Unmute.voc new file mode 100644 index 00000000..133db921 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/fr-fr/Unmute.voc @@ -0,0 +1,3 @@ +réinitialiser +rétablir le son +rétablir diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/fr-fr/Volume.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/fr-fr/Volume.voc new file mode 100644 index 00000000..811d369f --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/fr-fr/Volume.voc @@ -0,0 +1,3 @@ +volume +haut-parleur +son diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/hu-hu/Decrease.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/hu-hu/Decrease.voc new file mode 100644 index 00000000..ea90d255 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/hu-hu/Decrease.voc @@ -0,0 +1,5 @@ +mérsékeld +vegyél vissza +csökkentsd +csavard le +halkítsd|halkabbra diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/hu-hu/Increase.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/hu-hu/Increase.voc new file mode 100644 index 00000000..4b4464a3 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/hu-hu/Increase.voc @@ -0,0 +1,6 @@ +emeld +emeld meg +erősítsd|fokozd +növeld +csavard fel +hangosíts|hangosabbra diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/hu-hu/Level.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/hu-hu/Level.voc new file mode 100644 index 00000000..e6f77a2e --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/hu-hu/Level.voc @@ -0,0 +1,15 @@ +0 +1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +halk +normál +hangos diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/hu-hu/Mute.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/hu-hu/Mute.voc new file mode 100644 index 00000000..320d0939 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/hu-hu/Mute.voc @@ -0,0 +1,2 @@ +elnémítás +csend diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/hu-hu/Unmute.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/hu-hu/Unmute.voc new file mode 100644 index 00000000..bf79a4f2 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/hu-hu/Unmute.voc @@ -0,0 +1,3 @@ +(visszaállítás|állítsd vissza) +megszólaltatása +visszaállítása diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/hu-hu/Volume.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/hu-hu/Volume.voc new file mode 100644 index 00000000..00b8f412 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/hu-hu/Volume.voc @@ -0,0 +1,3 @@ +hangerő|hangerőt +hangszóró|hangszórót +hang|hangot diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/Decrease.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/Decrease.voc new file mode 100644 index 00000000..90ad0b3a --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/Decrease.voc @@ -0,0 +1,7 @@ +abbassa +reduci +diminuisci +più tranquillo +più basso +meno +giù diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/DecreasePhrase.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/DecreasePhrase.voc new file mode 100644 index 00000000..85eb9d96 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/DecreasePhrase.voc @@ -0,0 +1,2 @@ +più tranquillo +più basso diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/Increase.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/Increase.voc new file mode 100644 index 00000000..b66a0095 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/Increase.voc @@ -0,0 +1,8 @@ +più alto +sali +aumenta +aumenta +incrementa +più forte +di più +su diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/IncreasePhrase.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/IncreasePhrase.voc new file mode 100644 index 00000000..85dcdb67 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/IncreasePhrase.voc @@ -0,0 +1 @@ +più forte diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/Level.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/Level.voc new file mode 100644 index 00000000..f6a45a81 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/Level.voc @@ -0,0 +1,15 @@ +0 +1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +silenzioso +normale +forte diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/MaxVolume.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/MaxVolume.voc new file mode 100644 index 00000000..3d0697ab --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/MaxVolume.voc @@ -0,0 +1,6 @@ +massimo +massimo +più forte +più alto +fino +manovella diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/MaxVolumePhrase.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/MaxVolumePhrase.voc new file mode 100644 index 00000000..76d3768c --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/MaxVolumePhrase.voc @@ -0,0 +1,2 @@ +manovella +tirare diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/Mute.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/Mute.voc new file mode 100644 index 00000000..04893fbb --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/Mute.voc @@ -0,0 +1,2 @@ +muto +silenzio diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/Percent.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/Percent.voc new file mode 100644 index 00000000..6bc8de07 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/Percent.voc @@ -0,0 +1,2 @@ +percento +% diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/Query.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/Query.voc new file mode 100644 index 00000000..9e5b6dfb --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/Query.voc @@ -0,0 +1,2 @@ +quale +dimmi diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/QueryPhrase.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/QueryPhrase.voc new file mode 100644 index 00000000..e2b21ab4 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/QueryPhrase.voc @@ -0,0 +1,2 @@ +quanto alto +quanto forte diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/Set.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/Set.voc new file mode 100644 index 00000000..9e450eaa --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/Set.voc @@ -0,0 +1,3 @@ +tirare +fare +impostare diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/To.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/To.voc new file mode 100644 index 00000000..78981922 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/To.voc @@ -0,0 +1 @@ +a diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/Unmute.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/Unmute.voc new file mode 100644 index 00000000..a5066b59 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/Unmute.voc @@ -0,0 +1,4 @@ +riattiva +reimposta +ripristina +default diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/Volume.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/Volume.voc new file mode 100644 index 00000000..7d2b47fb --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/it-it/Volume.voc @@ -0,0 +1,4 @@ +volume +altoparlante +suono +audio diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/nl-nl/Decrease.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/nl-nl/Decrease.voc new file mode 100644 index 00000000..a4942c1f --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/nl-nl/Decrease.voc @@ -0,0 +1,5 @@ +lager +verminder +afnemen +zachter zetten +zachter diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/nl-nl/Increase.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/nl-nl/Increase.voc new file mode 100644 index 00000000..3ba35c5b --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/nl-nl/Increase.voc @@ -0,0 +1,6 @@ +verhogen +verhogen +versterk +toenemen +harder zetten +harder diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/nl-nl/Level.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/nl-nl/Level.voc new file mode 100644 index 00000000..d7d4a350 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/nl-nl/Level.voc @@ -0,0 +1,15 @@ +0 +1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +stil +normaal +hard diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/nl-nl/Mute.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/nl-nl/Mute.voc new file mode 100644 index 00000000..398e9e87 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/nl-nl/Mute.voc @@ -0,0 +1,2 @@ +dempen +stilte diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/nl-nl/Percent.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/nl-nl/Percent.voc new file mode 100644 index 00000000..bbf722c7 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/nl-nl/Percent.voc @@ -0,0 +1,2 @@ +procent +% diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/nl-nl/Query.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/nl-nl/Query.voc new file mode 100644 index 00000000..ea0b3d74 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/nl-nl/Query.voc @@ -0,0 +1,2 @@ +wat +zeg diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/nl-nl/Unmute.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/nl-nl/Unmute.voc new file mode 100644 index 00000000..526a9120 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/nl-nl/Unmute.voc @@ -0,0 +1,3 @@ +reset +geluid +herstellen diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/nl-nl/Volume.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/nl-nl/Volume.voc new file mode 100644 index 00000000..80e4c1e3 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/nl-nl/Volume.voc @@ -0,0 +1,3 @@ +geluidsniveau +luidspreker +geluid diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/ru-ru/Decrease.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/ru-ru/Decrease.voc new file mode 100644 index 00000000..0e6c6c6a --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/ru-ru/Decrease.voc @@ -0,0 +1,5 @@ +тише +уменьши +сделай меньше +убавь +тише diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/ru-ru/Increase.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/ru-ru/Increase.voc new file mode 100644 index 00000000..9f43c372 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/ru-ru/Increase.voc @@ -0,0 +1,6 @@ +увеличь +увеличить +прибавь +надбавь +сделай громче +громче diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/ru-ru/Level.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/ru-ru/Level.voc new file mode 100644 index 00000000..a86c49be --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/ru-ru/Level.voc @@ -0,0 +1,15 @@ +0 +1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +тихо +нормально +громко diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/ru-ru/Mute.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/ru-ru/Mute.voc new file mode 100644 index 00000000..227f2ba0 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/ru-ru/Mute.voc @@ -0,0 +1,2 @@ +без звука +тишина diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/ru-ru/Unmute.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/ru-ru/Unmute.voc new file mode 100644 index 00000000..216613b2 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/ru-ru/Unmute.voc @@ -0,0 +1,3 @@ +перезагрузи +включи звук +восстанови diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/ru-ru/Volume.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/ru-ru/Volume.voc new file mode 100644 index 00000000..9caca053 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/ru-ru/Volume.voc @@ -0,0 +1,3 @@ +громкость +динамик +звук diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/sv-se/Decrease.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/sv-se/Decrease.voc new file mode 100644 index 00000000..d6e7a64b --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/sv-se/Decrease.voc @@ -0,0 +1,5 @@ +sänk +reducera +öka +skruva ner +tystare diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/sv-se/Increase.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/sv-se/Increase.voc new file mode 100644 index 00000000..d667145d --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/sv-se/Increase.voc @@ -0,0 +1,6 @@ +högre +högre +boosta +öka +vrid upp +högre diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/sv-se/Level.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/sv-se/Level.voc new file mode 100644 index 00000000..d1d6bd36 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/sv-se/Level.voc @@ -0,0 +1,15 @@ +0 +1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +tyst +normal +hög diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/sv-se/Mute.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/sv-se/Mute.voc new file mode 100644 index 00000000..942f0c2a --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/sv-se/Mute.voc @@ -0,0 +1,2 @@ +tyst +tystnad diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/sv-se/Percent.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/sv-se/Percent.voc new file mode 100644 index 00000000..bbf722c7 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/sv-se/Percent.voc @@ -0,0 +1,2 @@ +procent +% diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/sv-se/Query.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/sv-se/Query.voc new file mode 100644 index 00000000..0af4bf65 --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/sv-se/Query.voc @@ -0,0 +1,2 @@ +vad +berätta diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/sv-se/Unmute.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/sv-se/Unmute.voc new file mode 100644 index 00000000..b64b958d --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/sv-se/Unmute.voc @@ -0,0 +1,3 @@ +återställ +avmuta +återställ diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/sv-se/Volume.voc b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/sv-se/Volume.voc new file mode 100644 index 00000000..37c67cbf --- /dev/null +++ b/buildroot-external/rootfs-overlay/opt/mycroft/skills/mycroft-volume.mycroftai/vocab/sv-se/Volume.voc @@ -0,0 +1,3 @@ +volym +högtalare +ljud diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/splash/background.png b/buildroot-external/rootfs-overlay/opt/mycroft/splash/background.png new file mode 100644 index 00000000..ec22bf0e Binary files /dev/null and b/buildroot-external/rootfs-overlay/opt/mycroft/splash/background.png differ diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/splash/boot.png b/buildroot-external/rootfs-overlay/opt/mycroft/splash/boot.png index d0f14d47..87f15d62 100644 Binary files a/buildroot-external/rootfs-overlay/opt/mycroft/splash/boot.png and b/buildroot-external/rootfs-overlay/opt/mycroft/splash/boot.png differ diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/splash/down.png b/buildroot-external/rootfs-overlay/opt/mycroft/splash/down.png new file mode 100644 index 00000000..6dcddd93 Binary files /dev/null and b/buildroot-external/rootfs-overlay/opt/mycroft/splash/down.png differ diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/splash/logo.png b/buildroot-external/rootfs-overlay/opt/mycroft/splash/logo.png new file mode 100644 index 00000000..0e5b58fc Binary files /dev/null and b/buildroot-external/rootfs-overlay/opt/mycroft/splash/logo.png differ diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/splash/off.png b/buildroot-external/rootfs-overlay/opt/mycroft/splash/off.png new file mode 100644 index 00000000..36ac30d1 Binary files /dev/null and b/buildroot-external/rootfs-overlay/opt/mycroft/splash/off.png differ diff --git a/buildroot-external/rootfs-overlay/root/.bash_profile b/buildroot-external/rootfs-overlay/root/.bash_profile new file mode 100644 index 00000000..49c25bda --- /dev/null +++ b/buildroot-external/rootfs-overlay/root/.bash_profile @@ -0,0 +1,6 @@ +if [ -n "$BASH_VERSION" ]; then + # include .bashrc if it exists + if [ -f "$HOME/.bashrc" ]; then + . "$HOME/.bashrc" + fi +fi diff --git a/buildroot-external/rootfs-overlay/root/.bashrc b/buildroot-external/rootfs-overlay/root/.bashrc new file mode 100644 index 00000000..2b1fe763 --- /dev/null +++ b/buildroot-external/rootfs-overlay/root/.bashrc @@ -0,0 +1,7 @@ +export TERM=xterm-xfree86 + +PS1='\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w \$\[\033[00m\] ' + +export NODE_PATH=/usr/lib/node_modules +export NVM_DIR="$HOME/.nvm" +[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" diff --git a/buildroot-external/rootfs-overlay/root/.profile b/buildroot-external/rootfs-overlay/root/.profile new file mode 100644 index 00000000..49c25bda --- /dev/null +++ b/buildroot-external/rootfs-overlay/root/.profile @@ -0,0 +1,6 @@ +if [ -n "$BASH_VERSION" ]; then + # include .bashrc if it exists + if [ -f "$HOME/.bashrc" ]; then + . "$HOME/.bashrc" + fi +fi diff --git a/buildroot-external/rootfs-overlay/usr/bin/mycroft-config b/buildroot-external/rootfs-overlay/usr/bin/mycroft-config new file mode 100755 index 00000000..a1271b32 --- /dev/null +++ b/buildroot-external/rootfs-overlay/usr/bin/mycroft-config @@ -0,0 +1,244 @@ +#!/usr/bin/env bash + +# Copyright 2019 Mycroft AI Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +SOURCE="${BASH_SOURCE[0]}" +cd -P "$( dirname "$SOURCE" )" +DIR="$( pwd )" +script=${0} +script=${script##*/} + +function help() { + echo "${script}: Mycroft configuration manager" + echo "usage: ${script} [COMMAND] [params]" + echo + echo "COMMANDs:" + echo " edit (system|user) edit and validate config file" + echo " reload instruct services to reload config" + echo " show (default|remote|system|user) display the specified setting file" + echo " set set the variable (under USER)" + echo " get [var] display a particular variable" + echo " or all if no 'var' specified" + echo "Note: Use jq format for specifying " + echo + echo "Examples:" + echo " ${script} edit user" + echo " sudo ${script} edit system" + echo " ${script} show remote" + echo " ${script} get" + echo " ${script} get enclosure.platform" + echo " ${script} set test.subvalue \"foo\" " + + exit 1 +} + +################################################################ +# Setup stuff based on the environment + +VIEWER="nano --syntax=json --view" +if [ -z "$EDITOR" ] ; then + if [ $( which sensible-editor ) ] ; then + EDITOR="sensible-editor" + else + EDITOR="nano --syntax=json --tempfile" + fi +fi + +if [ -z "$TEMP" ] ; then + TEMP="/tmp" +fi + +function found_exe() { + hash "$1" 2>/dev/null +} + +if found_exe tput ; then + GREEN="$(tput setaf 2)" + BLUE="$(tput setaf 4)" + CYAN="$(tput setaf 6)" + YELLOW="$(tput setaf 3)" + RESET="$(tput sgr0)" + HIGHLIGHT=${YELLOW} +fi + +################################################################ +# Utilities + +function validate_config_file() { + if [ ! -f "$1" ] ; then + # A missing config file is valid + return 0 + fi + + echo -n ${BLUE} + + # Remove any comments (lines starting with # or //) found in the file and + # Use jq to validate and output errors + sed 's/^\s*[#\/].*$//g' "$1" | sed '/^$/d' | jq -e "." > /dev/null + result=$? + + echo -n ${RESET} + + #xxx echo "RESULT=$result for $1" + return $result +} + +_conf_file="~/.mycroft/mycroft.conf" +function name_to_path() { + case ${1} in + "system") _conf_file="/etc/mycroft/mycroft.conf" ;; + "user") _conf_file=$(readlink -f ~/.mycroft/mycroft.conf) ;; + "default") _conf_file="$DIR/../mycroft/configuration/mycroft.conf" ;; + "remote") _conf_file="/var/tmp/mycroft_web_cache.json" ;; + + *) + echo "ERROR: Unknown name '${1}'." + echo " Must be one of: default, remote, system, or user" + exit 1 + esac +} + +################################################################ + +function edit_config() { + name_to_path $1 + validate_config_file $_conf_file + rc=$? + if [ $rc -ne 0 ] ; then + echo "${YELLOW}WARNING: ${RESET}Configuration file did not pass validation before edits." + read -p "Review errors above and press ENTER to continue with editing." + fi + + if [ -f "${_conf_file}" ] ; then + cp "${_conf_file}" "${TEMP}/mycroft.json" + else + echo "{" > "${TEMP}/mycroft.json" + echo "}" >> "${TEMP}/mycroft.json" + fi + + while [ 1 ] ; do + case $1 in + system | user) + # Allow user to edit + $EDITOR $TEMP/mycroft.json + ;; + default | remote) + # View-only + echo "The default config shouldn't be changed, opening in View mode" + sleep 2 + $VIEWER $TEMP/mycroft.json + ;; + esac + + cmp --quiet "${_conf_file}" "${TEMP}/mycroft.json" + rc=$? + if [ $rc -eq 0 ] ; then + echo "Configuration unchanged." + break + fi + + # file was changed, validate changes + validate_config_file $TEMP/mycroft.json + if [ $? -ne 0 ] ; then + echo "${YELLOW}WARNING: ${RESET}Configuration file does not pass validation, see errors above." + echo "Press X to abandon changes, S to force save, any other key to edit again." + read -N1 -s key + else + key="S" + fi + + case $key in + [Ss]) + echo "Saving..." + mv $TEMP/mycroft.json $_conf_file + signal_reload_config + break + ;; + [Xx]) + # abandoning + break + ;; + esac + + done +} + +function signal_reload_config() { + # Enter the Mycroft venv + source "$DIR/../venv-activate.sh" -q + + # Post a messagebus notification to reload the config file + output=$(python -m mycroft.messagebus.send "configuration.updated" "{}") +} + +function show_config() { + name_to_path $1 + + # Use jq to display formatted nicely (after stripping out comments) + sed 's/^\s*[#\/].*$//g' "${_conf_file}" | sed '/^$/d' | jq "." +} + +function get_config() { + value=$1 + if [[ ! $value =~ ^\..* ]] ; then + # Add the leading period if not included + value=".${value}" + fi + + # Load all the configuration(s) + json_config=$( source "$DIR/../venv-activate.sh" -q && python -c "import json; from mycroft.configuration import Configuration; print(json.dumps(Configuration.get()))" ) + + # Read the given variable from the mix + echo ${json_config} | jq -r "${value}" +} + +function set_config() { + # Set all overrides under the user configuration + value=$1 + if [[ ! $value =~ ^\..* ]] ; then + # Add the leading period if not included + value=".${value}" + fi + + jq "${value} = \"$2\"" ~/.mycroft/mycroft.conf > "${TEMP}/~mycroft.conf" + if [ $? -eq 0 ] ; then + # Successful update, replace the config file + mv "${TEMP}/~mycroft.conf" ~/.mycroft/mycroft.conf + signal_reload_config + fi +} + +_opt=$1 +case ${_opt} in + "edit") + edit_config $2 + ;; + "reload") + signal_reload_config + ;; + "show") + show_config $2 + ;; + "get") + get_config $2 + ;; + "set") + set_config "$2" "$3" + ;; + + *) + help + ;; +esac diff --git a/buildroot-external/rootfs-overlay/var/lib/alsa/default-asound.state b/buildroot-external/rootfs-overlay/var/lib/alsa/default-asound.state new file mode 100644 index 00000000..53e98118 --- /dev/null +++ b/buildroot-external/rootfs-overlay/var/lib/alsa/default-asound.state @@ -0,0 +1,58 @@ +state.ALSA { + control.1 { + iface MIXER + name 'PCM Playback Volume' + value -31 + comment { + access 'read write' + type INTEGER + count 1 + range '-10239 - 400' + dbmin -9999999 + dbmax 400 + dbvalue.0 -31 + } + } + control.2 { + iface MIXER + name 'PCM Playback Switch' + value true + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.3 { + iface MIXER + name 'PCM Playback Route' + value 0 + comment { + access 'read write' + type INTEGER + count 1 + range '0 - 3' + } + } + control.4 { + iface PCM + name 'IEC958 Playback Default' + value '0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' + comment { + access 'read write' + type IEC958 + count 1 + } + } + control.5 { + iface PCM + name 'IEC958 Playback Con Mask' + value '0200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' + comment { + access read + type IEC958 + count 1 + } + } +} + diff --git a/buildroot-external/user_table.txt b/buildroot-external/user_table.txt new file mode 100644 index 00000000..2387b4ad --- /dev/null +++ b/buildroot-external/user_table.txt @@ -0,0 +1,2 @@ + +mycroft -1 mycroft -1 =mycroft /home/mycroft /bin/sh input,i2c,spi,gpio,audio,video,pulse,pulse-access Mycroft user diff --git a/buildroot-patches/0001-Update-mimic-to-1.2.0.2.patch b/buildroot-patches/0001-Update-mimic-to-latest-version.patch similarity index 58% rename from buildroot-patches/0001-Update-mimic-to-1.2.0.2.patch rename to buildroot-patches/0001-Update-mimic-to-latest-version.patch index 7d81f0c5..fa142e80 100644 --- a/buildroot-patches/0001-Update-mimic-to-1.2.0.2.patch +++ b/buildroot-patches/0001-Update-mimic-to-latest-version.patch @@ -1,37 +1,49 @@ -From 1c97c05ae21762932e4a7dece3996a4872c769db Mon Sep 17 00:00:00 2001 +From 1c090605bbec847ec5000ded4fca28c78e0d73f3 Mon Sep 17 00:00:00 2001 From: Peter Steenbergen -Date: Mon, 29 Oct 2018 09:56:56 +0100 -Subject: [PATCH 1/1] Update mimic to 1.2.0.2 +Date: Tue, 24 Sep 2019 15:49:52 +0200 +Subject: [PATCH 1/1] Update mimic to latest dev version --- - package/mimic/0001-disable-werror.patch | 13 +++++++++++++ + package/mimic/0001-disable-werror.patch | 25 +++++++++++++++++++++++++ package/mimic/Config.in | 2 ++ - package/mimic/mimic.hash | 1 + - package/mimic/mimic.mk | 14 ++++++++++---- - 4 files changed, 26 insertions(+), 4 deletions(-) + package/mimic/mimic.hash | 2 ++ + package/mimic/mimic.mk | 17 ++++++++++++----- + 4 files changed, 41 insertions(+), 5 deletions(-) create mode 100644 package/mimic/0001-disable-werror.patch diff --git a/package/mimic/0001-disable-werror.patch b/package/mimic/0001-disable-werror.patch new file mode 100644 -index 0000000000..ad37023390 +index 0000000000..0f8d59a467 --- /dev/null +++ b/package/mimic/0001-disable-werror.patch -@@ -0,0 +1,13 @@ -+Removing the -Werror FLAG +@@ -0,0 +1,25 @@ ++From c393e191f841707718096264e479f3b3d95b7a60 Mon Sep 17 00:00:00 2001 ++From: j1nx ++Date: Mon, 23 Sep 2019 12:03:30 +0200 ++Subject: [PATCH 1/1] Disable Werror ++ ++--- ++ Makefile.am | 2 +- ++ 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am ++index 34d367f..b238245 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,6 +1,6 @@ + ACLOCAL_AMFLAGS = -I m4 -+ -+-AM_CPPFLAGS = -Wall -Werror -I$(top_srcdir)/include $(ICU_CFLAGS) -++AM_CPPFLAGS = -Wall -I$(top_srcdir)/include $(ICU_CFLAGS) -+ ++ ++-AM_CPPFLAGS = -Wall -Werror -I$(top_srcdir)/include $(PCRE2_CFLAGS) +++AM_CPPFLAGS = -Wall -I$(top_srcdir)/include $(PCRE2_CFLAGS) ++ + SUBDIRS = . -+ ++ ++-- ++2.17.1 ++ ++ diff --git a/package/mimic/Config.in b/package/mimic/Config.in -index 79641d3790..254b1844ad 100644 +index 79641d3790..f8c33e8697 100644 --- a/package/mimic/Config.in +++ b/package/mimic/Config.in @@ -4,6 +4,8 @@ comment "mimic needs a toolchain w/ wchar" @@ -39,20 +51,21 @@ index 79641d3790..254b1844ad 100644 bool "mimic" depends on BR2_USE_WCHAR + select BR2_PACKAGE_ICU -+ select BR2_PACKAGE_PCRE2 ++ select BR2_PACKAGE_PCRE2 help Mimic is a fast, lightweight Text-to-speech engine developed by Mycroft A.I. and VocaliD, based on Carnegie Mellon diff --git a/package/mimic/mimic.hash b/package/mimic/mimic.hash -index 39d016548a..4570ed91db 100644 +index 39d016548a..2eea00ba64 100644 --- a/package/mimic/mimic.hash +++ b/package/mimic/mimic.hash -@@ -1,2 +1,3 @@ +@@ -1,2 +1,4 @@ # Locally calculated sha256 725003c9972d5b67c49d5ea6a89cb26b63414ff2c7adbbaf9200cf9eb55f80eb mimic-1.1.0.tar.gz +sha256 6adcc9911b09d6e9513add41ad9dfc0893ece277f556419869520a0f0708c102 mimic-1.2.0.2.tar.gz ++sha256 3483b3dc0771c7ac4dd995127f4ce5533378f623eb7f5ff85dbb96148267ea05 mimic-f7c10fad5758dae477f4d77cb21d9c40d3c98705.tar.gz diff --git a/package/mimic/mimic.mk b/package/mimic/mimic.mk -index 2d246561c9..a64b3d50bb 100644 +index 2d246561c9..0c60e0874e 100644 --- a/package/mimic/mimic.mk +++ b/package/mimic/mimic.mk @@ -4,12 +4,12 @@ @@ -60,8 +73,9 @@ index 2d246561c9..a64b3d50bb 100644 ################################################################################ -MIMIC_VERSION = 1.1.0 -+MIMIC_VERSION = 1.2.0.2 - MIMIC_SITE = $(call github,MycroftAI,mimic,$(MIMIC_VERSION)) +-MIMIC_SITE = $(call github,MycroftAI,mimic,$(MIMIC_VERSION)) ++MIMIC_VERSION = f7c10fad5758dae477f4d77cb21d9c40d3c98705 ++MIMIC_SITE = $(call github,MycroftAI,mimic1,$(MIMIC_VERSION)) MIMIC_LICENSE = MIT MIMIC_LICENSE_FILES = COPYING - @@ -71,13 +85,13 @@ index 2d246561c9..a64b3d50bb 100644 ifeq ($(BR2_PACKAGE_MIMIC_AUDIO_BACKEND_ALSA),y) MIMIC_AUDIO_BACKEND = alsa -@@ -24,6 +24,12 @@ else ifeq ($(BR2_PACKAGE_MIMIC_AUDIO_BACKEND_NONE),y) +@@ -24,6 +24,13 @@ else ifeq ($(BR2_PACKAGE_MIMIC_AUDIO_BACKEND_NONE),y) MIMIC_AUDIO_BACKEND = none endif -MIMIC_CONF_OPTS += --with-audio=$(MIMIC_AUDIO_BACKEND) +define MIMIC_RUN_AUTOGEN -+ cd $(@D) && PATH=$(BR_PATH) ./autogen.sh ++ cd $(@D) && PATH=$(BR_PATH) ./autogen.sh +endef + +MIMIC_CONF_OPTS += --prefix="/usr/local" --with-audio=$(MIMIC_AUDIO_BACKEND) @@ -85,6 +99,7 @@ index 2d246561c9..a64b3d50bb 100644 +MIMIC_PRE_CONFIGURE_HOOKS += MIMIC_RUN_AUTOGEN $(eval $(autotools-package)) ++ -- 2.11.0 diff --git a/buildroot-patches/0003-Update-python-netifaces-to-0.10.7.patch b/buildroot-patches/0003-Downgrade-python-netifaces-to-0.10.7.patch similarity index 58% rename from buildroot-patches/0003-Update-python-netifaces-to-0.10.7.patch rename to buildroot-patches/0003-Downgrade-python-netifaces-to-0.10.7.patch index 24655a42..aa075a67 100644 --- a/buildroot-patches/0003-Update-python-netifaces-to-0.10.7.patch +++ b/buildroot-patches/0003-Downgrade-python-netifaces-to-0.10.7.patch @@ -1,7 +1,7 @@ -From 2415c0b9d58a14000fe889400a560f037ba0aa28 Mon Sep 17 00:00:00 2001 +From 701652ba2883b1032c26ba3e33c253f55d69a0e5 Mon Sep 17 00:00:00 2001 From: Peter Steenbergen -Date: Mon, 29 Oct 2018 14:13:00 +0100 -Subject: [PATCH 1/1] Update python-netifaces to 0.10.7 +Date: Tue, 3 Dec 2019 16:25:14 +0100 +Subject: [PATCH 1/1] Downgrade python-netifaces to 0.10.7 --- package/python-netifaces/python-netifaces.hash | 1 + @@ -9,30 +9,32 @@ Subject: [PATCH 1/1] Update python-netifaces to 0.10.7 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/python-netifaces/python-netifaces.hash b/package/python-netifaces/python-netifaces.hash -index 335f907d59..9b07d58082 100644 +index f59208014b..fde136fe62 100644 --- a/package/python-netifaces/python-netifaces.hash +++ b/package/python-netifaces/python-netifaces.hash -@@ -1,3 +1,4 @@ - # md5 from https://pypi.python.org/pypi/netifaces/json, sha256 locally computed - md5 1d424cb5ef52907c5ab913011122a98b netifaces-0.10.6.tar.gz - sha256 0c4da523f36d36f1ef92ee183f2512f3ceb9a9d2a45f7d19cda5a42c6689ebe0 netifaces-0.10.6.tar.gz +@@ -1,5 +1,6 @@ + # md5, sha256 from https://pypi.org/pypi/netifaces/json + md5 de92cc322b4f56047c073f802ad77860 netifaces-0.10.9.tar.gz + sha256 2dee9ffdd16292878336a58d04a20f0ffe95555465fee7c9bd23b3490ef2abf3 netifaces-0.10.9.tar.gz +sha256 bd590fcb75421537d4149825e1e63cca225fd47dad861710c46bd1cb329d8cbd netifaces-0.10.7.tar.gz + # Locally computed sha256 checksums + sha256 b20b895164b72b9cc0170e6c0d60b14f9aaacc6862c0556eed41eaa348883705 LICENSE diff --git a/package/python-netifaces/python-netifaces.mk b/package/python-netifaces/python-netifaces.mk -index 3258be7a95..3a287d0b0d 100644 +index 502529c008..101702e454 100644 --- a/package/python-netifaces/python-netifaces.mk +++ b/package/python-netifaces/python-netifaces.mk @@ -4,9 +4,9 @@ # ################################################################################ --PYTHON_NETIFACES_VERSION = 0.10.6 +-PYTHON_NETIFACES_VERSION = 0.10.9 +PYTHON_NETIFACES_VERSION = 0.10.7 PYTHON_NETIFACES_SOURCE = netifaces-$(PYTHON_NETIFACES_VERSION).tar.gz --PYTHON_NETIFACES_SITE = https://pypi.python.org/packages/72/01/ba076082628901bca750bf53b322a8ff10c1d757dc29196a8e6082711c9d +-PYTHON_NETIFACES_SITE = https://files.pythonhosted.org/packages/0d/18/fd6e9c71a35b67a73160ec80a49da63d1eed2d2055054cc2995714949132 +PYTHON_NETIFACES_SITE = https://files.pythonhosted.org/packages/81/39/4e9a026265ba944ddf1fea176dbb29e0fe50c43717ba4fcf3646d099fe38 PYTHON_NETIFACES_LICENSE = MIT - PYTHON_NETIFACES_LICENSE_FILES = README.rst + PYTHON_NETIFACES_LICENSE_FILES = LICENSE PYTHON_NETIFACES_SETUP_TYPE = setuptools -- -2.11.0 +2.24.0.rc1 diff --git a/buildroot-patches/0004-Downgrade-python-pillow-to-4.1.1.patch b/buildroot-patches/0004-Downgrade-python-pillow-to-4.1.1.patch deleted file mode 100644 index 95721762..00000000 --- a/buildroot-patches/0004-Downgrade-python-pillow-to-4.1.1.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 78f8690894cf7fe98b16a08a6f98cbb15b2c1fa3 Mon Sep 17 00:00:00 2001 -From: Peter Steenbergen -Date: Mon, 7 Jan 2019 14:12:49 +0100 -Subject: [PATCH 1/1] Downgrade python-pillow to 4.1.1 - ---- - package/python-pillow/python-pillow.hash | 1 + - package/python-pillow/python-pillow.mk | 4 ++-- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash -index 0f90a0be18..607b5d8b2b 100644 ---- a/package/python-pillow/python-pillow.hash -+++ b/package/python-pillow/python-pillow.hash -@@ -2,3 +2,4 @@ - # sha256 for LICENSE locally computed - sha256 f8b3d413c5a8f84b12cd4c5df1d8e211777c9852c6be3ee9c094b626644d3eab Pillow-5.2.0.tar.gz - sha256 4960fc18becc286be839c8ff17bd70cd5222533f761129142153443718a25199 LICENSE -+sha256 00b6a5f28d00f720235a937ebc2f50f4292a5c7e2d6ab9a8b26153b625c4f431 Pillow-4.1.1.tar.gz -diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk -index c3a3d13315..227a664dde 100644 ---- a/package/python-pillow/python-pillow.mk -+++ b/package/python-pillow/python-pillow.mk -@@ -4,9 +4,9 @@ - # - ################################################################################ - --PYTHON_PILLOW_VERSION = 5.2.0 -+PYTHON_PILLOW_VERSION = 4.1.1 - PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz --PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/d3/c4/b45b9c0d549f482dd072055e2d3ced88f3b977f7b87c7a990228b20e7da1 -+PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/93/73/66854f63b1941aad9af18a1de59f9cf95ad1a87c801540222e332f6688d7 - PYTHON_PILLOW_LICENSE = PIL Software License - PYTHON_PILLOW_LICENSE_FILES = LICENSE - PYTHON_PILLOW_SETUP_TYPE = setuptools --- -2.11.0 - diff --git a/buildroot-patches/0005-Downgrade-python-protobuf-to-3.0.0b2.patch b/buildroot-patches/0005-Downgrade-python-protobuf-to-3.0.0b2.patch deleted file mode 100644 index af43c9ef..00000000 --- a/buildroot-patches/0005-Downgrade-python-protobuf-to-3.0.0b2.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 40f89d39b97402d83b2a49f05ddd7ff9031ac269 Mon Sep 17 00:00:00 2001 -From: Peter Steenbergen -Date: Mon, 29 Oct 2018 14:17:39 +0100 -Subject: [PATCH 1/1] Downgrade python-protobuf to 3.0.0b2 - ---- - package/python-protobuf/Config.in | 12 ++---------- - package/python-protobuf/python-protobuf.hash | 5 ++--- - package/python-protobuf/python-protobuf.mk | 7 +++---- - 3 files changed, 7 insertions(+), 17 deletions(-) - -diff --git a/package/python-protobuf/Config.in b/package/python-protobuf/Config.in -index 8a70e80ad7..5cb57da16e 100644 ---- a/package/python-protobuf/Config.in -+++ b/package/python-protobuf/Config.in -@@ -1,14 +1,6 @@ - config BR2_PACKAGE_PYTHON_PROTOBUF - bool "python-protobuf" -- # host-protobuf only builds on certain architectures -- depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" -- depends on BR2_HOST_GCC_AT_LEAST_4_8 # host-protobuf -- select BR2_PACKAGE_PYTHON_SIX # runtime - help -- Python implementation of the Google Protocol Buffers. -+ Protocol Buffers are Google’s data interchange format. - -- Protocol buffers are Google's language-neutral, -- platform-neutral, extensible mechanism for serializing -- structured data. -- -- https://github.com/protobuf-c/protobuf-c -+ https://developers.google.com/protocol-buffers/ -diff --git a/package/python-protobuf/python-protobuf.hash b/package/python-protobuf/python-protobuf.hash -index 652751c7b6..23882135d6 100644 ---- a/package/python-protobuf/python-protobuf.hash -+++ b/package/python-protobuf/python-protobuf.hash -@@ -1,3 +1,2 @@ --# Locally calculated --sha256 6b399412cd68c7efe64d31824ad0db44f803aed91d0c6a9ea94272682c3da2df protobuf-python-3.6.0.tar.gz --sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE -+# md5, sha256 from https://pypi.org/pypi/pyee/json -+sha256 d5b560bbc4b7d97cc2455c05cad9299d9db02d7bd11193b05684e3a86303c229 protobuf-3.0.0b2.tar.gz -diff --git a/package/python-protobuf/python-protobuf.mk b/package/python-protobuf/python-protobuf.mk -index b91ba49339..3ada34dbae 100644 ---- a/package/python-protobuf/python-protobuf.mk -+++ b/package/python-protobuf/python-protobuf.mk -@@ -4,13 +4,12 @@ - # - ################################################################################ - --PYTHON_PROTOBUF_VERSION = $(PROTOBUF_VERSION) --PYTHON_PROTOBUF_SOURCE = protobuf-python-$(PYTHON_PROTOBUF_VERSION).tar.gz --PYTHON_PROTOBUF_SITE = $(PROTOBUF_SITE) -+PYTHON_PROTOBUF_VERSION = 3.0.0b2 -+PYTHON_PROTOBUF_SOURCE = protobuf-$(PYTHON_PROTOBUF_VERSION).tar.gz -+PYTHON_PROTOBUF_SITE = https://files.pythonhosted.org/packages/21/e4/b27b31f5c8a650af6c9bb4f3626d411f855a5668d334d4c7419da58c0d9f - PYTHON_PROTOBUF_LICENSE = BSD-3-Clause - PYTHON_PROTOBUF_LICENSE_FILES = LICENSE - PYTHON_PROTOBUF_DEPENDENCIES = host-protobuf - PYTHON_PROTOBUF_SETUP_TYPE = setuptools --PYTHON_PROTOBUF_SUBDIR = python - - $(eval $(python-package)) --- -2.11.0 - diff --git a/buildroot-patches/0006-Downgrade-python-psutil-to-5.2.1.patch b/buildroot-patches/0006-Downgrade-python-psutil-to-5.2.1.patch index 9c8f3e5b..37f3f4b9 100644 --- a/buildroot-patches/0006-Downgrade-python-psutil-to-5.2.1.patch +++ b/buildroot-patches/0006-Downgrade-python-psutil-to-5.2.1.patch @@ -1,6 +1,6 @@ -From 66186ddaab483955112c35a527cf03eaeb13a42c Mon Sep 17 00:00:00 2001 +From 098fca8b97aafe3c6d92d93c7abf6b9c931e292b Mon Sep 17 00:00:00 2001 From: Peter Steenbergen -Date: Mon, 7 Jan 2019 14:49:01 +0100 +Date: Tue, 3 Dec 2019 16:31:35 +0100 Subject: [PATCH 1/1] Downgrade python-psutil to 5.2.1 --- @@ -9,32 +9,32 @@ Subject: [PATCH 1/1] Downgrade python-psutil to 5.2.1 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/python-psutil/python-psutil.hash b/package/python-psutil/python-psutil.hash -index 1f44281e29..0599aa8eb1 100644 +index 3081e41540..5a6d45124a 100644 --- a/package/python-psutil/python-psutil.hash +++ b/package/python-psutil/python-psutil.hash @@ -1,5 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/psutil/json - md5 0f08bf02400f81c28c4581619ca3e6cb psutil-5.4.8.tar.gz - sha256 6e265c8f3da00b015d24b842bfeb111f856b13d24f2c57036582568dc650d6c3 psutil-5.4.8.tar.gz + md5 7ca9d297c23ca0074c1cf173bed061b0 psutil-5.6.4.tar.gz + sha256 512e854d68f8b42f79b2c7864d997b39125baff9bcff00028ce43543867de7c4 psutil-5.6.4.tar.gz +sha256 fe0ea53b302f68fca1c2a3bac289e11344456786141b73391ed4022b412d5455 psutil-5.2.1.tar.gz # Locally computed sha256 checksums - sha256 bb073826b0dfb43b631c38ad5d9844cda74cc631d2a5569ad8798be4274a3e17 LICENSE + sha256 24c12984500caa07ffdce19eebc06396c5e6d244b573bc6c438f4a6ef8e56c1b LICENSE diff --git a/package/python-psutil/python-psutil.mk b/package/python-psutil/python-psutil.mk -index 18567702bc..162d1b7f50 100644 +index 0edf1c669b..162d1b7f50 100644 --- a/package/python-psutil/python-psutil.mk +++ b/package/python-psutil/python-psutil.mk @@ -4,9 +4,9 @@ # ################################################################################ --PYTHON_PSUTIL_VERSION = 5.4.8 +-PYTHON_PSUTIL_VERSION = 5.6.4 +PYTHON_PSUTIL_VERSION = 5.2.1 PYTHON_PSUTIL_SOURCE = psutil-$(PYTHON_PSUTIL_VERSION).tar.gz --PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/e3/58/0eae6e4466e5abf779d7e2b71fac7fba5f59e00ea36ddb3ed690419ccb0f +-PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/47/ea/d3b6d6fd0b4a6c12984df652525f394e68c8678d2b05075219144eb3a1cf +PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/b8/47/c85fbcd23f40892db6ecc88782beb6ee66d22008c2f9821d777cb1984240 PYTHON_PSUTIL_SETUP_TYPE = setuptools PYTHON_PSUTIL_LICENSE = BSD-3-Clause PYTHON_PSUTIL_LICENSE_FILES = LICENSE -- -2.11.0 +2.24.0.rc1 diff --git a/buildroot-patches/0009-Downgrade-python-six-to-1.10.0.patch b/buildroot-patches/0009-Downgrade-python-six-to-1.10.0.patch deleted file mode 100644 index d1658bb9..00000000 --- a/buildroot-patches/0009-Downgrade-python-six-to-1.10.0.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a568b4834a1633fd204b31e9eb125f8e6bc66186 Mon Sep 17 00:00:00 2001 -From: Peter Steenbergen -Date: Mon, 29 Oct 2018 14:30:21 +0100 -Subject: [PATCH 1/1] Downgrade python-six to 1.10.0 - ---- - package/python-six/python-six.hash | 1 + - package/python-six/python-six.mk | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/package/python-six/python-six.hash b/package/python-six/python-six.hash -index f9dbf09eaa..4db18ac16e 100644 ---- a/package/python-six/python-six.hash -+++ b/package/python-six/python-six.hash -@@ -2,3 +2,4 @@ - md5 d12789f9baf7e9fb2524c0c64f1773f8 six-1.11.0.tar.gz - sha256 70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9 six-1.11.0.tar.gz - sha256 63478682e84e8c98f4c46308995f1f521a6886976e25421827d2a2be03581328 LICENSE -+sha256 105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a six-1.10.0.tar.gz -diff --git a/package/python-six/python-six.mk b/package/python-six/python-six.mk -index cd80634233..b9a5722949 100644 ---- a/package/python-six/python-six.mk -+++ b/package/python-six/python-six.mk -@@ -4,7 +4,7 @@ - # - ################################################################################ - --PYTHON_SIX_VERSION = 1.11.0 -+PYTHON_SIX_VERSION = 1.10.0 - PYTHON_SIX_SOURCE = six-$(PYTHON_SIX_VERSION).tar.gz - PYTHON_SIX_SITE = https://pypi.python.org/packages/16/d8/bc6316cf98419719bd59c91742194c111b6f2e85abac88e496adefaf7afe - PYTHON_SIX_SETUP_TYPE = setuptools --- -2.11.0 - diff --git a/buildroot-patches/0009-Upgrade-python-six-to-1.13.0.patch b/buildroot-patches/0009-Upgrade-python-six-to-1.13.0.patch new file mode 100644 index 00000000..fd66782b --- /dev/null +++ b/buildroot-patches/0009-Upgrade-python-six-to-1.13.0.patch @@ -0,0 +1,40 @@ +From 87471715ae7e2c663211556ab20c02dc4b205247 Mon Sep 17 00:00:00 2001 +From: Peter Steenbergen +Date: Sun, 24 Nov 2019 11:37:14 +0100 +Subject: [PATCH 1/1] Upgrade python-six to 1.13.0 + +--- + package/python-six/python-six.hash | 1 + + package/python-six/python-six.mk | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/package/python-six/python-six.hash b/package/python-six/python-six.hash +index b7262b12b1..6102e8356e 100644 +--- a/package/python-six/python-six.hash ++++ b/package/python-six/python-six.hash +@@ -1,5 +1,6 @@ + # md5, sha256 from https://pypi.org/pypi/six/json + md5 9ae5d1feed8c0215f4ae4adcd9207fcb six-1.12.0.tar.gz + sha256 d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73 six-1.12.0.tar.gz ++sha256 30f610279e8b2578cab6db20741130331735c781b56053c59c4076da27f06b66 six-1.13.0.tar.gz + # Locally computed sha256 checksums + sha256 e732f54da58f3e9cf0c48e8b512948936fcf7361bd58afa63a9a3c392bf794ad LICENSE +diff --git a/package/python-six/python-six.mk b/package/python-six/python-six.mk +index 95817fa34b..906c268d74 100644 +--- a/package/python-six/python-six.mk ++++ b/package/python-six/python-six.mk +@@ -4,9 +4,9 @@ + # + ################################################################################ + +-PYTHON_SIX_VERSION = 1.12.0 ++PYTHON_SIX_VERSION = 1.13.0 + PYTHON_SIX_SOURCE = six-$(PYTHON_SIX_VERSION).tar.gz +-PYTHON_SIX_SITE = https://files.pythonhosted.org/packages/dd/bf/4138e7bfb757de47d1f4b6994648ec67a51efe58fa907c1e11e350cddfca ++PYTHON_SIX_SITE = https://files.pythonhosted.org/packages/94/3e/edcf6fef41d89187df7e38e868b2dd2182677922b600e880baad7749c865 + PYTHON_SIX_SETUP_TYPE = setuptools + PYTHON_SIX_LICENSE = MIT + PYTHON_SIX_LICENSE_FILES = LICENSE +-- +2.24.0.rc1 + diff --git a/buildroot-patches/0011-Downgrade-python-websocket-client-to-0.32.0.patch b/buildroot-patches/0011-Downgrade-python-websocket-client-to-0.32.0.patch deleted file mode 100644 index 9551f81e..00000000 --- a/buildroot-patches/0011-Downgrade-python-websocket-client-to-0.32.0.patch +++ /dev/null @@ -1,41 +0,0 @@ -From c892ecacb1d15bf3a4abf8b581b0ed885481b3cc Mon Sep 17 00:00:00 2001 -From: Peter Steenbergen -Date: Mon, 29 Oct 2018 14:45:31 +0100 -Subject: [PATCH 1/1] Downgrade python-websocket-client to 0.32.0 - ---- - package/python-websocket-client/python-websocket-client.hash | 1 + - package/python-websocket-client/python-websocket-client.mk | 5 +++-- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/package/python-websocket-client/python-websocket-client.hash b/package/python-websocket-client/python-websocket-client.hash -index 3672ca074b..3d95213b55 100644 ---- a/package/python-websocket-client/python-websocket-client.hash -+++ b/package/python-websocket-client/python-websocket-client.hash -@@ -2,3 +2,4 @@ - md5 790b3ecb5364293ad70c59a1b92debb1 websocket_client-0.47.0.tar.gz - sha256 a453dc4dfa6e0db3d8fd7738a308a88effe6240c59f3226eb93e8f020c216149 websocket_client-0.47.0.tar.gz - sha256 e580b2a1a57c33085dd6a07cff693d828f7c3fa8a11ce56ade2a62c46951930d LICENSE -+sha256 cb3ab95617ed2098d24723e3ad04ed06c4fde661400b96daa1859af965bfe040 websocket_client-0.32.0.tar.gz -diff --git a/package/python-websocket-client/python-websocket-client.mk b/package/python-websocket-client/python-websocket-client.mk -index 58c8407db3..40789b5056 100644 ---- a/package/python-websocket-client/python-websocket-client.mk -+++ b/package/python-websocket-client/python-websocket-client.mk -@@ -4,11 +4,12 @@ - # - ################################################################################ - --PYTHON_WEBSOCKET_CLIENT_VERSION = 0.47.0 -+PYTHON_WEBSOCKET_CLIENT_VERSION = 0.32.0 - PYTHON_WEBSOCKET_CLIENT_SOURCE = websocket_client-$(PYTHON_WEBSOCKET_CLIENT_VERSION).tar.gz --PYTHON_WEBSOCKET_CLIENT_SITE = https://pypi.python.org/packages/c9/bb/8d3dd9063cfe0cd5d03fe6a1f74ddd948f384e9c1eff0eb978f3976a7d27 -+PYTHON_WEBSOCKET_CLIENT_SITE = https://files.pythonhosted.org/packages/f4/06/5552e64fee863aa9decbb4e46dccc05fe730a36f49f0d6427398837297da - PYTHON_WEBSOCKET_CLIENT_SETUP_TYPE = setuptools - PYTHON_WEBSOCKET_CLIENT_LICENSE = LGPL-2.1+ - PYTHON_WEBSOCKET_CLIENT_LICENSE_FILES = LICENSE - - $(eval $(python-package)) -+$(eval $(host-python-package)) --- -2.11.0 - diff --git a/buildroot-patches/0011-Downgrade-python-websocket-client-to-0.54.0.patch b/buildroot-patches/0011-Downgrade-python-websocket-client-to-0.54.0.patch new file mode 100644 index 00000000..58c0c7e5 --- /dev/null +++ b/buildroot-patches/0011-Downgrade-python-websocket-client-to-0.54.0.patch @@ -0,0 +1,40 @@ +From ef65c12a6bbcf4e6bf329d7b7e654f30414aac77 Mon Sep 17 00:00:00 2001 +From: Peter Steenbergen +Date: Tue, 3 Dec 2019 16:36:04 +0100 +Subject: [PATCH 1/1] Downgrade python-websocket-client to 0.54.0 + +--- + package/python-websocket-client/python-websocket-client.hash | 1 + + package/python-websocket-client/python-websocket-client.mk | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/package/python-websocket-client/python-websocket-client.hash b/package/python-websocket-client/python-websocket-client.hash +index 735cb53e1c..a740da5245 100644 +--- a/package/python-websocket-client/python-websocket-client.hash ++++ b/package/python-websocket-client/python-websocket-client.hash +@@ -1,5 +1,6 @@ + # md5, sha256 from https://pypi.org/pypi/websocket-client/json + md5 89484bd5dac71123ae6a09b2f90fe62c websocket_client-0.56.0.tar.gz + sha256 1fd5520878b68b84b5748bb30e592b10d0a91529d5383f74f4964e72b297fd3a websocket_client-0.56.0.tar.gz ++sha256 e51562c91ddb8148e791f0155fdb01325d99bb52c4cdbb291aee7a3563fd0849 websocket_client-0.54.0.tar.gz + # Locally computed sha256 checksums + sha256 a47b06717e8a3cf01d1307141287b1b4fa17fe4bb8785633d2fc6f57cb71d05e LICENSE +diff --git a/package/python-websocket-client/python-websocket-client.mk b/package/python-websocket-client/python-websocket-client.mk +index 518f7b29a9..98cc941efe 100644 +--- a/package/python-websocket-client/python-websocket-client.mk ++++ b/package/python-websocket-client/python-websocket-client.mk +@@ -4,9 +4,9 @@ + # + ################################################################################ + +-PYTHON_WEBSOCKET_CLIENT_VERSION = 0.56.0 ++PYTHON_WEBSOCKET_CLIENT_VERSION = 0.54.0 + PYTHON_WEBSOCKET_CLIENT_SOURCE = websocket_client-$(PYTHON_WEBSOCKET_CLIENT_VERSION).tar.gz +-PYTHON_WEBSOCKET_CLIENT_SITE = https://files.pythonhosted.org/packages/c5/01/8c9c7de6c46f88e70b5a3276c791a2be82ae83d8e0d0cc030525ee2866fd ++PYTHON_WEBSOCKET_CLIENT_SITE = https://files.pythonhosted.org/packages/35/d4/14e446a82bc9172d088ebd81c0b02c5ca8481bfeecb13c9ef07998f9249b + PYTHON_WEBSOCKET_CLIENT_SETUP_TYPE = setuptools + # Project was under LGPL-2.1+, but was relicensed under + # BSD-3-Clause. The LICENSE file contains the BSD-3-Clause text, but +-- +2.24.0.rc1 + diff --git a/buildroot-patches/0012-Add-host-openssl-dependency-to-python3.patch b/buildroot-patches/0012-Add-host-openssl-dependency-to-python3.patch deleted file mode 100644 index 49b32666..00000000 --- a/buildroot-patches/0012-Add-host-openssl-dependency-to-python3.patch +++ /dev/null @@ -1,35 +0,0 @@ -From f1468008e466ce9aa27449c98ce775b292945190 Mon Sep 17 00:00:00 2001 -From: Peter Steenbergen -Date: Mon, 7 Jan 2019 16:59:08 +0100 -Subject: [PATCH 1/1] Add host-openssl dependency to python3 - ---- - package/python3/python3.mk | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/package/python3/python3.mk b/package/python3/python3.mk -index 8fbb95b9ad..0f8cce45dc 100644 ---- a/package/python3/python3.mk -+++ b/package/python3/python3.mk -@@ -26,8 +26,7 @@ HOST_PYTHON3_CONF_OPTS += \ - --enable-unicodedata \ - --disable-test-modules \ - --disable-idle3 \ -- --disable-ossaudiodev \ -- --disable-openssl -+ --disable-ossaudiodev - - # Make sure that LD_LIBRARY_PATH overrides -rpath. - # This is needed because libpython may be installed at the same time that -@@ -40,7 +39,7 @@ HOST_PYTHON3_CONF_ENV += \ - - PYTHON3_DEPENDENCIES = host-python3 libffi - --HOST_PYTHON3_DEPENDENCIES = host-expat host-zlib host-libffi -+HOST_PYTHON3_DEPENDENCIES = host-expat host-zlib host-libffi host-openssl - - PYTHON3_INSTALL_STAGING = YES - --- -2.11.0 - diff --git a/buildroot-patches/0013-Bump-rpi-firmware-to-version-e1bd9b0b8cda901ee9b23cbb8b3334cde71320a7.patch b/buildroot-patches/0013-Bump-rpi-firmware-to-version-e1bd9b0b8cda901ee9b23cbb8b3334cde71320a7.patch deleted file mode 100644 index 19c96896..00000000 --- a/buildroot-patches/0013-Bump-rpi-firmware-to-version-e1bd9b0b8cda901ee9b23cbb8b3334cde71320a7.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 5a4474b1d8d7d5f59d7de05a64360d46c39241cd Mon Sep 17 00:00:00 2001 -From: Peter Steenbergen -Date: Mon, 7 Jan 2019 17:11:18 +0100 -Subject: [PATCH 1/1] Bump rpi-firmware to version: - e1bd9b0b8cda901ee9b23cbb8b3334cde71320a7 - ---- - package/rpi-firmware/rpi-firmware.hash | 2 +- - package/rpi-firmware/rpi-firmware.mk | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/package/rpi-firmware/rpi-firmware.hash b/package/rpi-firmware/rpi-firmware.hash -index 728c53fe9a..85b760fa9b 100644 ---- a/package/rpi-firmware/rpi-firmware.hash -+++ b/package/rpi-firmware/rpi-firmware.hash -@@ -1,2 +1,2 @@ - # Locally computed --sha256 57c56e9e41a2d9b1ce660aa7887db5c4b44f768fc63c6b6ef1d2fe460a090d85 rpi-firmware-fbad6408c4596d3d671736ee0571aae444f24e68.tar.gz -+sha256 58dc9d1080582964943b509ed9444602ce7fb50c1124199d3f06a5b121aa0706 rpi-firmware-e1bd9b0b8cda901ee9b23cbb8b3334cde71320a7.tar.gz -diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk -index bb54904ae6..70985880e9 100644 ---- a/package/rpi-firmware/rpi-firmware.mk -+++ b/package/rpi-firmware/rpi-firmware.mk -@@ -4,7 +4,7 @@ - # - ################################################################################ - --RPI_FIRMWARE_VERSION = fbad6408c4596d3d671736ee0571aae444f24e68 -+RPI_FIRMWARE_VERSION = e1bd9b0b8cda901ee9b23cbb8b3334cde71320a7 - RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION)) - RPI_FIRMWARE_LICENSE = BSD-3-Clause - RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom --- -2.11.0 - diff --git a/buildroot-patches/0014-Downgrade-python-requests-to-2.20.0.patch b/buildroot-patches/0014-Downgrade-python-requests-to-2.20.0.patch index 21ea1b32..77b0ed4f 100644 --- a/buildroot-patches/0014-Downgrade-python-requests-to-2.20.0.patch +++ b/buildroot-patches/0014-Downgrade-python-requests-to-2.20.0.patch @@ -1,6 +1,6 @@ -From eda2b1e6268b4410f62e220c7565528c75657d38 Mon Sep 17 00:00:00 2001 +From eee6e117ed8af312a85cc0f564146d468c43b1a3 Mon Sep 17 00:00:00 2001 From: Peter Steenbergen -Date: Tue, 8 Jan 2019 14:42:40 +0100 +Date: Mon, 28 Oct 2019 14:24:52 +0100 Subject: [PATCH 1/1] Downgrade python-requests to 2.20.0 --- @@ -9,28 +9,28 @@ Subject: [PATCH 1/1] Downgrade python-requests to 2.20.0 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/python-requests/python-requests.hash b/package/python-requests/python-requests.hash -index e3b77744af..f7d20ab1a3 100644 +index 42f45d3a44..c7c1e0f427 100644 --- a/package/python-requests/python-requests.hash +++ b/package/python-requests/python-requests.hash @@ -1,5 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/requests/json - md5 2918817ea4688f4ea21cb4b11e353448 requests-2.20.1.tar.gz - sha256 ea881206e59f41dbd0bd445437d792e43906703fff75ca8ff43ccdb11f33f263 requests-2.20.1.tar.gz + md5 ee28bee2de76e9198fc41e48f3a7dd47 requests-2.22.0.tar.gz + sha256 11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4 requests-2.22.0.tar.gz +sha256 99dcfdaaeb17caf6e526f32b6a7b780461512ab3f1d992187801694cba42770c requests-2.20.0.tar.gz # Locally computed sha256 checksums sha256 be41abac2c40f8530307e8d172c590b476f4a488bc6a68f8de57b7cf64786687 LICENSE diff --git a/package/python-requests/python-requests.mk b/package/python-requests/python-requests.mk -index 0c327759b0..358835d816 100644 +index e64db94523..358835d816 100644 --- a/package/python-requests/python-requests.mk +++ b/package/python-requests/python-requests.mk @@ -4,9 +4,9 @@ # ################################################################################ --PYTHON_REQUESTS_VERSION = 2.20.1 +-PYTHON_REQUESTS_VERSION = 2.22.0 +PYTHON_REQUESTS_VERSION = 2.20.0 PYTHON_REQUESTS_SOURCE = requests-$(PYTHON_REQUESTS_VERSION).tar.gz --PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/40/35/298c36d839547b50822985a2cf0611b3b978a5ab7a5af5562b8ebe3e1369 +-PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/01/62/ddcf76d1d19885e8579acb1b1df26a852b03472c0e46d2b959a714c90608 +PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/97/10/92d25b93e9c266c94b76a5548f020f3f1dd0eb40649cb1993532c0af8f4c PYTHON_REQUESTS_SETUP_TYPE = setuptools PYTHON_REQUESTS_LICENSE = Apache-2.0 diff --git a/buildroot-patches/0016-Install-glibc-locale-binary-into-target.patch b/buildroot-patches/0016-Install-glibc-locale-binary-into-target.patch new file mode 100644 index 00000000..55f5bad7 --- /dev/null +++ b/buildroot-patches/0016-Install-glibc-locale-binary-into-target.patch @@ -0,0 +1,25 @@ +From 0d0a3cd42688a792b6845482fccf2985b12cf631 Mon Sep 17 00:00:00 2001 +From: Peter Steenbergen +Date: Mon, 28 Oct 2019 14:31:47 +0100 +Subject: [PATCH 1/1] Install glibc locale binary into target + +--- + package/glibc/glibc.mk | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk +index 68c6670007..ba28b668b0 100644 +--- a/package/glibc/glibc.mk ++++ b/package/glibc/glibc.mk +@@ -144,6 +144,8 @@ GLIBC_LIBS_LIB += libthread_db.so.* + endif + + define GLIBC_INSTALL_TARGET_CMDS ++ $(INSTALL) -m 0755 -D $(@D)/build/locale/locale \ ++ $(TARGET_DIR)/usr/bin/locale + for libpattern in $(GLIBC_LIBS_LIB); do \ + $(call copy_toolchain_lib_root,$$libpattern) ; \ + done +-- +2.11.0 + diff --git a/buildroot-patches/0017-Downgrade-python-pyjwt-to-1.6.4.patch b/buildroot-patches/0017-Downgrade-python-pyjwt-to-1.6.4.patch new file mode 100644 index 00000000..11e6abfe --- /dev/null +++ b/buildroot-patches/0017-Downgrade-python-pyjwt-to-1.6.4.patch @@ -0,0 +1,40 @@ +From 3bee492eb3f991b66401e4d47730e02dd59bca99 Mon Sep 17 00:00:00 2001 +From: Peter Steenbergen +Date: Mon, 2 Sep 2019 20:37:58 +0200 +Subject: [PATCH 1/1] Downgrade python-pyjwt to 1.6.4 + +--- + package/python-pyjwt/python-pyjwt.hash | 1 + + package/python-pyjwt/python-pyjwt.mk | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/package/python-pyjwt/python-pyjwt.hash b/package/python-pyjwt/python-pyjwt.hash +index 62ec3559af..0842d2d899 100644 +--- a/package/python-pyjwt/python-pyjwt.hash ++++ b/package/python-pyjwt/python-pyjwt.hash +@@ -1,5 +1,6 @@ + # md5, sha256 from https://pypi.org/pypi/PyJWT/json + md5 a4712f980c008696e13e09504120b2a0 PyJWT-1.7.1.tar.gz + sha256 8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96 PyJWT-1.7.1.tar.gz ++sha256 4ee413b357d53fd3fb44704577afac88e72e878716116270d722723d65b42176 PyJWT-1.6.4.tar.gz + # Locally computed sha256 checksums + sha256 ec82af815b5f9da8685afb300cc5beb7949e1c22b79b6c1c054796cefdf6cac6 LICENSE +diff --git a/package/python-pyjwt/python-pyjwt.mk b/package/python-pyjwt/python-pyjwt.mk +index dfc66e5651..18b7976b19 100644 +--- a/package/python-pyjwt/python-pyjwt.mk ++++ b/package/python-pyjwt/python-pyjwt.mk +@@ -4,9 +4,9 @@ + # + ################################################################################ + +-PYTHON_PYJWT_VERSION = 1.7.1 ++PYTHON_PYJWT_VERSION = 1.6.4 + PYTHON_PYJWT_SOURCE = PyJWT-$(PYTHON_PYJWT_VERSION).tar.gz +-PYTHON_PYJWT_SITE = https://files.pythonhosted.org/packages/2f/38/ff37a24c0243c5f45f5798bd120c0f873eeed073994133c084e1cf13b95c ++PYTHON_PYJWT_SITE = https://files.pythonhosted.org/packages/00/5e/b358c9bb24421e6155799d995b4aa3aa3307ffc7ecae4ad9d29fd7e07a73 + PYTHON_PYJWT_SETUP_TYPE = setuptools + PYTHON_PYJWT_LICENSE = MIT + PYTHON_PYJWT_LICENSE_FILES = LICENSE +-- +2.11.0 + diff --git a/buildroot-patches/0019-Upgrade-python-cryptography-to-2.8.patch b/buildroot-patches/0019-Upgrade-python-cryptography-to-2.8.patch new file mode 100644 index 00000000..778a2f95 --- /dev/null +++ b/buildroot-patches/0019-Upgrade-python-cryptography-to-2.8.patch @@ -0,0 +1,41 @@ +From de793f43c05fddd7a6153cf9ccd926e5b55e8054 Mon Sep 17 00:00:00 2001 +From: Peter Steenbergen +Date: Sun, 24 Nov 2019 12:07:28 +0100 +Subject: [PATCH 1/1] Upgrade python-cryptography to 2.8 + +--- + package/python-cryptography/python-cryptography.hash | 1 + + package/python-cryptography/python-cryptography.mk | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/package/python-cryptography/python-cryptography.hash b/package/python-cryptography/python-cryptography.hash +index 715beb71d1..c85e6c7a5e 100644 +--- a/package/python-cryptography/python-cryptography.hash ++++ b/package/python-cryptography/python-cryptography.hash +@@ -1,6 +1,7 @@ + # md5, sha256 from https://pypi.org/pypi/cryptography/json + md5 7dfe1035cae43569e571318f000462a4 cryptography-2.7.tar.gz + sha256 e6347742ac8f35ded4a46ff835c60e68c22a536a8ae5c4422966d06946b6d4c6 cryptography-2.7.tar.gz ++sha256 3cda1f0ed8747339bbdf71b9f38ca74c7b592f24f65cdb3ab3765e4b02871651 cryptography-2.8.tar.gz + # Locally computed sha256 checksums + sha256 35452b557fab0efb1e80d7edb9c4e5118b9384082adaa051dde342102cb9de8d LICENSE + sha256 aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe LICENSE.APACHE +diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk +index dad09672eb..54437ae688 100644 +--- a/package/python-cryptography/python-cryptography.mk ++++ b/package/python-cryptography/python-cryptography.mk +@@ -4,9 +4,9 @@ + # + ################################################################################ + +-PYTHON_CRYPTOGRAPHY_VERSION = 2.7 ++PYTHON_CRYPTOGRAPHY_VERSION = 2.8 + PYTHON_CRYPTOGRAPHY_SOURCE = cryptography-$(PYTHON_CRYPTOGRAPHY_VERSION).tar.gz +-PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/c2/95/f43d02315f4ec074219c6e3124a87eba1d2d12196c2767fadfdc07a83884 ++PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/be/60/da377e1bed002716fb2d5d1d1cab720f298cb33ecff7bf7adea72788e4e4 + PYTHON_CRYPTOGRAPHY_SETUP_TYPE = setuptools + PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3-Clause + PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD +-- +2.24.0.rc1 + diff --git a/buildroot-patches/0021-Downgrade-python-dateutil-to-2.7.5.patch b/buildroot-patches/0021-Downgrade-python-dateutil-to-2.7.5.patch new file mode 100644 index 00000000..7b036364 --- /dev/null +++ b/buildroot-patches/0021-Downgrade-python-dateutil-to-2.7.5.patch @@ -0,0 +1,39 @@ +From 49c4b14af92d607156c16a5c0759a01cee0f7268 Mon Sep 17 00:00:00 2001 +From: Peter Steenbergen +Date: Tue, 3 Dec 2019 16:57:10 +0100 +Subject: [PATCH 1/1] Downgrade python-dateutil to 2.7.5 + +--- + package/python-dateutil/python-dateutil.hash | 1 + + package/python-dateutil/python-dateutil.mk | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/package/python-dateutil/python-dateutil.hash b/package/python-dateutil/python-dateutil.hash +index f3dc69f272..834d0b79b5 100644 +--- a/package/python-dateutil/python-dateutil.hash ++++ b/package/python-dateutil/python-dateutil.hash +@@ -1,5 +1,6 @@ + # md5, sha256 from https://pypi.org/pypi/python-dateutil/json + md5 f2a1d4b680b297b367a974664ca3a4f6 python-dateutil-2.8.1.tar.gz + sha256 73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c python-dateutil-2.8.1.tar.gz ++sha256 88f9287c0174266bb0d8cedd395cfba9c58e87e5ad86b2ce58859bc11be3cf02 python-dateutil-2.7.5.tar.gz + # Locally computed sha256 checksums + sha256 ba00f51a0d92823b5a1cde27d8b5b9d2321e67ed8da9bc163eff96d5e17e577e LICENSE +diff --git a/package/python-dateutil/python-dateutil.mk b/package/python-dateutil/python-dateutil.mk +index 759261d2d1..5e90398331 100644 +--- a/package/python-dateutil/python-dateutil.mk ++++ b/package/python-dateutil/python-dateutil.mk +@@ -4,8 +4,8 @@ + # + ################################################################################ + +-PYTHON_DATEUTIL_VERSION = 2.8.1 +-PYTHON_DATEUTIL_SITE = https://files.pythonhosted.org/packages/be/ed/5bbc91f03fa4c839c4c7360375da77f9659af5f7086b7a7bdda65771c8e0 ++PYTHON_DATEUTIL_VERSION = 2.7.5 ++PYTHON_DATEUTIL_SITE = https://files.pythonhosted.org/packages/0e/01/68747933e8d12263d41ce08119620d9a7e5eb72c876a3442257f74490da0 + PYTHON_DATEUTIL_SETUP_TYPE = setuptools + PYTHON_DATEUTIL_LICENSE = BSD-3-Clause + PYTHON_DATEUTIL_LICENSE_FILES = LICENSE +-- +2.24.0.rc1 + diff --git a/buildroot-patches/0025-Downgrade-python-ifaddr-to-0.1.4.patch b/buildroot-patches/0025-Downgrade-python-ifaddr-to-0.1.4.patch new file mode 100644 index 00000000..6507e3ab --- /dev/null +++ b/buildroot-patches/0025-Downgrade-python-ifaddr-to-0.1.4.patch @@ -0,0 +1,50 @@ +From b5914a701cd7d5cdf1eeefd33ea0fa5217a99818 Mon Sep 17 00:00:00 2001 +From: Peter Steenbergen +Date: Mon, 28 Oct 2019 16:05:40 +0100 +Subject: [PATCH 1/1] Downgrade python-ifaddr to 0.1.4 + +--- + package/python-ifaddr/python-ifaddr.hash | 6 ++---- + package/python-ifaddr/python-ifaddr.mk | 14 +++++++++----- + 2 files changed, 11 insertions(+), 9 deletions(-) + +diff --git a/package/python-ifaddr/python-ifaddr.hash b/package/python-ifaddr/python-ifaddr.hash +index 18df40ac4c..6c0a802b4b 100644 +--- a/package/python-ifaddr/python-ifaddr.hash ++++ b/package/python-ifaddr/python-ifaddr.hash +@@ -1,5 +1,3 @@ + # md5, sha256 from https://pypi.org/pypi/ifaddr/json +-md5 cc1b7f0a587ef38491f07e50bf91d82e ifaddr-0.1.6.tar.gz +-sha256 c19c64882a7ad51a394451dabcbbed72e98b5625ec1e79789924d5ea3e3ecb93 ifaddr-0.1.6.tar.gz +-# Locally calculated +-sha256 926c6fdac9ede91ae54c67066597466b04f9b4f956a24f9c77931e7765607b2c setup.py ++md5 37bf17655723fc085156bf7c595abd04 ifaddr-0.1.4.zip ++sha256 cf2a8fbb578da2844d999a0a453825f660ed2d3fc47dcffc5f673dd8de4f0f8b ifaddr-0.1.4.zip +diff --git a/package/python-ifaddr/python-ifaddr.mk b/package/python-ifaddr/python-ifaddr.mk +index 23c4ee365e..d2044f39ca 100644 +--- a/package/python-ifaddr/python-ifaddr.mk ++++ b/package/python-ifaddr/python-ifaddr.mk +@@ -4,11 +4,15 @@ + # + ################################################################################ + +-PYTHON_IFADDR_VERSION = 0.1.6 +-PYTHON_IFADDR_SOURCE = ifaddr-$(PYTHON_IFADDR_VERSION).tar.gz +-PYTHON_IFADDR_SITE = https://files.pythonhosted.org/packages/9f/54/d92bda685093ebc70e2057abfa83ef1b3fb0ae2b6357262a3e19dfe96bb8 ++PYTHON_IFADDR_VERSION = 0.1.4 ++PYTHON_IFADDR_SOURCE = ifaddr-$(PYTHON_IFADDR_VERSION).zip ++PYTHON_IFADDR_SITE = https://files.pythonhosted.org/packages/12/40/97ef30db32e0c798fc557af403ea263dbeae8d334571603f02e19f4021a0 + PYTHON_IFADDR_SETUP_TYPE = setuptools +-PYTHON_IFADDR_LICENSE = MIT +-PYTHON_IFADDR_LICENSE_FILES = setup.py ++ ++define PYTHON_IFADDR_EXTRACT_CMDS ++ $(UNZIP) -d $(@D) $(DL_DIR)/python-ifaddr/$(PYTHON_IFADDR_SOURCE) ++ mv $(@D)/ifaddr-$(PYTHON_IFADDR_VERSION)/* $(@D) ++ $(RM) -r $(@D)/ifaddr-$(PYTHON_IFADDR_VERSION) ++endef + + $(eval $(python-package)) +-- +2.11.0 + diff --git a/buildroot-patches/0026-Downgrade-MPV-back-to-0.27.2.patch b/buildroot-patches/0026-Downgrade-MPV-back-to-0.27.2.patch new file mode 100644 index 00000000..a2131b02 --- /dev/null +++ b/buildroot-patches/0026-Downgrade-MPV-back-to-0.27.2.patch @@ -0,0 +1,284 @@ +From c0890d44021e1be0b3fd32d1c10d9f084061169b Mon Sep 17 00:00:00 2001 +From: Peter Steenbergen +Date: Tue, 29 Oct 2019 08:37:19 +0100 +Subject: [PATCH 1/1] Downgrade MPV back to 0.27.2 + +--- + package/mpv/0003-rpi-fix-linking-errors.patch | 90 ++++++++++++++++++++++++++ + package/mpv/0004-libva20.patch | 93 +++++++++++++++++++++++++++ + package/mpv/Config.in | 1 - + package/mpv/mpv.hash | 3 +- + package/mpv/mpv.mk | 16 +++-- + 5 files changed, 194 insertions(+), 9 deletions(-) + create mode 100644 package/mpv/0003-rpi-fix-linking-errors.patch + create mode 100644 package/mpv/0004-libva20.patch + +diff --git a/package/mpv/0003-rpi-fix-linking-errors.patch b/package/mpv/0003-rpi-fix-linking-errors.patch +new file mode 100644 +index 0000000000..0e65a5a3eb +--- /dev/null ++++ b/package/mpv/0003-rpi-fix-linking-errors.patch +@@ -0,0 +1,90 @@ ++From fe482a600d507dc7ce77f6d154a9e8b395f74fdd Mon Sep 17 00:00:00 2001 ++From: Mahyar Koshkouei ++Date: Tue, 24 Oct 2017 09:47:38 +0100 ++Subject: [PATCH] rpi: fix linking errors ++ ++Fixes linking issues when compiling with Raspberry Pi support. ++ ++Signed-off-by: Mahyar Koshkouei ++--- ++Status: pull request https://github.com/mpv-player/mpv/pull/4883 ++--- ++ waftools/checks/custom.py | 26 +++++++++++++++++++++++++- ++ wscript | 18 +----------------- ++ 2 files changed, 26 insertions(+), 18 deletions(-) ++ ++diff --git a/waftools/checks/custom.py b/waftools/checks/custom.py ++index d8065a3..9086795 100644 ++--- a/waftools/checks/custom.py +++++ b/waftools/checks/custom.py ++@@ -4,7 +4,7 @@ from waflib import Utils ++ import os ++ ++ __all__ = ["check_pthreads", "check_iconv", "check_lua", ++- "check_cocoa", "check_openal"] +++ "check_cocoa", "check_openal", "check_rpi"] ++ ++ pthreads_program = load_fragment('pthreads.c') ++ ++@@ -103,3 +103,27 @@ def check_openal(ctx, dependency_identifier): ++ if fn(ctx, dependency_identifier): ++ return True ++ return False +++ +++def check_rpi(ctx, dependency_identifier): +++ # We need MMAL/bcm_host/dispmanx APIs. +++ # Upstream keeps pkgconfig files in '/opt/vc/lib/pkgconfig'. +++ # See https://github.com/raspberrypi/userland/issues/245 +++ # PKG_CONFIG_SYSROOT_DIR helps with cross compilation. +++ prev_pkg_path = os.getenv('PKG_CONFIG_PATH', '') +++ os.environ['PKG_CONFIG_PATH'] = os.pathsep.join( +++ filter(None, [os.path.join(os.getenv('PKG_CONFIG_SYSROOT_DIR', '/'), +++ 'opt/vc/lib/pkgconfig'), +++ prev_pkg_path])) +++ +++ checks = [ +++ # We still need all OpenGL symbols, because the vo_opengl code is +++ # generic and supports anything from GLES2/OpenGL 2.1 to OpenGL 4 core. +++ check_pkg_config('bcm_host', uselib_store='bcm_host'), +++ check_pkg_config('egl'), +++ check_pkg_config('glesv2'), +++ check_cc(lib=['mmal_core', 'mmal_util', 'mmal_vc_client'], use=['bcm_host']), +++ ] +++ +++ ret = all((fn(ctx, dependency_identifier) for fn in checks)) +++ os.environ['PKG_CONFIG_PATH'] = prev_pkg_path +++ return ret ++diff --git a/wscript b/wscript ++index 9d88588..84e5f2e 100644 ++--- a/wscript +++++ b/wscript ++@@ -732,25 +732,9 @@ video_output_features = [ ++ 'desc': 'Android support', ++ 'func': check_statement('android/api-level.h', '(void)__ANDROID__'), # arbitrary android-specific header ++ }, { ++- # We need MMAL/bcm_host/dispmanx APIs. Also, most RPI distros require ++- # every project to hardcode the paths to the include directories. Also, ++- # these headers are so broken that they spam tons of warnings by merely ++- # including them (compensate with -isystem and -fgnu89-inline). ++ 'name': '--rpi', ++ 'desc': 'Raspberry Pi support', ++- 'func': compose_checks( ++- check_cc(cflags="-isystem/opt/vc/include/ "+ ++- "-isystem/opt/vc/include/interface/vcos/pthreads " + ++- "-isystem/opt/vc/include/interface/vmcs_host/linux " + ++- "-fgnu89-inline", ++- linkflags="-L/opt/vc/lib", ++- header_name="bcm_host.h", ++- lib=['mmal_core', 'mmal_util', 'mmal_vc_client', 'bcm_host']), ++- # We still need all OpenGL symbols, because the vo_opengl code is ++- # generic and supports anything from GLES2/OpenGL 2.1 to OpenGL 4 core. ++- check_cc(lib="EGL"), ++- check_cc(lib="GLESv2"), ++- ), +++ 'func': check_rpi, ++ } , { ++ 'name': '--ios-gl', ++ 'desc': 'iOS OpenGL ES hardware decoding interop support', ++-- ++2.14.2 ++ +diff --git a/package/mpv/0004-libva20.patch b/package/mpv/0004-libva20.patch +new file mode 100644 +index 0000000000..349dd3cb14 +--- /dev/null ++++ b/package/mpv/0004-libva20.patch +@@ -0,0 +1,93 @@ ++From 2ecf240b1cd20875991a5b18efafbe799864ff7f Mon Sep 17 00:00:00 2001 ++From: Mark Thompson ++Date: Mon, 9 Oct 2017 20:10:26 +0100 ++Subject: [PATCH] vaapi: Use libva2 message callbacks ++ ++They are no longer global, so they work vaguely sensibly. ++ ++Downloaded from upstream commit: ++https://github.com/mpv-player/mpv/commit/2ecf240b1cd20875991a5b18efafbe799864ff7f ++ ++Signed-off-by: Bernd Kuhls ++--- ++ video/vaapi.c | 32 +++++++++++++++++++++++++++++--- ++ 1 file changed, 29 insertions(+), 3 deletions(-) ++ ++diff --git a/video/vaapi.c b/video/vaapi.c ++index 6bedbbaa18..3b1cb9cc41 100644 ++--- a/video/vaapi.c +++++ b/video/vaapi.c ++@@ -40,9 +40,27 @@ int va_get_colorspace_flag(enum mp_csp csp) ++ return 0; ++ } ++ ++-// VA message callbacks are global and do not have a context parameter, so it's ++-// impossible to know from which VADisplay they originate. Try to route them ++-// to existing mpv/libmpv instances within this process. +++#if VA_CHECK_VERSION(1, 0, 0) +++static void va_message_callback(void *context, const char *msg, int mp_level) +++{ +++ struct mp_vaapi_ctx *res = context; +++ mp_msg(res->log, mp_level, "libva: %s", msg); +++} +++ +++static void va_error_callback(void *context, const char *msg) +++{ +++ va_message_callback(context, msg, MSGL_ERR); +++} +++ +++static void va_info_callback(void *context, const char *msg) +++{ +++ va_message_callback(context, msg, MSGL_V); +++} +++#else +++// Pre-libva2 VA message callbacks are global and do not have a context +++// parameter, so it's impossible to know from which VADisplay they +++// originate. Try to route them to existing mpv/libmpv instances within +++// this process. ++ static pthread_mutex_t va_log_mutex = PTHREAD_MUTEX_INITIALIZER; ++ static struct mp_vaapi_ctx **va_mpv_clients; ++ static int num_va_mpv_clients; ++@@ -77,6 +95,7 @@ static void va_info_callback(const char *msg) ++ { ++ va_message_callback(msg, MSGL_V); ++ } +++#endif ++ ++ static void open_lavu_vaapi_device(struct mp_vaapi_ctx *ctx) ++ { ++@@ -108,6 +127,10 @@ struct mp_vaapi_ctx *va_initialize(VADisplay *display, struct mp_log *plog, ++ }, ++ }; ++ +++#if VA_CHECK_VERSION(1, 0, 0) +++ vaSetErrorCallback(display, va_error_callback, res); +++ vaSetInfoCallback(display, va_info_callback, res); +++#else ++ pthread_mutex_lock(&va_log_mutex); ++ MP_TARRAY_APPEND(NULL, va_mpv_clients, num_va_mpv_clients, res); ++ pthread_mutex_unlock(&va_log_mutex); ++@@ -118,6 +141,7 @@ struct mp_vaapi_ctx *va_initialize(VADisplay *display, struct mp_log *plog, ++ vaSetErrorCallback(va_error_callback); ++ vaSetInfoCallback(va_info_callback); ++ #endif +++#endif ++ ++ int major, minor; ++ int status = vaInitialize(display, &major, &minor); ++@@ -154,6 +178,7 @@ void va_destroy(struct mp_vaapi_ctx *ctx) ++ if (ctx->destroy_native_ctx) ++ ctx->destroy_native_ctx(ctx->native_ctx); ++ +++#if !VA_CHECK_VERSION(1, 0, 0) ++ pthread_mutex_lock(&va_log_mutex); ++ for (int n = 0; n < num_va_mpv_clients; n++) { ++ if (va_mpv_clients[n] == ctx) { ++@@ -164,6 +189,7 @@ void va_destroy(struct mp_vaapi_ctx *ctx) ++ if (num_va_mpv_clients == 0) ++ TA_FREEP(&va_mpv_clients); // avoid triggering leak detectors ++ pthread_mutex_unlock(&va_log_mutex); +++#endif ++ ++ talloc_free(ctx); ++ } +diff --git a/package/mpv/Config.in b/package/mpv/Config.in +index 32910f2245..69810038f1 100644 +--- a/package/mpv/Config.in ++++ b/package/mpv/Config.in +@@ -8,7 +8,6 @@ config BR2_PACKAGE_MPV + select BR2_PACKAGE_FFMPEG + select BR2_PACKAGE_FFMPEG_SWSCALE + select BR2_PACKAGE_ZLIB +- select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND + # Select xkbcommon for wayland to avoid being mysterious + select BR2_PACKAGE_LIBXKBCOMMON if BR2_PACKAGE_WAYLAND + # Select all necessary X11 dependencies if X.org is enabled +diff --git a/package/mpv/mpv.hash b/package/mpv/mpv.hash +index 734b6a3663..1dac3a4940 100644 +--- a/package/mpv/mpv.hash ++++ b/package/mpv/mpv.hash +@@ -1,3 +1,2 @@ + # Locally calculated +-sha256 f9f9d461d1990f9728660b4ccb0e8cb5dce29ccaa6af567bec481b79291ca623 v0.29.1.tar.gz +-sha256 a99d7b0625a0566271aad6de694e52eafd566db024f9516720d526c680d3ee30 LICENSE.GPL ++sha256 2ad104d83fd3b2b9457716615acad57e479fd1537b8fc5e37bfe9065359b50be v0.27.2.tar.gz +diff --git a/package/mpv/mpv.mk b/package/mpv/mpv.mk +index f92b604c28..3ab2673774 100644 +--- a/package/mpv/mpv.mk ++++ b/package/mpv/mpv.mk +@@ -4,14 +4,14 @@ + # + ################################################################################ + +-MPV_VERSION = 0.29.1 ++MPV_VERSION = 0.27.2 + MPV_SITE = https://github.com/mpv-player/mpv/archive + MPV_SOURCE = v$(MPV_VERSION).tar.gz + MPV_DEPENDENCIES = \ + host-pkgconf ffmpeg zlib \ + $(if $(BR2_PACKAGE_LIBICONV),libiconv) + MPV_LICENSE = GPL-2.0+ +-MPV_LICENSE_FILES = LICENSE.GPL ++MPV_LICENSE_FILES = LICENSE + + MPV_NEEDS_EXTERNAL_WAF = YES + +@@ -164,12 +164,16 @@ MPV_CONF_OPTS += --disable-libsmbclient + endif + + # SDL support +-# Sdl2 requires 64-bit sync intrinsics ++# Both can't be used at the same time, prefer newer API ++# It also requires 64-bit sync intrinsics + ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_8)$(BR2_PACKAGE_SDL2),yy) +-MPV_CONF_OPTS += --enable-sdl2 ++MPV_CONF_OPTS += --enable-sdl2 --disable-sdl1 + MPV_DEPENDENCIES += sdl2 ++else ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_8)$(BR2_PACKAGE_SDL),yy) ++MPV_CONF_OPTS += --enable-sdl1 --disable-sdl2 ++MPV_DEPENDENCIES += sdl + else +-MPV_CONF_OPTS += --disable-sdl2 ++MPV_CONF_OPTS += --disable-sdl1 --disable-sdl2 + endif + + # Raspberry Pi support +@@ -197,7 +201,7 @@ endif + # wayland support + ifeq ($(BR2_PACKAGE_WAYLAND),y) + MPV_CONF_OPTS += --enable-wayland +-MPV_DEPENDENCIES += libxkbcommon wayland wayland-protocols ++MPV_DEPENDENCIES += libxkbcommon wayland + else + MPV_CONF_OPTS += --disable-wayland + endif +-- +2.11.0 + diff --git a/buildroot-patches/0027-Downgrade-python-urllib3-to-1.24.2.patch b/buildroot-patches/0027-Downgrade-python-urllib3-to-1.24.2.patch new file mode 100644 index 00000000..6b41dfd4 --- /dev/null +++ b/buildroot-patches/0027-Downgrade-python-urllib3-to-1.24.2.patch @@ -0,0 +1,40 @@ +From 1710083a2e96bc5ab95f6cf4d16cd683902fee30 Mon Sep 17 00:00:00 2001 +From: Peter Steenbergen +Date: Tue, 3 Dec 2019 17:11:39 +0100 +Subject: [PATCH 1/1] Downgrade python-urllib3 to 1.24.2 + +--- + package/python-urllib3/python-urllib3.hash | 1 + + package/python-urllib3/python-urllib3.mk | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/package/python-urllib3/python-urllib3.hash b/package/python-urllib3/python-urllib3.hash +index 91b9e44622..0f01c43757 100644 +--- a/package/python-urllib3/python-urllib3.hash ++++ b/package/python-urllib3/python-urllib3.hash +@@ -1,5 +1,6 @@ + # md5, sha256 from https://pypi.org/pypi/urllib3/json + md5 a7504a9fcb7ed4ffa482fe098c80b6d4 urllib3-1.25.6.tar.gz + sha256 9a107b99a5393caf59c7aa3c1249c16e6879447533d0887f4336dde834c7be86 urllib3-1.25.6.tar.gz ++sha256 9a247273df709c4fedb38c711e44292304f73f39ab01beda9f6b9fc375669ac3 urllib3-1.24.2.tar.gz + # Locally computed sha256 checksums + sha256 7c0d136ee0585389adf2d25671bb99687a1f75929f465b7f16ee3f01da37255e LICENSE.txt +diff --git a/package/python-urllib3/python-urllib3.mk b/package/python-urllib3/python-urllib3.mk +index 8383cbe8e8..893d32d976 100644 +--- a/package/python-urllib3/python-urllib3.mk ++++ b/package/python-urllib3/python-urllib3.mk +@@ -4,9 +4,9 @@ + # + ################################################################################ + +-PYTHON_URLLIB3_VERSION = 1.25.6 ++PYTHON_URLLIB3_VERSION = 1.24.2 + PYTHON_URLLIB3_SOURCE = urllib3-$(PYTHON_URLLIB3_VERSION).tar.gz +-PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/ff/44/29655168da441dff66de03952880c6e2d17b252836ff1aa4421fba556424 ++PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/fd/fa/b21f4f03176463a6cccdb612a5ff71b927e5224e83483012747c12fc5d62 + PYTHON_URLLIB3_LICENSE = MIT + PYTHON_URLLIB3_LICENSE_FILES = LICENSE.txt + PYTHON_URLLIB3_SETUP_TYPE = setuptools +-- +2.24.0.rc1 + diff --git a/buildroot-patches/0028-Downgrade-python-pyalsaaudio-to-0.8.2.patch b/buildroot-patches/0028-Downgrade-python-pyalsaaudio-to-0.8.2.patch new file mode 100644 index 00000000..f3346ece --- /dev/null +++ b/buildroot-patches/0028-Downgrade-python-pyalsaaudio-to-0.8.2.patch @@ -0,0 +1,42 @@ +From afd7a5c614ad0f4741e378d7aab2c0369dc68508 Mon Sep 17 00:00:00 2001 +From: Peter Steenbergen +Date: Sat, 7 Dec 2019 17:59:27 +0100 +Subject: [PATCH 1/1] Downgrade python-alsaaudio to 0.8.2 + +--- + package/python-alsaaudio/python-alsaaudio.hash | 1 + + package/python-alsaaudio/python-alsaaudio.mk | 6 +++--- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/package/python-alsaaudio/python-alsaaudio.hash b/package/python-alsaaudio/python-alsaaudio.hash +index 476bc8f1a1..9086f32599 100644 +--- a/package/python-alsaaudio/python-alsaaudio.hash ++++ b/package/python-alsaaudio/python-alsaaudio.hash +@@ -1,5 +1,6 @@ + # md5, sha256 from https://pypi.org/pypi/pyalsaaudio/json + md5 b46f69561bc85fc52e698b2440ca251e pyalsaaudio-0.8.4.tar.gz + sha256 84e8f8da544d7f4bd96479ce4a237600077984d9be1d7f16c1d9a492ecf50085 pyalsaaudio-0.8.4.tar.gz ++sha256 b6df486f1c4035041a5f3800496b86c64e48e4a7d47f94dcbca11b0187aa3a15 pyalsaaudio-0.8.2.tar.gz + # Locally computed sha256 checksums + sha256 ef6ba930f96986d78082e67c817ac617b9e833d60d5a0460f24c9c674a010935 LICENSE +diff --git a/package/python-alsaaudio/python-alsaaudio.mk b/package/python-alsaaudio/python-alsaaudio.mk +index 3344583cf7..9944c8b44a 100644 +--- a/package/python-alsaaudio/python-alsaaudio.mk ++++ b/package/python-alsaaudio/python-alsaaudio.mk +@@ -4,10 +4,10 @@ + # + ################################################################################ + +-PYTHON_ALSAAUDIO_VERSION = 0.8.4 ++PYTHON_ALSAAUDIO_VERSION = 0.8.2 + PYTHON_ALSAAUDIO_SOURCE = pyalsaaudio-$(PYTHON_ALSAAUDIO_VERSION).tar.gz +-PYTHON_ALSAAUDIO_SITE = https://files.pythonhosted.org/packages/52/b6/44871791929d9d7e11325af0b7be711388dfeeab17147988f044a41a6d83 +-PYTHON_ALSAAUDIO_SETUP_TYPE = setuptools ++PYTHON_ALSAAUDIO_SITE = https://files.pythonhosted.org/packages/0d/99/1f48912b5ffccecdd0c0c477023f4eaf45ebac6c92bc1865c7142c570d6d ++PYTHON_ALSAAUDIO_SETUP_TYPE = distutils + PYTHON_ALSAAUDIO_LICENSE = Python-2.0 + PYTHON_ALSAAUDIO_LICENSE_FILES = LICENSE + PYTHON_ALSAAUDIO_DEPENDENCIES = alsa-lib +-- +2.24.0.rc1 + diff --git a/documentation/building.md b/documentation/building.md index a49b38d6..1f32d6c3 100644 --- a/documentation/building.md +++ b/documentation/building.md @@ -8,6 +8,7 @@ First, get the code on your system! The simplest method is via git. - cd ~/ - git clone --recurse-submodules https://github.com/j1nx/MycroftOS.git - cd MycroftOS +- git checkout develop ## Patching Buildroot. If this is the very first time you are going to build an image, you need to execute the following command once; @@ -17,9 +18,15 @@ If this is the very first time you are going to build an image, you need to exec This will patch the Buildroot packages. ## Building the image. -We can build the image(s) by running the following command; +Building the image(s) can be done by utilizing a proper Makefile;
-- ./scripts/build.sh +To see the available commands, just run: 'make help'
-At this moment only one image get's build. Namely the one for RPi3. Later on in time this section will get expanded with other possible supported hardware. +As example to build the rpi3 version;
+make clean
+make rpi3-config
+make rpi3
+
+To build all available buids, run;
+make all diff --git a/documentation/python-packages.md b/documentation/python-packages.md index d7b9b665..68aa8637 100644 --- a/documentation/python-packages.md +++ b/documentation/python-packages.md @@ -1,108 +1,127 @@ -# Python 3.7 +# Python 3.8 ## Default installed Python libraries The following Python libraries are installed when Mycroft has been fully booted and configured; -- adapt-parser 0.3.0 -- arrow 0.10.0 -- astral 1.4 -- beautifulsoup4 4.5.3 -- bs4 0.0.1 -- cachetools 2.1.0 -- casttube 0.1.0 -- certifi 2018.10.15 -- cffi 1.11.2 -- chardet 3.0.4 -- Click 7.0 -- configshell-fb 1.1.18 -- coverage 4.5.1 -- coveralls 1.5.1 -- daemonize 2.4.7 -- ddg3 0.6.6 -- Deprecated 1.2.3 -- docopt 0.6.2 -- fann2 1.0.7 -- fasteners 0.14.1 -- feedparser 5.2.1 -- gitdb2 2.0.4 -- GitPython 2.1.11 -- google-api-python-client 1.6.4 -- google-auth 1.5.1 -- google-auth-httplib2 0.0.3 -- gTTS 2.0.1 -- gTTS-token 1.1.3 -- httplib2 0.10.3 -- humanhash3 0.0.6 -- idna 2.7 -- ifaddr 0.1.6 -- inflect 2.1.0 -- inflection 0.3.1 -- jaraco.itertools 4.4.1 -- lxml 4.2.5 -- monotonic 1.5 -- more-itertools 5.0.0 -- msk 0.3.12 -- msm 0.6.3 -- multi-key-dict 2.0.3 -- mycroft-core 18.8.11 -- netaddr 0.7.19 -- netifaces 0.10.7 -- oauth2client 4.1.3 -- oauthlib 2.1.0 -- olefile 0.46 -- padaos 0.1.8 -- padatious 0.4.5 -- pep8 1.7.0 -- petact 0.1.2 -- Pillow 4.1.1 -- pip 18.1 -- pocketsphinx 0.1.0 -- precise-runner 0.2.1 -- protobuf 3.0.0b2 -- psutil 5.2.1 -- pulsectl 17.7.4 -- pyalsaaudio 0.8.2 -- pyasn1 0.4.4 -- pyasn1-modules 0.2.2 -- PyAudio 0.2.11 -- PyChromecast 0.7.7 -- pyCLI 2.0.3 -- pycparser 2.19 -- pycrypto 2.6.1 -- pyee 1.0.1 -- PyGithub 1.43.2 -- pyjokes 0.5.0 -- PyJWT 1.6.4 -- pyowm 2.6.1 -- pyparsing 2.1.10 -- pyserial 3.0 -- python-dateutil 2.7.5 -- python-vlc 1.1.2 -- pytz 2017.2 -- requests 2.20.0 -- requests-futures 0.9.5 -- rsa 4.0 -- setuptools 40.5.0 -- sgmllib3k 1.0.0 -- six 1.10.0 -- smmap2 2.0.4 -- source 1.2.0 -- SpeechRecognition 3.8.1 -- texttable 0.9.1 -- tornado 5.1.1 -- typing 3.6.6 -- tzlocal 1.3 -- uritemplate 3.0.0 -- urllib3 1.24.1 -- urwid 1.3.1 -- uuid 1.30 -- websocket-client 0.32.0 -- wikipedia 1.4.0 -- wolframalpha 3.0 -- wrapt 1.10.11 -- xmlrunner 1.7.7 -- xmltodict 0.11.0 -- xxhash 1.2.0 -- zeroconf 0.20.0 +Package Version +------------------------ --------- +adapt-parser 0.3.4 +appdirs 1.4.3 +arrow 0.15.2 +asn1crypto 1.2.0 +astral 1.4 +beautifulsoup4 4.8.1 +bs4 0.0.1 +cachetools 2.1.0 +casttube 0.2.0 +certifi 2019.9.11 +cffi 1.13.1 +chardet 3.0.4 +Click 7.0 +colorama 0.4.1 +colorzero 1.1 +configshell-fb 1.1.18 +coverage 4.5.1 +coveralls 1.5.1 +cryptography 2.8 +daemonize 2.5.0 +ddg3 0.6.6 +Deprecated 1.2.3 +docopt 0.6.2 +fann2 1.0.7 +fasteners 0.14.1 +feedparser 5.2.1 +gitdb2 2.0.4 +GitPython 2.1.11 +google-api-python-client 1.6.4 +google-auth 1.5.1 +google-auth-httplib2 0.0.3 +gpiozero 1.4.1 +gTTS 2.0.4 +gTTS-token 1.1.3 +holidays 0.9.10 +httplib2 0.14.0 +humanhash3 0.0.6 +idna 2.7 +ifaddr 0.1.4 +importlib-metadata 1.2.0 +inflect 3.0.2 +inflection 0.3.1 +ipaddress 1.0.23 +jaraco.itertools 4.4.2 +lazy 1.4 +lxml 4.4.1 +monotonic 1.5 +more-itertools 8.0.2 +msk 0.3.14 +msm 0.8.3 +multi-key-dict 2.0.3 +mycroft-core 19.8.4 +netaddr 0.7.19 +num2words 0.5.10 +oauth2client 4.1.3 +oauthlib 3.1.0 +olefile 0.46 +padaos 0.1.9 +padatious 0.4.6 +pako 0.2.3 +pep8 1.7.0 +petact 0.1.2 +Pillow 6.2.1 +pip 19.3.1 +pocketsphinx 0.1.0 +precise-runner 0.2.1 +protobuf 3.9.1 +psutil 5.2.1 +pulsectl 17.7.4 +py-mplayer 0.1 +pyalsaaudio 0.8.2 +pyasn1 0.4.7 +pyasn1-modules 0.2.7 +PyAudio 0.2.11 +PyChromecast 3.2.2 +pyCLI 2.0.3 +pycparser 2.19 +pycrypto 2.6.1 +pyee 5.0.0 +PyGithub 1.43.2 +pyjokes 0.5.0 +PyJWT 1.6.4 +pyOpenSSL 19.1.0 +pyowm 2.6.1 +pyparsing 2.4.2 +pyserial 3.0 +python-dateutil 2.7.5 +python-vlc 1.1.2 +pytz 2017.2 +pyusb 1.0.0 +PyYAML 5.1.2 +requests 2.20.0 +requests-futures 0.9.5 +rsa 4.0 +setuptools 41.4.0 +sgmllib3k 1.0.0 +six 1.13.0 +smmap2 2.0.4 +soupsieve 1.9.4 +source 1.2.0 +SpeechRecognition 3.8.1 +spidev 3.4 +texttable 1.6.2 +tornado 6.0.3 +tzlocal 1.3 +uritemplate 3.0.0 +urllib3 1.24.2 +urwid 2.0.1 +uuid 1.30 +websocket-client 0.54.0 +wikipedia 1.4.0 +wolframalpha 3.0 +wrapt 1.11.2 +xmlrunner 1.7.7 +xmltodict 0.12.0 +xxhash 1.2.0 +zeroconf 0.23.0 +zipp 0.6.0 diff --git a/scripts/build.sh b/scripts/build.sh deleted file mode 100755 index 65197dbf..00000000 --- a/scripts/build.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/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 clean - 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 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 -done