diff --git a/.gitmodules b/.gitmodules index cd8a8618..c2597b2d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "buildroot"] path = buildroot url = https://github.com/buildroot/buildroot.git - branch = 2018.08.x + branch = 2018.11.x diff --git a/README.md b/README.md index 284ce649..14568885 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# MycroftOS +# MycroftOS MycroftOS is a bare minimal linux OS based on Buildroot to run the Mycroft A.I. software stack on embedded devices. The software stack of Mycroft creates a hackable open source voice assistant. @@ -7,10 +7,22 @@ More information about the Mycroft A.I. software stack at https://mycroft.ai ## System. - Linux kernel 4.14 (LT) -- Buildroot 2018.08.x +- Buildroot 2018.11.x - Mycroft 18.08.x - Raspberry Pi 3B (initial development hardware) +## Stats: + +| [![Build Status](https://travis-ci.org/j1nx/MycroftOS.svg?branch=develop)](https://travis-ci.org/j1nx/MycroftOS) | [![GitHub last commit](https://img.shields.io/github/last-commit/google/skia.svg)](https://github.com/j1nx/MycroftOS/commits/develop) | +|:---:|:---:| +| This shows if the code is valid and can be build. | This shows when this repo was updated for the last time | +| [![GitHub stars](https://img.shields.io/github/stars/j1nx/MycroftOS.svg)](https://github.com/j1nx/MycroftOS/stargazers) | [![GitHub issues](https://img.shields.io/github/issues/j1nx/home_assistant_config.svg)](https://github.com/j1nx/MycroftOS/issues) | +| Please :star: this repo if you find it useful | Issues are like my personal TODO list and information archive | +|[![License: Apache License 2.0](https://img.shields.io/crates/l/rustc-serialize.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)| [![contributions welcome](https://img.shields.io/badge/contributions-welcome-blue.svg?style=flat)](https://github.com/j1nx/MycroftOS/pulls) | +| I'm using the Apache License 2.0 similar as Mycroft A.I. which means commercial use is allowed | If you have any ideas, they're always welcome. Either submit an issue or a PR! | +| [![Uptime Robot status](https://img.shields.io/website-up-down-green-red/https/shields.io.svg?label=j1nx.nl)](https://stats.uptimerobot.com/Y5L6rSB07) | [![Buy me a](https://img.shields.io/badge/BuyMeABeer-Paypal-blue.svg)](https://www.paypal.me/j1nxnl) | +| I use uptime robot to monitor for things i can't monitor when the connection drops. | If you feel the need, now it's as easy as clicking this button! | + ## Getting started. At this moment development is in very early stages and focussed on the Raspberry Pi 3B. As soon as an initial first workable version is created, other hardware might be added. @@ -33,9 +45,9 @@ Then we can build the image(s) by running the following command; ... More building instructions will follow soon ... ## Credits -Mycroft AI (@MycroftAI) +Mycroft AI (@MycroftAI)
Buildroot (@buildroot) -Inspired by; -HassOS (@home-assistant) +### Inspired by; +HassOS (@home-assistant)
Recalbox (Gitlab - @recalbox) diff --git a/buildroot b/buildroot index 50702013..93d8af97 160000 --- a/buildroot +++ b/buildroot @@ -1 +1 @@ -Subproject commit 507020139190aaf44793c3c901321d23ba476c13 +Subproject commit 93d8af974346d95e66f5582e420dd0fb35d32916 diff --git a/buildroot-external/Config.in b/buildroot-external/Config.in index 0b220340..60a49c60 100644 --- a/buildroot-external/Config.in +++ b/buildroot-external/Config.in @@ -1,5 +1,6 @@ -menu "Additional libraries and applications" +menu "Additional drivers, libraries and/or applications" 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" @@ -32,12 +33,9 @@ menu "Additional external python modules" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-padatious/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-pip/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-pocketsphinx/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-precise-runner/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-pulsectl/Config.in" - source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-pyasn1-modules/Config.in" - source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-pyasn1/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-pyaudio/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-pychromecast/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-pyee/Config.in" @@ -49,11 +47,8 @@ menu "Additional external python modules" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-smmap2/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-source/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-speechrecognition/Config.in" - source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-typing/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-uritemplate/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-vlc/Config.in" - source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-wrapt/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-xmlrunner/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-xxhash/Config.in" - source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/python-zeroconf/Config.in" endmenu diff --git a/buildroot-external/board/raspberrypi/cmdline.txt b/buildroot-external/board/raspberrypi/cmdline.txt index ab7ed224..21a87a90 100644 --- a/buildroot-external/board/raspberrypi/cmdline.txt +++ b/buildroot-external/board/raspberrypi/cmdline.txt @@ -1 +1 @@ -root=/dev/mmcblk0p2 console=tty3 consoleblank=0 loglevel=3 vt.global_cursor_default=0 logo.nologo rootwait fastboot noswap quiet +root=/dev/mmcblk0p2 console=ttyAMA0,115200 consoleblank=0 loglevel=0 vt.global_cursor_default=0 logo.nologo rootwait noswap quiet diff --git a/buildroot-external/board/raspberrypi/config.txt b/buildroot-external/board/raspberrypi/config.txt index a14eb61f..451af7e9 100644 --- a/buildroot-external/board/raspberrypi/config.txt +++ b/buildroot-external/board/raspberrypi/config.txt @@ -11,7 +11,12 @@ kernel=zImage # Disable overscan assuming the display supports displaying the full resolution # If the text shown on the screen disappears off the edge, comment this out -# disable_overscan=1 +disable_overscan=1 +hdmi_group=1 +hdmi_mode=4 + +# uncomment if you get no picture on HDMI for a default "safe" mode +# hdmi_safe=1 # How much memory in MB to assign to the GPU on Pi models having # 256, 512 or 1024 MB total memory @@ -24,3 +29,8 @@ dtparam=audio=on # Disable rainbow color splash disable_splash=1 + +# Enable some optional hardware interfaces +dtparam=i2c_arm=on +dtoverlay=i2s-mmap +dtparam=i2s=on diff --git a/buildroot-external/board/raspberrypi/post-build.sh b/buildroot-external/board/raspberrypi/post-build.sh index b0cf4f2d..89554604 100755 --- a/buildroot-external/board/raspberrypi/post-build.sh +++ b/buildroot-external/board/raspberrypi/post-build.sh @@ -4,11 +4,11 @@ set -u set -e # Add a console on tty1 -if [ -e ${TARGET_DIR}/etc/inittab ]; then - grep -qE '^tty1::' ${TARGET_DIR}/etc/inittab || \ - sed -i '/GENERIC_SERIAL/a\ -tty1::respawn:/sbin/getty -L tty1 0 vt100 # HDMI console' ${TARGET_DIR}/etc/inittab -fi +#if [ -e ${TARGET_DIR}/etc/inittab ]; then +# grep -qE '^tty1::' ${TARGET_DIR}/etc/inittab || \ +# sed -i '/GENERIC_SERIAL/a\ +#tty1::respawn:/sbin/getty -L tty1 0 vt100 # HDMI console' ${TARGET_DIR}/etc/inittab +#fi cp -f ../buildroot-external/board/raspberrypi/config.txt ${BINARIES_DIR}/rpi-firmware/config.txt cp -f ../buildroot-external/board/raspberrypi/cmdline.txt ${BINARIES_DIR}/rpi-firmware/cmdline.txt diff --git a/buildroot-external/busybox.config b/buildroot-external/busybox.config index 38de13d4..640fb572 100644 --- a/buildroot-external/busybox.config +++ b/buildroot-external/busybox.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.28.0 -# Wed Feb 7 09:44:57 2018 +# Busybox version: 1.29.2 +# Wed Nov 21 16:27:40 2018 # CONFIG_HAVE_DOT_CONFIG=y @@ -21,8 +21,8 @@ CONFIG_LFS=y CONFIG_FEATURE_DEVPTS=y CONFIG_FEATURE_UTMP=y CONFIG_FEATURE_WTMP=y -# CONFIG_FEATURE_PIDFILE is not set -CONFIG_PID_FILE_PATH="" +CONFIG_FEATURE_PIDFILE=y +CONFIG_PID_FILE_PATH="/var/run" CONFIG_BUSYBOX=y CONFIG_FEATURE_INSTALLER=y # CONFIG_INSTALL_NO_USR is not set @@ -42,9 +42,9 @@ CONFIG_PLATFORM_LINUX=y # CONFIG_STATIC is not set # CONFIG_PIE is not set # CONFIG_NOMMU is not set -# CONFIG_BUILD_LIBBUSYBOX is not set +CONFIG_BUILD_LIBBUSYBOX=y # CONFIG_FEATURE_LIBBUSYBOX_STATIC is not set -# CONFIG_FEATURE_INDIVIDUAL is not set +CONFIG_FEATURE_INDIVIDUAL=y # CONFIG_FEATURE_SHARED_BUSYBOX is not set CONFIG_CROSS_COMPILER_PREFIX="" CONFIG_SYSROOT="" @@ -52,6 +52,7 @@ CONFIG_EXTRA_CFLAGS="" CONFIG_EXTRA_LDFLAGS="" CONFIG_EXTRA_LDLIBS="" # CONFIG_USE_PORTABLE_CODE is not set +CONFIG_STACK_OPTIMIZATION_386=y # # Installation Options ("make install" behavior) @@ -90,6 +91,7 @@ CONFIG_MD5_SMALL=1 CONFIG_SHA3_SMALL=1 # CONFIG_FEATURE_FAST_TOP is not set # CONFIG_FEATURE_ETC_NETWORKS is not set +# CONFIG_FEATURE_ETC_SERVICES is not set CONFIG_FEATURE_EDITING=y CONFIG_FEATURE_EDITING_MAX_LEN=1024 CONFIG_FEATURE_EDITING_VI=y @@ -100,18 +102,19 @@ CONFIG_FEATURE_REVERSE_SEARCH=y CONFIG_FEATURE_TAB_COMPLETION=y # CONFIG_FEATURE_USERNAME_COMPLETION is not set CONFIG_FEATURE_EDITING_FANCY_PROMPT=y +CONFIG_FEATURE_EDITING_WINCH=y # CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set -# CONFIG_LOCALE_SUPPORT is not set -# CONFIG_UNICODE_SUPPORT is not set -# CONFIG_UNICODE_USING_LOCALE is not set +CONFIG_LOCALE_SUPPORT=y +CONFIG_UNICODE_SUPPORT=y +CONFIG_UNICODE_USING_LOCALE=y # CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set -CONFIG_SUBST_WCHAR=0 -CONFIG_LAST_SUPPORTED_WCHAR=0 -# CONFIG_UNICODE_COMBINING_WCHARS is not set -# CONFIG_UNICODE_WIDE_WCHARS is not set +CONFIG_SUBST_WCHAR=63 +CONFIG_LAST_SUPPORTED_WCHAR=767 +CONFIG_UNICODE_COMBINING_WCHARS=y +CONFIG_UNICODE_WIDE_WCHARS=y # CONFIG_UNICODE_BIDI_SUPPORT is not set # CONFIG_UNICODE_NEUTRAL_TABLE is not set -# CONFIG_UNICODE_PRESERVE_BROKEN is not set +CONFIG_UNICODE_PRESERVE_BROKEN=y CONFIG_FEATURE_NON_POSIX_CP=y # CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set CONFIG_FEATURE_USE_SENDFILE=y @@ -128,11 +131,11 @@ CONFIG_FEATURE_HWIB=y # # Archival Utilities # -# CONFIG_FEATURE_SEAMLESS_XZ is not set -# CONFIG_FEATURE_SEAMLESS_LZMA is not set -# CONFIG_FEATURE_SEAMLESS_BZ2 is not set -# CONFIG_FEATURE_SEAMLESS_GZ is not set -# CONFIG_FEATURE_SEAMLESS_Z is not set +CONFIG_FEATURE_SEAMLESS_XZ=y +CONFIG_FEATURE_SEAMLESS_LZMA=y +CONFIG_FEATURE_SEAMLESS_BZ2=y +CONFIG_FEATURE_SEAMLESS_GZ=y +CONFIG_FEATURE_SEAMLESS_Z=y CONFIG_AR=y # CONFIG_FEATURE_AR_LONG_FILENAMES is not set CONFIG_FEATURE_AR_CREATE=y @@ -149,6 +152,7 @@ CONFIG_UNXZ=y CONFIG_XZCAT=y CONFIG_XZ=y # CONFIG_BZIP2 is not set +CONFIG_BZIP2_SMALL=0 CONFIG_FEATURE_BZIP2_DECOMPRESS=y CONFIG_CPIO=y # CONFIG_FEATURE_CPIO_O is not set @@ -160,7 +164,7 @@ CONFIG_GZIP=y CONFIG_GZIP_FAST=0 # CONFIG_FEATURE_GZIP_LEVELS is not set CONFIG_FEATURE_GZIP_DECOMPRESS=y -# CONFIG_LZOP is not set +CONFIG_LZOP=y CONFIG_UNLZOP=y CONFIG_LZOPCAT=y # CONFIG_LZOP_COMPR_HIGH is not set @@ -169,7 +173,7 @@ CONFIG_LZOPCAT=y CONFIG_TAR=y CONFIG_FEATURE_TAR_LONG_OPTIONS=y CONFIG_FEATURE_TAR_CREATE=y -# CONFIG_FEATURE_TAR_AUTODETECT is not set +CONFIG_FEATURE_TAR_AUTODETECT=y CONFIG_FEATURE_TAR_FROM=y # CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set # CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set @@ -183,7 +187,7 @@ CONFIG_FEATURE_UNZIP_CDF=y CONFIG_FEATURE_UNZIP_BZIP2=y CONFIG_FEATURE_UNZIP_LZMA=y CONFIG_FEATURE_UNZIP_XZ=y -# CONFIG_FEATURE_LZMA_FAST is not set +CONFIG_FEATURE_LZMA_FAST=y # # Coreutils @@ -228,7 +232,7 @@ CONFIG_EXPR_MATH_SUPPORT_64=y CONFIG_FACTOR=y CONFIG_FALSE=y CONFIG_FOLD=y -# CONFIG_FSYNC is not set +CONFIG_FSYNC=y CONFIG_HEAD=y CONFIG_FEATURE_FANCY_HEAD=y CONFIG_HOSTID=y @@ -286,6 +290,7 @@ CONFIG_FEATURE_FANCY_SLEEP=y CONFIG_FEATURE_FLOAT_SLEEP=y CONFIG_SORT=y CONFIG_FEATURE_SORT_BIG=y +# CONFIG_FEATURE_SORT_OPTIMIZE_MEMORY is not set # CONFIG_SPLIT is not set # CONFIG_FEATURE_SPLIT_FANCY is not set # CONFIG_STAT is not set @@ -477,6 +482,7 @@ CONFIG_FEATURE_XARGS_SUPPORT_ARGS_FILE=y CONFIG_HALT=y CONFIG_POWEROFF=y CONFIG_REBOOT=y +CONFIG_FEATURE_WAIT_FOR_INIT=y # CONFIG_FEATURE_CALL_TELINIT is not set CONFIG_TELINIT_PATH="" CONFIG_INIT=y @@ -536,19 +542,19 @@ CONFIG_VLOCK=y CONFIG_CHATTR=y CONFIG_FSCK=y CONFIG_LSATTR=y -# CONFIG_TUNE2FS is not set +CONFIG_TUNE2FS=y # # Linux Module Utilities # # CONFIG_MODPROBE_SMALL is not set -# CONFIG_DEPMOD is not set +CONFIG_DEPMOD=y CONFIG_INSMOD=y CONFIG_LSMOD=y CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y -# CONFIG_MODINFO is not set +CONFIG_MODINFO=y CONFIG_MODPROBE=y -# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set +CONFIG_FEATURE_MODPROBE_BLACKLIST=y CONFIG_RMMOD=y # @@ -627,16 +633,16 @@ CONFIG_FEATURE_MDEV_CONF=y CONFIG_FEATURE_MDEV_RENAME=y # CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set CONFIG_FEATURE_MDEV_EXEC=y -# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set +CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y CONFIG_MESG=y CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y CONFIG_MKE2FS=y -# CONFIG_MKFS_EXT2 is not set +CONFIG_MKFS_EXT2=y # CONFIG_MKFS_MINIX is not set # CONFIG_FEATURE_MINIX2 is not set # CONFIG_MKFS_REISER is not set CONFIG_MKDOSFS=y -# CONFIG_MKFS_VFAT is not set +CONFIG_MKFS_VFAT=y CONFIG_MKSWAP=y # CONFIG_FEATURE_MKSWAP_UUID is not set CONFIG_MORE=y @@ -704,12 +710,13 @@ CONFIG_FEATURE_VOLUMEID_FAT=y # CONFIG_FEATURE_VOLUMEID_HFS is not set # CONFIG_FEATURE_VOLUMEID_ISO9660 is not set # CONFIG_FEATURE_VOLUMEID_JFS is not set +# CONFIG_FEATURE_VOLUMEID_LFS is not set # CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set # CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set # CONFIG_FEATURE_VOLUMEID_LUKS is not set CONFIG_FEATURE_VOLUMEID_MINIX=y # CONFIG_FEATURE_VOLUMEID_NILFS is not set -# CONFIG_FEATURE_VOLUMEID_NTFS is not set +CONFIG_FEATURE_VOLUMEID_NTFS=y # CONFIG_FEATURE_VOLUMEID_OCFS2 is not set # CONFIG_FEATURE_VOLUMEID_REISERFS is not set # CONFIG_FEATURE_VOLUMEID_ROMFS is not set @@ -725,9 +732,9 @@ CONFIG_FEATURE_VOLUMEID_UBIFS=y # CONFIG_ADJTIMEX is not set # CONFIG_BBCONFIG is not set # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set -# CONFIG_BEEP is not set -CONFIG_FEATURE_BEEP_FREQ=0 -CONFIG_FEATURE_BEEP_LENGTH_MS=0 +CONFIG_BEEP=y +CONFIG_FEATURE_BEEP_FREQ=4000 +CONFIG_FEATURE_BEEP_LENGTH_MS=30 # CONFIG_CHAT is not set # CONFIG_FEATURE_CHAT_NOFAIL is not set # CONFIG_FEATURE_CHAT_TTY_HIFI is not set @@ -751,7 +758,7 @@ CONFIG_DC=y # CONFIG_DEVFSD_VERBOSE is not set # CONFIG_FEATURE_DEVFS is not set CONFIG_DEVMEM=y -# CONFIG_FBSPLASH is not set +CONFIG_FBSPLASH=y # CONFIG_FLASHCP is not set # CONFIG_FLASH_ERASEALL is not set # CONFIG_FLASH_LOCK is not set @@ -780,6 +787,8 @@ CONFIG_FEATURE_LESS_REGEXP=y # CONFIG_FEATURE_LESS_ASK_TERMINAL is not set # CONFIG_FEATURE_LESS_DASHCMD is not set # CONFIG_FEATURE_LESS_LINENUMS is not set +# CONFIG_FEATURE_LESS_RAW is not set +# CONFIG_FEATURE_LESS_ENV is not set CONFIG_LSSCSI=y CONFIG_MAKEDEVS=y # CONFIG_FEATURE_MAKEDEVS_LEAF is not set @@ -792,7 +801,7 @@ CONFIG_MT=y CONFIG_PARTPROBE=y # CONFIG_RAIDAUTORUN is not set # CONFIG_READAHEAD is not set -# CONFIG_RFKILL is not set +CONFIG_RFKILL=y CONFIG_RUNLEVEL=y # CONFIG_RX is not set CONFIG_SETFATTR=y @@ -828,9 +837,9 @@ CONFIG_ETHER_WAKE=y # CONFIG_FEATURE_FTPD_WRITE is not set # CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set # CONFIG_FEATURE_FTPD_AUTHENTICATION is not set -# CONFIG_FTPGET is not set -# CONFIG_FTPPUT is not set -# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set +CONFIG_FTPGET=y +CONFIG_FTPPUT=y +CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y CONFIG_HOSTNAME=y CONFIG_DNSDOMAINNAME=y # CONFIG_HTTPD is not set @@ -899,6 +908,8 @@ CONFIG_NETSTAT=y # CONFIG_FEATURE_NETSTAT_WIDE is not set # CONFIG_FEATURE_NETSTAT_PRG is not set CONFIG_NSLOOKUP=y +CONFIG_FEATURE_NSLOOKUP_BIG=y +CONFIG_FEATURE_NSLOOKUP_LONG_OPTIONS=y # CONFIG_NTPD is not set # CONFIG_FEATURE_NTPD_SERVER is not set # CONFIG_FEATURE_NTPD_CONF is not set @@ -909,6 +920,8 @@ CONFIG_FEATURE_FANCY_PING=y CONFIG_ROUTE=y # CONFIG_SLATTACH is not set # CONFIG_SSL_CLIENT is not set +CONFIG_TC=y +CONFIG_FEATURE_TC_INGRESS=y # CONFIG_TCPSVD is not set # CONFIG_UDPSVD is not set CONFIG_TELNET=y @@ -960,6 +973,7 @@ CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" # CONFIG_FEATURE_UDHCPC6_RFC3646 is not set # CONFIG_FEATURE_UDHCPC6_RFC4704 is not set # CONFIG_FEATURE_UDHCPC6_RFC4833 is not set +# CONFIG_FEATURE_UDHCPC6_RFC5970 is not set # # Common options for DHCP applets @@ -1001,8 +1015,8 @@ CONFIG_KILLALL5=y CONFIG_LSOF=y # CONFIG_MPSTAT is not set # CONFIG_NMETER is not set -# CONFIG_PGREP is not set -# CONFIG_PKILL is not set +CONFIG_PGREP=y +CONFIG_PKILL=y CONFIG_PIDOF=y CONFIG_FEATURE_PIDOF_SINGLE=y CONFIG_FEATURE_PIDOF_OMIT=y @@ -1046,6 +1060,7 @@ CONFIG_WATCH=y # CONFIG_SV is not set CONFIG_SV_DEFAULT_SERVICE_DIR="" CONFIG_SVC=y +CONFIG_SVOK=y # CONFIG_SVLOGD is not set # CONFIG_CHCON is not set # CONFIG_GETENFORCE is not set @@ -1071,9 +1086,11 @@ CONFIG_SH_IS_ASH=y # CONFIG_BASH_IS_HUSH is not set CONFIG_BASH_IS_NONE=y CONFIG_ASH=y -CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +# CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set CONFIG_ASH_INTERNAL_GLOB=y CONFIG_ASH_BASH_COMPAT=y +# CONFIG_ASH_BASH_SOURCE_CURDIR is not set +CONFIG_ASH_BASH_NOT_FOUND_HOOK=y CONFIG_ASH_JOB_CONTROL=y CONFIG_ASH_ALIAS=y CONFIG_ASH_RANDOM_SUPPORT=y @@ -1090,6 +1107,8 @@ CONFIG_ASH_CMDCMD=y # CONFIG_HUSH is not set # CONFIG_HUSH_BASH_COMPAT is not set # CONFIG_HUSH_BRACE_EXPANSION is not set +# CONFIG_HUSH_LINENO_VAR is not set +# CONFIG_HUSH_BASH_SOURCE_CURDIR is not set # CONFIG_HUSH_INTERACTIVE is not set # CONFIG_HUSH_SAVEHISTORY is not set # CONFIG_HUSH_JOB is not set @@ -1110,6 +1129,7 @@ CONFIG_ASH_CMDCMD=y # CONFIG_HUSH_READONLY is not set # CONFIG_HUSH_KILL is not set # CONFIG_HUSH_WAIT is not set +# CONFIG_HUSH_COMMAND is not set # CONFIG_HUSH_TRAP is not set # CONFIG_HUSH_TYPE is not set # CONFIG_HUSH_TIMES is not set diff --git a/buildroot-external/configs/mycroftos_rpi3_defconfig b/buildroot-external/configs/mycroftos_rpi3_defconfig index 3b18c1b9..effaf12d 100644 --- a/buildroot-external/configs/mycroftos_rpi3_defconfig +++ b/buildroot-external/configs/mycroftos_rpi3_defconfig @@ -4,14 +4,19 @@ BR2_ARM_FPU_NEON_VFPV4=y BR2_DL_DIR="../downloads" BR2_CCACHE=y BR2_CCACHE_DIR="../ccache" +# BR2_STRIP_strip is not set BR2_OPTIMIZE_FAST=y +BR2_SHARED_STATIC_LIBS=y BR2_GLOBAL_PATCH_DIR="../buildroot-patches" -BR2_TOOLCHAIN_EXTERNAL=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +BR2_TOOLCHAIN_BUILDROOT_LOCALE=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_TARGET_GENERIC_HOSTNAME="MycroftOS" BR2_TARGET_GENERIC_ISSUE="Welcome to MycroftOS" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y 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_WHITELIST="C en_US en_US.UTF8" BR2_GENERATE_LOCALE="en_US en_US.UTF-8" @@ -47,8 +52,6 @@ BR2_PACKAGE_ALSA_UTILS_BAT=y BR2_PACKAGE_ALSA_UTILS_IECSET=y BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y BR2_PACKAGE_BLUEZ_ALSA=y -BR2_PACKAGE_ESPEAK=y -BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_ALSA=y BR2_PACKAGE_FFMPEG_GPL=y BR2_PACKAGE_FFMPEG_NONFREE=y BR2_PACKAGE_FLAC=y @@ -57,10 +60,10 @@ 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 @@ -78,6 +81,7 @@ BR2_PACKAGE_PKGCONF=y BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y BR2_PACKAGE_NTFS_3G=y +BR2_PACKAGE_FBV=y BR2_PACKAGE_RPI_BT_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_X=y @@ -85,7 +89,6 @@ BR2_PACKAGE_RPI_WIFI_FIRMWARE=y BR2_PACKAGE_DBUS_PYTHON=y BR2_PACKAGE_KBD=y BR2_PACKAGE_PARTED=y -BR2_PACKAGE_RPI_USERLAND=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON3_PY_ONLY=y BR2_PACKAGE_PYTHON3_BZIP2=y @@ -103,41 +106,36 @@ BR2_PACKAGE_PYTHON_DAEMONIZE=y BR2_PACKAGE_PYTHON_GOBJECT=y BR2_PACKAGE_PYTHON_LXML=y BR2_PACKAGE_PYTHON_NETADDR=y -BR2_PACKAGE_PYTHON_NETIFACES=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_PYTZ=y -BR2_PACKAGE_PYTHON_PYYAML=y BR2_PACKAGE_PYTHON_SERIAL=y BR2_PACKAGE_PYTHON_TEXTTABLE=y BR2_PACKAGE_PYTHON_TORNADO=y BR2_PACKAGE_PYTHON_WEBSOCKET_CLIENT=y -BR2_PACKAGE_AUDIOFILE=y +BR2_PACKAGE_PYTHON_WRAPT=y +BR2_PACKAGE_PORTAUDIO=y BR2_PACKAGE_PORTAUDIO_OSS=y BR2_PACKAGE_SPEEXDSP=y -BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING=y BR2_PACKAGE_LIBARCHIVE=y BR2_PACKAGE_LIBARCHIVE_BSDTAR=y BR2_PACKAGE_LIBARCHIVE_BSDCPIO=y BR2_PACKAGE_LIBARCHIVE_BSDCAT=y BR2_PACKAGE_LIBZIP=y -BR2_PACKAGE_LZO=y -BR2_PACKAGE_SNAPPY=y BR2_PACKAGE_CA_CERTIFICATES=y BR2_PACKAGE_LIBOPENSSL_BIN=y BR2_PACKAGE_LIBOPENSSL_ENGINES=y BR2_PACKAGE_LIBCONFIG=y BR2_PACKAGE_LIBNFS=y -BR2_PACKAGE_JPEG=y -BR2_PACKAGE_LIBPNG=y BR2_PACKAGE_BCM2835=y BR2_PACKAGE_WIRINGPI=y +BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_LIBMPEG2=y BR2_PACKAGE_LIBMPEG2_BINS=y -BR2_PACKAGE_LIBOPENH264=y BR2_PACKAGE_LIBTHEORA=y BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_CURL=y @@ -152,7 +150,6 @@ BR2_PACKAGE_PCRE2_32=y BR2_PACKAGE_CONNMAN=y BR2_PACKAGE_CONNMAN_WIFI=y BR2_PACKAGE_CONNMAN_BLUETOOTH=y -BR2_PACKAGE_DROPBEAR=y BR2_PACKAGE_IW=y BR2_PACKAGE_NTP=y BR2_PACKAGE_OPENSSH=y @@ -176,14 +173,16 @@ BR2_PACKAGE_UTIL_LINUX_MORE=y BR2_PACKAGE_UTIL_LINUX_MOUNT=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="768M" +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_FANN=y +BR2_PACKAGE_RESPEAKER=y BR2_PACKAGE_PYTHON_ADAPT_PARSER=y BR2_PACKAGE_PYTHON_COVERALLS=y BR2_PACKAGE_PYTHON_DEPRECATED=y @@ -200,7 +199,6 @@ BR2_PACKAGE_PYTHON_OLEFILE=y BR2_PACKAGE_PYTHON_PADATIOUS=y BR2_PACKAGE_PYTHON_PEP8=y BR2_PACKAGE_PYTHON_PETACT=y -BR2_PACKAGE_PYTHON_PIP=y BR2_PACKAGE_PYTHON_POCKETSPHINX=y BR2_PACKAGE_PYTHON_PRECISE_RUNNER=y BR2_PACKAGE_PYTHON_PULSECTL=y @@ -211,5 +209,4 @@ BR2_PACKAGE_PYTHON_SGMLLIB3K=y BR2_PACKAGE_PYTHON_SOURCE=y BR2_PACKAGE_PYTHON_SPEECHRECOGNITION=y BR2_PACKAGE_PYTHON_VLC=y -BR2_PACKAGE_PYTHON_WRAPT=y BR2_PACKAGE_PYTHON_XMLRUNNER=y diff --git a/buildroot-external/package/python-coveralls/python-coveralls.hash b/buildroot-external/package/python-coveralls/python-coveralls.hash index 22c377c7..61eb20d4 100644 --- a/buildroot-external/package/python-coveralls/python-coveralls.hash +++ b/buildroot-external/package/python-coveralls/python-coveralls.hash @@ -1,5 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/coveralls/json md5 17590cc28420c62c654d23ae4f2d0ada coveralls-1.5.0.tar.gz sha256 9dee67e78ec17b36c52b778247762851c8e19a893c9a14e921a2fc37f05fac22 coveralls-1.5.0.tar.gz +sha256 ab638e88d38916a6cedbf80a9cd8992d5fa55c77ab755e262e00b36792b7cd6d coveralls-1.5.1.tar.gz # Locally computed sha256 checksums sha256 2bdbe1aad6b2e8ed03146162233339b470815ad576986377dbd541b9c032f72f LICENSE.txt diff --git a/buildroot-external/package/python-coveralls/python-coveralls.mk b/buildroot-external/package/python-coveralls/python-coveralls.mk index edcd85e9..0b3a24ac 100644 --- a/buildroot-external/package/python-coveralls/python-coveralls.mk +++ b/buildroot-external/package/python-coveralls/python-coveralls.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_COVERALLS_VERSION = 1.5.0 +PYTHON_COVERALLS_VERSION = 1.5.1 PYTHON_COVERALLS_SOURCE = coveralls-$(PYTHON_COVERALLS_VERSION).tar.gz -PYTHON_COVERALLS_SITE = https://files.pythonhosted.org/packages/b4/2f/aa954703728177258a935b766004f7504b9a4ff8c8aec0adee3d311feec2 +PYTHON_COVERALLS_SITE = https://files.pythonhosted.org/packages/d2/4a/d0966ab522988667a9f23886dcec5cc029f1eb9848843466fbd2bb7a37fb PYTHON_COVERALLS_SETUP_TYPE = setuptools PYTHON_COVERALLS_LICENSE = MIT PYTHON_COVERALLS_LICENSE_FILES = LICENSE.txt diff --git a/buildroot-external/package/python-gtts/python-gtts.mk b/buildroot-external/package/python-gtts/python-gtts.mk index d9492b55..2a203e16 100644 --- a/buildroot-external/package/python-gtts/python-gtts.mk +++ b/buildroot-external/package/python-gtts/python-gtts.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_GTTS_VERSION = 1.1.7 +PYTHON_GTTS_VERSION = 2.0.1 PYTHON_GTTS_SOURCE = gTTS-$(PYTHON_GTTS_VERSION).tar.gz -PYTHON_GTTS_SITE = https://files.pythonhosted.org/packages/9d/7d/ae1af3b5e4912a630d7aae23c43577799cf49cddd0f5a00a33791d414c2d +PYTHON_GTTS_SITE = https://files.pythonhosted.org/packages/52/6e/ae8bd869f7166ab541721e9af7b31d7e54901ce96622620e23e2ae141055 PYTHON_GTTS_SETUP_TYPE = setuptools PYTHON_GTTS_LICENSE = MIT PYTHON_GTTS_LICENSE_FILES = LICENSE diff --git a/buildroot-external/package/python-gtts_token/python-gtts_token.hash b/buildroot-external/package/python-gtts_token/python-gtts_token.hash index f9ad563a..c58ad818 100644 --- a/buildroot-external/package/python-gtts_token/python-gtts_token.hash +++ b/buildroot-external/package/python-gtts_token/python-gtts_token.hash @@ -2,3 +2,4 @@ md5 39f56680d81c3d553ccc663f013a48f8 gTTS-token-1.1.1.zip sha256 74badf3ba37773d8ba4a462a09b64de76a0ebd4015d667a6fdb041c2219283ef gTTS-token-1.1.1.zip sha256 a45d62dc3a4c5ea71ee1fc3349661394cf84cc801197748f408402b2041d6f32 gTTS-token-1.1.2.tar.gz +sha256 9d6819a85b813f235397ef931ad4b680f03d843c9b2a9e74dd95175a4bc012c5 gTTS-token-1.1.3.tar.gz diff --git a/buildroot-external/package/python-gtts_token/python-gtts_token.mk b/buildroot-external/package/python-gtts_token/python-gtts_token.mk index a6f0e94d..d5deded0 100644 --- a/buildroot-external/package/python-gtts_token/python-gtts_token.mk +++ b/buildroot-external/package/python-gtts_token/python-gtts_token.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_GTTS_TOKEN_VERSION = 1.1.2 +PYTHON_GTTS_TOKEN_VERSION = 1.1.3 PYTHON_GTTS_TOKEN_SOURCE = gTTS-token-$(PYTHON_GTTS_TOKEN_VERSION).tar.gz -PYTHON_GTTS_TOKEN_SITE = https://files.pythonhosted.org/packages/5a/81/b54c771ee6a78bdb6aebc274d7a806ad1f8761462f3592f3781d5cd9046f +PYTHON_GTTS_TOKEN_SITE = https://files.pythonhosted.org/packages/e7/25/ca6e9cd3275bfc3097fe6b06cc31db6d3dfaf32e032e0f73fead9c9a03ce PYTHON_GTTS_TOKEN_SETUP_TYPE = setuptools PYTHON_GTTS_TOKEN_LICENSE = MIT diff --git a/buildroot-external/package/python-msk/python-msk.hash b/buildroot-external/package/python-msk/python-msk.hash index d0f5d375..6ad0de78 100644 --- a/buildroot-external/package/python-msk/python-msk.hash +++ b/buildroot-external/package/python-msk/python-msk.hash @@ -1,3 +1,4 @@ # md5, sha256 from https://pypi.org/pypi/msk/json md5 1460094aeffac634008ba1dd12348c3b msk-0.3.11.tar.gz sha256 d5c157a60eecba4c3b07de89e43e85dec366b5ecdd3677f7e73c0c4cddf01b74 msk-0.3.11.tar.gz +sha256 8e5a1fb7afa22977a9d6ee0835ac52420b74324c1d2088286aacc485a521e573 msk-0.3.12.tar.gz diff --git a/buildroot-external/package/python-msk/python-msk.mk b/buildroot-external/package/python-msk/python-msk.mk index 7044914a..7996fbe1 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.11 +PYTHON_MSK_VERSION = 0.3.12 PYTHON_MSK_SOURCE = msk-$(PYTHON_MSK_VERSION).tar.gz -PYTHON_MSK_SITE = https://files.pythonhosted.org/packages/6d/2d/561d58e16d456ee5ca79d6dff3fb053f56da4ad62832eccce82b61a65789 +PYTHON_MSK_SITE = https://files.pythonhosted.org/packages/34/91/fad24465ad7d07184d2b7e965415f62acf90e5488cfd3fec56c89430f01b PYTHON_MSK_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/buildroot-external/package/python-msm/python-msm.hash b/buildroot-external/package/python-msm/python-msm.hash index 4f196c47..f97d6cd2 100644 --- a/buildroot-external/package/python-msm/python-msm.hash +++ b/buildroot-external/package/python-msm/python-msm.hash @@ -1,5 +1,6 @@ # 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 # 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 08c282b0..bce51d21 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.5.19 +PYTHON_MSM_VERSION = 0.6.3 PYTHON_MSM_SOURCE = msm-$(PYTHON_MSM_VERSION).tar.gz -PYTHON_MSM_SITE = https://files.pythonhosted.org/packages/ee/ee/8e1dd6ceefea93e2c7009ad7d9b2fb9fcfacad8321042611a4f1179f3e86 +PYTHON_MSM_SITE = https://files.pythonhosted.org/packages/8d/07/7fd52f9c7690925d48fffea97ec594beee797a75afd1e082ffe7b90dd341 PYTHON_MSM_SETUP_TYPE = setuptools PYTHON_MSM_LICENSE = Apache-2.0 PYTHON_MSM_LICENSE_FILES = LICENSE diff --git a/buildroot-external/package/python-mycroft/0002-Force-USER-config-path-to-root.patch b/buildroot-external/package/python-mycroft/0002-Force-USER-config-path-to-root.patch deleted file mode 100644 index bdead728..00000000 --- a/buildroot-external/package/python-mycroft/0002-Force-USER-config-path-to-root.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 93b3e606dddd93e8346da265a1751ecb546c882b Mon Sep 17 00:00:00 2001 -From: Peter Steenbergen -Date: Sat, 13 Oct 2018 10:50:06 +0200 -Subject: [PATCH 1/1] Force USER config path. - ---- - mycroft/configuration/locations.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mycroft/configuration/locations.py b/mycroft/configuration/locations.py -index 0759152f99..3666ac5dfa 100644 ---- a/mycroft/configuration/locations.py -+++ b/mycroft/configuration/locations.py -@@ -15,5 +15,5 @@ from os.path import join, dirname, expanduser - - DEFAULT_CONFIG = join(dirname(__file__), 'mycroft.conf') - SYSTEM_CONFIG = '/etc/mycroft/mycroft.conf' --USER_CONFIG = join(expanduser('~'), '.mycroft/mycroft.conf') -+USER_CONFIG = '/.mycroft/mycroft.conf' - REMOTE_CONFIG = "mycroft.ai" --- -2.11.0 - diff --git a/buildroot-external/package/python-mycroft/python-mycroft.hash b/buildroot-external/package/python-mycroft/python-mycroft.hash index 2115b79b..153a936f 100644 --- a/buildroot-external/package/python-mycroft/python-mycroft.hash +++ b/buildroot-external/package/python-mycroft/python-mycroft.hash @@ -1,3 +1,7 @@ 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 diff --git a/buildroot-external/package/python-mycroft/python-mycroft.mk b/buildroot-external/package/python-mycroft/python-mycroft.mk index e7d7323e..a7384e66 100644 --- a/buildroot-external/package/python-mycroft/python-mycroft.mk +++ b/buildroot-external/package/python-mycroft/python-mycroft.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_MYCROFT_VERSION = v18.8.3 +PYTHON_MYCROFT_VERSION = v18.8.11 PYTHON_MYCROFT_SITE = $(call github,MycroftAI,mycroft-core,release/$(PYTHON_MYCROFT_VERSION)) PYTHON_MYCROFT_SETUP_TYPE = setuptools PYTHON_MYCROFT_LICENSE_FILES = diff --git a/buildroot-external/package/python-padaos/python-padaos.hash b/buildroot-external/package/python-padaos/python-padaos.hash index aa6ecd2c..3e500b70 100644 --- a/buildroot-external/package/python-padaos/python-padaos.hash +++ b/buildroot-external/package/python-padaos/python-padaos.hash @@ -2,3 +2,4 @@ sha256 06fb231807f1c82d6fe8014e81d8a97124219fe6bcbccc020d445ca22d437146 padaos-0.1.6.tar.gz md5 5dbb47982c859449f06decde6d240bd9 padaos-0.1.7.tar.gz sha256 0703a5fec01a5b40038e90a32c39ac4c2c59b2a91b9bd1624408f017a2f61db3 padaos-0.1.7.tar.gz +sha256 287310c7299a1c3ea2d0f8193caf83944d297a30a131b298bc29379acc46714e padaos-0.1.8.tar.gz diff --git a/buildroot-external/package/python-padaos/python-padaos.mk b/buildroot-external/package/python-padaos/python-padaos.mk index 7eb582f3..d3589561 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.7 +PYTHON_PADAOS_VERSION = 0.1.8 PYTHON_PADAOS_SOURCE = padaos-$(PYTHON_PADAOS_VERSION).tar.gz -PYTHON_PADAOS_SITE = https://files.pythonhosted.org/packages/35/e0/ec50c08c5e8c5e049be9f841dae766c570e600c36730888be6cf1d317266 +PYTHON_PADAOS_SITE = https://files.pythonhosted.org/packages/1b/5a/8b9053ef320f958b52c8881e0a8147faea5dd87e0fbf26958b7069ab7f76 PYTHON_PADAOS_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/buildroot-external/package/python-pip/Config.in b/buildroot-external/package/python-pip/Config.in deleted file mode 100644 index 4fcd55e5..00000000 --- a/buildroot-external/package/python-pip/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_PIP - bool "python-pip" - help - The PyPA recommended tool for installing Python packages. - - https://pip.pypa.io/ diff --git a/buildroot-external/package/python-pip/python-pip.hash b/buildroot-external/package/python-pip/python-pip.hash deleted file mode 100644 index c9b574a6..00000000 --- a/buildroot-external/package/python-pip/python-pip.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/pip/json -md5 52f75ceb21e96c258f289859a2996b60 pip-18.0.tar.gz -sha256 a0e11645ee37c90b40c46d607070c4fd583e2cd46231b1c06e389c5e814eed76 pip-18.0.tar.gz -# Locally computed sha256 checksums -sha256 391a8784e319dae5431477d4cc9bc504fc5d71fd9e89e1c80f1cd3855f5d7cfa LICENSE.txt diff --git a/buildroot-external/package/python-pip/python-pip.mk b/buildroot-external/package/python-pip/python-pip.mk deleted file mode 100644 index 8b07e0ab..00000000 --- a/buildroot-external/package/python-pip/python-pip.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# python-pip -# -################################################################################ - -PYTHON_PIP_VERSION = 18.0 -PYTHON_PIP_SOURCE = pip-$(PYTHON_PIP_VERSION).tar.gz -PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/69/81/52b68d0a4de760a2f1979b0931ba7889202f302072cc7a0d614211bc7579 -PYTHON_PIP_SETUP_TYPE = setuptools -PYTHON_PIP_LICENSE = MIT -PYTHON_PIP_LICENSE_FILES = LICENSE.txt - -$(eval $(python-package)) -$(eval $(host-python-package)) diff --git a/buildroot-external/package/python-pyasn1-modules/Config.in b/buildroot-external/package/python-pyasn1-modules/Config.in deleted file mode 100644 index 6aff4d93..00000000 --- a/buildroot-external/package/python-pyasn1-modules/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYASN1_MODULES - bool "python-pyasn1-modules" - select BR2_PACKAGE_PYTHON_PYASN1 # runtime - help - A collection of ASN.1-based protocols modules. - - https://github.com/etingof/pyasn1-modules diff --git a/buildroot-external/package/python-pyasn1-modules/python-pyasn1-modules.hash b/buildroot-external/package/python-pyasn1-modules/python-pyasn1-modules.hash deleted file mode 100644 index 7c7f0246..00000000 --- a/buildroot-external/package/python-pyasn1-modules/python-pyasn1-modules.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/pyasn1-modules/json -md5 65ce1ea1021679bffe96065baab232de pyasn1-modules-0.2.2.tar.gz -sha256 a0cf3e1842e7c60fde97cb22d275eb6f9524f5c5250489e292529de841417547 pyasn1-modules-0.2.2.tar.gz -# Locally computed sha256 checksums -sha256 f82128f64d567c333936a12b99a21d0e8cd66ce628d51ce0a7770cc38dc7fe43 LICENSE.txt diff --git a/buildroot-external/package/python-pyasn1-modules/python-pyasn1-modules.mk b/buildroot-external/package/python-pyasn1-modules/python-pyasn1-modules.mk deleted file mode 100644 index dbdf82e6..00000000 --- a/buildroot-external/package/python-pyasn1-modules/python-pyasn1-modules.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pyasn1-modules -# -################################################################################ - -PYTHON_PYASN1_MODULES_VERSION = 0.2.2 -PYTHON_PYASN1_MODULES_SOURCE = pyasn1-modules-$(PYTHON_PYASN1_MODULES_VERSION).tar.gz -PYTHON_PYASN1_MODULES_SITE = https://files.pythonhosted.org/packages/37/33/74ebdc52be534e683dc91faf263931bc00ae05c6073909fde53999088541 -PYTHON_PYASN1_MODULES_SETUP_TYPE = setuptools -PYTHON_PYASN1_MODULES_LICENSE = BSD-2-Clause -PYTHON_PYASN1_MODULES_LICENSE_FILES = LICENSE.txt - -$(eval $(python-package)) diff --git a/buildroot-external/package/python-pyasn1/Config.in b/buildroot-external/package/python-pyasn1/Config.in deleted file mode 100644 index fea63813..00000000 --- a/buildroot-external/package/python-pyasn1/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYASN1 - bool "python-pyasn1" - help - ASN.1 types and codecs. - - https://github.com/etingof/pyasn1 diff --git a/buildroot-external/package/python-pyasn1/python-pyasn1.hash b/buildroot-external/package/python-pyasn1/python-pyasn1.hash deleted file mode 100644 index 4b7f69f6..00000000 --- a/buildroot-external/package/python-pyasn1/python-pyasn1.hash +++ /dev/null @@ -1,6 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/pyasn1/json -md5 0d182b71e1f72fe147d7957bc90be7f2 pyasn1-0.4.4.tar.gz -sha256 f58f2a3d12fd754aa123e9fa74fb7345333000a035f3921dbdaa08597aa53137 pyasn1-0.4.4.tar.gz -# Locally computed sha256 checksums -sha256 f82128f64d567c333936a12b99a21d0e8cd66ce628d51ce0a7770cc38dc7fe43 LICENSE.rst -sha256 2fd7257410c4d7d9c8d8d85cb7f9f4ef9eee34126a96a993245c71577997c345 docs/source/license.rst diff --git a/buildroot-external/package/python-pyasn1/python-pyasn1.mk b/buildroot-external/package/python-pyasn1/python-pyasn1.mk deleted file mode 100644 index 227a309b..00000000 --- a/buildroot-external/package/python-pyasn1/python-pyasn1.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pyasn1 -# -################################################################################ - -PYTHON_PYASN1_VERSION = 0.4.4 -PYTHON_PYASN1_SOURCE = pyasn1-$(PYTHON_PYASN1_VERSION).tar.gz -PYTHON_PYASN1_SITE = https://files.pythonhosted.org/packages/10/46/059775dc8e50f722d205452bced4b3cc965d27e8c3389156acd3b1123ae3 -PYTHON_PYASN1_SETUP_TYPE = setuptools -PYTHON_PYASN1_LICENSE = BSD-2-Clause -PYTHON_PYASN1_LICENSE_FILES = LICENSE.rst docs/source/license.rst - -$(eval $(python-package)) diff --git a/buildroot-external/package/python-typing/Config.in b/buildroot-external/package/python-typing/Config.in deleted file mode 100644 index b295a2aa..00000000 --- a/buildroot-external/package/python-typing/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_TYPING - bool "python-typing" - help - Type Hints for Python. - - https://docs.python.org/3/library/typing.html diff --git a/buildroot-external/package/python-typing/python-typing.hash b/buildroot-external/package/python-typing/python-typing.hash deleted file mode 100644 index 5bdb8c62..00000000 --- a/buildroot-external/package/python-typing/python-typing.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/typing/json -md5 64614206b4bdc0864fc0e0bccd69efc9 typing-3.6.6.tar.gz -sha256 4027c5f6127a6267a435201981ba156de91ad0d1d98e9ddc2aa173453453492d typing-3.6.6.tar.gz -# Locally computed sha256 checksums -sha256 ff17ce94e102024deb68773eb1cc74ca76da4e658f373531f0ac22d68a6bb1ad LICENSE diff --git a/buildroot-external/package/python-typing/python-typing.mk b/buildroot-external/package/python-typing/python-typing.mk deleted file mode 100644 index 33957ed7..00000000 --- a/buildroot-external/package/python-typing/python-typing.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# python-typing -# -################################################################################ - -PYTHON_TYPING_VERSION = 3.6.6 -PYTHON_TYPING_SOURCE = typing-$(PYTHON_TYPING_VERSION).tar.gz -PYTHON_TYPING_SITE = https://files.pythonhosted.org/packages/bf/9b/2bf84e841575b633d8d91ad923e198a415e3901f228715524689495b4317 -PYTHON_TYPING_SETUP_TYPE = setuptools -PYTHON_TYPING_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/buildroot-external/package/python-wrapt/Config.in b/buildroot-external/package/python-wrapt/Config.in deleted file mode 100644 index da315c9a..00000000 --- a/buildroot-external/package/python-wrapt/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_WRAPT - bool "python-wrapt" - help - Module for decorators, wrappers and monkey patching. - - https://github.com/GrahamDumpleton/wrapt diff --git a/buildroot-external/package/python-wrapt/python-wrapt.hash b/buildroot-external/package/python-wrapt/python-wrapt.hash deleted file mode 100644 index dbf89329..00000000 --- a/buildroot-external/package/python-wrapt/python-wrapt.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/wrapt/json -md5 e1346f31782d50401f81c2345b037076 wrapt-1.10.11.tar.gz -sha256 d4d560d479f2c21e1b5443bbd15fe7ec4b37fe7e53d335d3b9b0a7b1226fe3c6 wrapt-1.10.11.tar.gz -# Locally computed sha256 checksums -sha256 b6d2e5d228202a11bc5e5988661fc5d8acc1ba4f27256c37e19029131a30b1f2 LICENSE diff --git a/buildroot-external/package/python-wrapt/python-wrapt.mk b/buildroot-external/package/python-wrapt/python-wrapt.mk deleted file mode 100644 index dd8b9a58..00000000 --- a/buildroot-external/package/python-wrapt/python-wrapt.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-wrapt -# -################################################################################ - -PYTHON_WRAPT_VERSION = 1.10.11 -PYTHON_WRAPT_SOURCE = wrapt-$(PYTHON_WRAPT_VERSION).tar.gz -PYTHON_WRAPT_SITE = https://files.pythonhosted.org/packages/a0/47/66897906448185fcb77fc3c2b1bc20ed0ecca81a0f2f88eda3fc5a34fc3d -PYTHON_WRAPT_SETUP_TYPE = distutils -PYTHON_WRAPT_LICENSE = BSD-2-Clause -PYTHON_WRAPT_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/buildroot-external/package/python-zeroconf/Config.in b/buildroot-external/package/python-zeroconf/Config.in deleted file mode 100644 index f86a5abd..00000000 --- a/buildroot-external/package/python-zeroconf/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_ZEROCONF - bool "python-zeroconf" - select BR2_PACKAGE_PYTHON_IFADDR # runtime - select BR2_PACKAGE_PYTHON_TYPING # runtime - help - Pure Python Multicast DNS Service Discovery Library - (Bonjour/Avahi compatible). - - https://github.com/jstasiak/python-zeroconf diff --git a/buildroot-external/package/python-zeroconf/python-zeroconf.hash b/buildroot-external/package/python-zeroconf/python-zeroconf.hash deleted file mode 100644 index 6a28448e..00000000 --- a/buildroot-external/package/python-zeroconf/python-zeroconf.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/zeroconf/json -md5 c853680c933a1d0791a763ceade674fa zeroconf-0.21.1.tar.gz -sha256 2e2fde39a3062f89f32a3c4badcd3ba38eb58480961e16540674200a91fec6f9 zeroconf-0.21.1.tar.gz -# Locally computed sha256 checksums -sha256 bb117c0fbd7f57f64170b690285d7df07c2371b578e3b3cd3aa2e1155ef461a0 COPYING diff --git a/buildroot-external/package/python-zeroconf/python-zeroconf.mk b/buildroot-external/package/python-zeroconf/python-zeroconf.mk deleted file mode 100644 index c785fc3d..00000000 --- a/buildroot-external/package/python-zeroconf/python-zeroconf.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-zeroconf -# -################################################################################ - -PYTHON_ZEROCONF_VERSION = 0.21.1 -PYTHON_ZEROCONF_SOURCE = zeroconf-$(PYTHON_ZEROCONF_VERSION).tar.gz -PYTHON_ZEROCONF_SITE = https://files.pythonhosted.org/packages/44/94/459e1fc9b5bfec4dfd7a48c563c47b5961153c78c2f145bb5bb73e722ba0 -PYTHON_ZEROCONF_SETUP_TYPE = setuptools -PYTHON_ZEROCONF_LICENSE = LGPL-2.1 -PYTHON_ZEROCONF_LICENSE_FILES = COPYING - -$(eval $(python-package)) diff --git a/buildroot-external/package/respeaker/Config.in b/buildroot-external/package/respeaker/Config.in new file mode 100644 index 00000000..8a01b876 --- /dev/null +++ b/buildroot-external/package/respeaker/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_RESPEAKER + bool "respeaker" + select BR2_PACKAGE_RPI_USERLAND + select BR2_PACKAGE_DTC + select BR2_PACKAGE_DTC_PROGRAMS + help + The ReSpeaker series is a family of + development boards designed to enable + a future where voice interface is part + of everyday human-device interaction. + Designed to be easily integrated (and + customized) into products, but also to + allow other services and products to be + easily integrated into it. + + https://respeaker.io/ + diff --git a/buildroot-external/package/respeaker/S16respeaker_modules b/buildroot-external/package/respeaker/S16respeaker_modules new file mode 100755 index 00000000..d659cfcd --- /dev/null +++ b/buildroot-external/package/respeaker/S16respeaker_modules @@ -0,0 +1,8 @@ +#!/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 new file mode 100755 index 00000000..960228e4 --- /dev/null +++ b/buildroot-external/package/respeaker/S60seeed_voicecard @@ -0,0 +1,11 @@ +#!/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.hash b/buildroot-external/package/respeaker/respeaker.hash new file mode 100644 index 00000000..c5e6ee43 --- /dev/null +++ b/buildroot-external/package/respeaker/respeaker.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 9f38d832acbfc7f07a58f15222d2fdcc0a9215ede488ccafb5c89a3e8223883d respeaker-be0812c70be29b0666a89f22a9d403cfb4c48fca.tar.gz diff --git a/buildroot-external/package/respeaker/respeaker.mk b/buildroot-external/package/respeaker/respeaker.mk new file mode 100644 index 00000000..2bc936e7 --- /dev/null +++ b/buildroot-external/package/respeaker/respeaker.mk @@ -0,0 +1,31 @@ +################################################################################ +# +# respeaker +# +################################################################################ + +RESPEAKER_VERSION = be0812c70be29b0666a89f22a9d403cfb4c48fca +RESPEAKER_SITE = $(call github,respeaker,seeed-voicecard,$(RESPEAKER_VERSION)) +RESPEAKER_LICENSE = GNU General Public License v3.0 +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 + + 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 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/ +endef + +$(eval $(generic-package)) diff --git a/buildroot-external/rootfs-overlay/etc/init.d/S00asplash b/buildroot-external/rootfs-overlay/etc/init.d/S00asplash new file mode 100755 index 00000000..2c52ed5f --- /dev/null +++ b/buildroot-external/rootfs-overlay/etc/init.d/S00asplash @@ -0,0 +1,22 @@ +#!/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 new file mode 100755 index 00000000..085e5be6 --- /dev/null +++ b/buildroot-external/rootfs-overlay/etc/init.d/S00resize_sdcard @@ -0,0 +1,25 @@ +#!/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/S00resizefs_once b/buildroot-external/rootfs-overlay/etc/init.d/S00resizefs_once deleted file mode 100644 index 39cc5fb4..00000000 --- a/buildroot-external/rootfs-overlay/etc/init.d/S00resizefs_once +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# -# Auto resize root partition at first boot after init_resize -# - -start() { - printf "Starting resize2fs_once: " - ROOT_DEV=$(findmnt / -o source -n) && - resize2fs $ROOT_DEV && - rm /etc/init.d/S00resizefs_once && - 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/S50pulseaudio b/buildroot-external/rootfs-overlay/etc/init.d/S50pulseaudio deleted file mode 100755 index e836ee4d..00000000 --- a/buildroot-external/rootfs-overlay/etc/init.d/S50pulseaudio +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# -# Starts pulseaudio. -# - - -start() { - printf "Starting pulseaudio: " - umask 007 - /usr/bin/pulseaudio --system --daemonize --disallow-exit - echo "OK" -} -stop() { - printf "Stopping pulseaudio: " - pulseaudio --kill - 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/init.d/S90mycroft_prepare b/buildroot-external/rootfs-overlay/etc/init.d/S90mycroft_prepare index 7fe316ac..0553ae9a 100755 --- a/buildroot-external/rootfs-overlay/etc/init.d/S90mycroft_prepare +++ b/buildroot-external/rootfs-overlay/etc/init.d/S90mycroft_prepare @@ -18,6 +18,16 @@ start() { 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) diff --git a/buildroot-external/rootfs-overlay/etc/init.d/init_resize.sh b/buildroot-external/rootfs-overlay/etc/init.d/init_resize.sh deleted file mode 100644 index e792e123..00000000 --- a/buildroot-external/rootfs-overlay/etc/init.d/init_resize.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -set -e - -mount -t proc proc /proc -mount -t sysfs sys /sys -mount -t tmpfs tmp /run - -mount /boot -mount / -o remount,rw - -sed -i 's| init=/etc/init.d/init_resize.sh||' /boot/cmdline.txt -sync - -DEVICE="/dev/mmcblk0" -PARTNR="p2" - -CURRENTSIZEB=`fdisk -l $DEVICE$PARTNR | grep "Disk $DEVICE$PARTNR" | cut -d' ' -f5` -CURRENTSIZE=`expr $CURRENTSIZEB / 1024 / 1024` -MAXSIZEMB=`printf %s\\n 'unit MB print list' | parted | grep "Disk ${DEVICE}" | cut -d' ' -f3 | tr -d MB` - -echo "[ok] applying resize operation.." -parted ${DEVICE} resizepart ${PARTNR} ${MAXSIZEMB} -echo "[done]" - -partprobe $DEVICE - -umount /boot -mount / -o remount,ro -sync - -reboot diff --git a/buildroot-external/rootfs-overlay/etc/inittab b/buildroot-external/rootfs-overlay/etc/inittab new file mode 100644 index 00000000..26f3be5d --- /dev/null +++ b/buildroot-external/rootfs-overlay/etc/inittab @@ -0,0 +1,40 @@ +# /etc/inittab +# +# Copyright (C) 2001 Erik Andersen +# +# Note: BusyBox init doesn't support runlevels. The runlevels field is +# completely ignored by BusyBox init. If you want runlevels, use +# sysvinit. +# +# Format for each entry: ::: +# +# id == tty to run on, or empty for /dev/console +# runlevels == ignored +# action == one of sysinit, respawn, askfirst, wait, and once +# process == program to run + +# Startup the system +::sysinit:/bin/mount -t proc proc /proc +::sysinit:/bin/mount -o remount,rw / +::sysinit:/bin/mkdir -p /dev/pts /dev/shm +::sysinit:/bin/mount -a +::sysinit:/sbin/swapon -a +null::sysinit:/bin/ln -sf /proc/self/fd /dev/fd +null::sysinit:/bin/ln -sf /proc/self/fd/0 /dev/stdin +null::sysinit:/bin/ln -sf /proc/self/fd/1 /dev/stdout +null::sysinit:/bin/ln -sf /proc/self/fd/2 /dev/stderr +::sysinit:/bin/hostname -F /etc/hostname +# now run any rc scripts +::sysinit:/etc/init.d/rcS + +# Put a getty on the serial port +#ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100 # GENERIC_SERIAL +#tty1::respawn:/sbin/getty -L tty1 0 vt100 # HDMI console + +# Stuff to do for the 3-finger salute +#::ctrlaltdel:/sbin/reboot + +# Stuff to do before rebooting +::shutdown:/etc/init.d/rcK +::shutdown:/sbin/swapoff -a +::shutdown:/bin/umount -a -r diff --git a/buildroot-external/rootfs-overlay/etc/pulse/system.pa b/buildroot-external/rootfs-overlay/etc/pulse/system.pa deleted file mode 100644 index 5d1746b8..00000000 --- a/buildroot-external/rootfs-overlay/etc/pulse/system.pa +++ /dev/null @@ -1,57 +0,0 @@ -#!/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 load driver modules depending on the hardware available -.ifexists module-detect.so -### 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 - -### Automatically restore the volume of streams and devices -load-module module-stream-restore -load-module module-device-restore - -### 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 - -#allow localhost connections -load-module module-native-protocol-tcp auth-anonymous=true diff --git a/buildroot-external/rootfs-overlay/etc/ssh/sshd_config b/buildroot-external/rootfs-overlay/etc/ssh/sshd_config new file mode 100644 index 00000000..44fff67b --- /dev/null +++ b/buildroot-external/rootfs-overlay/etc/ssh/sshd_config @@ -0,0 +1,118 @@ +# $OpenBSD: sshd_config,v 1.103 2018/04/09 20:41:22 tj Exp $ + +# This is the sshd server system-wide configuration file. See +# sshd_config(5) for more information. + +# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin + +# The strategy used for options in the default sshd_config shipped with +# OpenSSH is to specify options with their default value where +# possible, but leave them commented. Uncommented options override the +# default value. + +#Port 22 +#AddressFamily any +#ListenAddress 0.0.0.0 +#ListenAddress :: + +#HostKey /etc/ssh/ssh_host_rsa_key +#HostKey /etc/ssh/ssh_host_ecdsa_key +#HostKey /etc/ssh/ssh_host_ed25519_key + +# Ciphers and keying +#RekeyLimit default none + +# Logging +#SyslogFacility AUTH +#LogLevel INFO + +# Authentication: + +#LoginGraceTime 2m +PermitRootLogin yes +#StrictModes yes +#MaxAuthTries 6 +#MaxSessions 10 + +#PubkeyAuthentication yes + +# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2 +# but this is overridden so installations will only check .ssh/authorized_keys +AuthorizedKeysFile .ssh/authorized_keys + +#AuthorizedPrincipalsFile none + +#AuthorizedKeysCommand none +#AuthorizedKeysCommandUser nobody + +# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts +#HostbasedAuthentication no +# Change to yes if you don't trust ~/.ssh/known_hosts for +# HostbasedAuthentication +#IgnoreUserKnownHosts no +# Don't read the user's ~/.rhosts and ~/.shosts files +#IgnoreRhosts yes + +# To disable tunneled clear text passwords, change to no here! +#PasswordAuthentication yes +#PermitEmptyPasswords no + +# Change to no to disable s/key passwords +#ChallengeResponseAuthentication yes + +# Kerberos options +#KerberosAuthentication no +#KerberosOrLocalPasswd yes +#KerberosTicketCleanup yes +#KerberosGetAFSToken no + +# GSSAPI options +#GSSAPIAuthentication no +#GSSAPICleanupCredentials yes + +# Set this to 'yes' to enable PAM authentication, account processing, +# and session processing. If this is enabled, PAM authentication will +# be allowed through the ChallengeResponseAuthentication and +# PasswordAuthentication. Depending on your PAM configuration, +# PAM authentication via ChallengeResponseAuthentication may bypass +# the setting of "PermitRootLogin without-password". +# If you just want the PAM account and session checks to run without +# PAM authentication, then enable this but set PasswordAuthentication +# and ChallengeResponseAuthentication to 'no'. +#UsePAM no + +#AllowAgentForwarding yes +#AllowTcpForwarding yes +#GatewayPorts no +#X11Forwarding no +#X11DisplayOffset 10 +#X11UseLocalhost yes +#PermitTTY yes +#PrintMotd yes +#PrintLastLog yes +#TCPKeepAlive yes +#PermitUserEnvironment no +#Compression delayed +#ClientAliveInterval 0 +#ClientAliveCountMax 3 +#UseDNS no +#PidFile /var/run/sshd.pid +#MaxStartups 10:30:100 +#PermitTunnel no +#ChrootDirectory none +#VersionAddendum none + +# no default banner path +#Banner none + +# override default of no subsystems +Subsystem sftp /usr/libexec/sftp-server + +# Example of overriding settings on a per-user basis +#Match User anoncvs +# X11Forwarding no +# AllowTcpForwarding no +# PermitTTY no +# ForceCommand cvs server + +AcceptEnv LANG LC_* diff --git a/buildroot-external/rootfs-overlay/opt/mycroft/splash/boot.png b/buildroot-external/rootfs-overlay/opt/mycroft/splash/boot.png new file mode 100644 index 00000000..d0f14d47 Binary files /dev/null and b/buildroot-external/rootfs-overlay/opt/mycroft/splash/boot.png differ diff --git a/buildroot-external/rootfs-overlay/root/.mycroft b/buildroot-external/rootfs-overlay/root/.mycroft deleted file mode 120000 index 1d8c98c4..00000000 --- a/buildroot-external/rootfs-overlay/root/.mycroft +++ /dev/null @@ -1 +0,0 @@ -../.mycroft \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/root/.mycroft/.empty b/buildroot-external/rootfs-overlay/root/.mycroft/.empty new file mode 100644 index 00000000..e69de29b diff --git a/buildroot-external/rootfs-overlay/root/.mycroft_cli.conf b/buildroot-external/rootfs-overlay/root/.mycroft_cli.conf new file mode 100644 index 00000000..e69de29b 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 index 8f2f138b..95721762 100644 --- a/buildroot-patches/0004-Downgrade-python-pillow-to-4.1.1.patch +++ b/buildroot-patches/0004-Downgrade-python-pillow-to-4.1.1.patch @@ -1,36 +1,34 @@ -From dec5d507f22137c926602d73226746cdd009db59 Mon Sep 17 00:00:00 2001 +From 78f8690894cf7fe98b16a08a6f98cbb15b2c1fa3 Mon Sep 17 00:00:00 2001 From: Peter Steenbergen -Date: Mon, 29 Oct 2018 14:15:29 +0100 +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 | 6 ++++-- + package/python-pillow/python-pillow.hash | 1 + package/python-pillow/python-pillow.mk | 4 ++-- - 2 files changed, 6 insertions(+), 4 deletions(-) + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash -index 463b5620ce..0f2be1f5ce 100644 +index 0f90a0be18..607b5d8b2b 100644 --- a/package/python-pillow/python-pillow.hash +++ b/package/python-pillow/python-pillow.hash -@@ -1,2 +1,4 @@ --# sha256 from https://pypi.org/project/Pillow/5.1.0/#files --sha256 cee9bc75bff455d317b6947081df0824a8f118de2786dc3d74a3503fd631f4ef Pillow-5.1.0.tar.gz -+# md5 from https://pypi.python.org/pypi/pillow/json, sha256 locally computed -+sha256 00b6a5f28d00f720235a937ebc2f50f4292a5c7e2d6ab9a8b26153b625c4f431 Pillow-4.1.1.tar.gz -+md5 11e5e2046cf41586716a6042d89abeeb Pillow-4.2.1.tar.gz -+sha256 c724f65870e545316f9e82e4c6d608ab5aa9dd82d5185e5b2e72119378740073 Pillow-4.2.1.tar.gz +@@ -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 c9b3e316f9..227a664dde 100644 +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.1.0 +-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/89/b8/2f49bf71cbd0e9485bb36f72d438421b69b7356180695ae10bd4fd3066f5 +-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 diff --git a/buildroot-patches/0006-Update-python-psutil-to-5.2.1.patch b/buildroot-patches/0006-Downgrade-python-psutil-to-5.2.1.patch similarity index 60% rename from buildroot-patches/0006-Update-python-psutil-to-5.2.1.patch rename to buildroot-patches/0006-Downgrade-python-psutil-to-5.2.1.patch index 4d3ab1b0..9c8f3e5b 100644 --- a/buildroot-patches/0006-Update-python-psutil-to-5.2.1.patch +++ b/buildroot-patches/0006-Downgrade-python-psutil-to-5.2.1.patch @@ -1,7 +1,7 @@ -From e73306fb7fb669b5bef8544e4c23846fd0f84653 Mon Sep 17 00:00:00 2001 +From 66186ddaab483955112c35a527cf03eaeb13a42c Mon Sep 17 00:00:00 2001 From: Peter Steenbergen -Date: Mon, 29 Oct 2018 14:20:13 +0100 -Subject: [PATCH 1/1] Update python-psutil to 5.2.1 +Date: Mon, 7 Jan 2019 14:49:01 +0100 +Subject: [PATCH 1/1] Downgrade python-psutil to 5.2.1 --- package/python-psutil/python-psutil.hash | 1 + @@ -9,26 +9,28 @@ Subject: [PATCH 1/1] Update 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 19fb8a4fdb..3aca019bca 100644 +index 1f44281e29..0599aa8eb1 100644 --- a/package/python-psutil/python-psutil.hash +++ b/package/python-psutil/python-psutil.hash -@@ -1,3 +1,4 @@ - # md5 from https://pypi.python.org/pypi/psutil/json, sha256 locally computed - md5 c9aa2599dcd9e5b59d71b6660d396062 psutil-5.2.0.tar.gz - sha256 2fc91d068faa5613c093335f0e758673ef8c722ad4bfa4aded64c13ae69089eb psutil-5.2.0.tar.gz +@@ -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 +sha256 fe0ea53b302f68fca1c2a3bac289e11344456786141b73391ed4022b412d5455 psutil-5.2.1.tar.gz + # Locally computed sha256 checksums + sha256 bb073826b0dfb43b631c38ad5d9844cda74cc631d2a5569ad8798be4274a3e17 LICENSE diff --git a/package/python-psutil/python-psutil.mk b/package/python-psutil/python-psutil.mk -index 2b41df743a..162d1b7f50 100644 +index 18567702bc..162d1b7f50 100644 --- a/package/python-psutil/python-psutil.mk +++ b/package/python-psutil/python-psutil.mk @@ -4,9 +4,9 @@ # ################################################################################ --PYTHON_PSUTIL_VERSION = 5.2.0 +-PYTHON_PSUTIL_VERSION = 5.4.8 +PYTHON_PSUTIL_VERSION = 5.2.1 PYTHON_PSUTIL_SOURCE = psutil-$(PYTHON_PSUTIL_VERSION).tar.gz --PYTHON_PSUTIL_SITE = https://pypi.python.org/packages/3c/2f/f3ab91349c666f009077157b12057e613a3152a46a6c3be883777546b6de +-PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/e3/58/0eae6e4466e5abf779d7e2b71fac7fba5f59e00ea36ddb3ed690419ccb0f +PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/b8/47/c85fbcd23f40892db6ecc88782beb6ee66d22008c2f9821d777cb1984240 PYTHON_PSUTIL_SETUP_TYPE = setuptools PYTHON_PSUTIL_LICENSE = BSD-3-Clause diff --git a/buildroot-patches/0007-Update-python-pyyaml-to-3.13.patch b/buildroot-patches/0007-Update-python-pyyaml-to-3.13.patch deleted file mode 100644 index 263f5eb6..00000000 --- a/buildroot-patches/0007-Update-python-pyyaml-to-3.13.patch +++ /dev/null @@ -1,39 +0,0 @@ -From fe4cf3fe0078c170cef37b33df04ef913ca35dfc Mon Sep 17 00:00:00 2001 -From: Peter Steenbergen -Date: Mon, 29 Oct 2018 14:22:19 +0100 -Subject: [PATCH 1/1] Update python-pyyaml to 3.13 - ---- - package/python-pyyaml/python-pyyaml.hash | 2 ++ - package/python-pyyaml/python-pyyaml.mk | 4 ++-- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/package/python-pyyaml/python-pyyaml.hash b/package/python-pyyaml/python-pyyaml.hash -index 209ab27e53..637394878f 100644 ---- a/package/python-pyyaml/python-pyyaml.hash -+++ b/package/python-pyyaml/python-pyyaml.hash -@@ -1,3 +1,5 @@ - # md5 from https://pypi.python.org/pypi/pyyaml/json, sha256 locally computed - md5 4c129761b661d181ebf7ff4eb2d79950 PyYAML-3.12.tar.gz - sha256 592766c6303207a20efc445587778322d7f73b161bd994f227adaa341ba212ab PyYAML-3.12.tar.gz -+sha256 c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8 PyYAML-3.11.tar.gz -+sha256 3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf PyYAML-3.13.tar.gz -diff --git a/package/python-pyyaml/python-pyyaml.mk b/package/python-pyyaml/python-pyyaml.mk -index beeaf88e96..cbf8df7b2d 100644 ---- a/package/python-pyyaml/python-pyyaml.mk -+++ b/package/python-pyyaml/python-pyyaml.mk -@@ -4,9 +4,9 @@ - # - ################################################################################ - --PYTHON_PYYAML_VERSION = 3.12 -+PYTHON_PYYAML_VERSION = 3.13 - PYTHON_PYYAML_SOURCE = PyYAML-$(PYTHON_PYYAML_VERSION).tar.gz --PYTHON_PYYAML_SITE = https://pypi.python.org/packages/4a/85/db5a2df477072b2902b0eb892feb37d88ac635d36245a72a6a69b23b383a -+PYTHON_PYYAML_SITE = https://files.pythonhosted.org/packages/9e/a3/1d13970c3f36777c583f136c136f804d70f500168edc1edea6daa7200769 - PYTHON_PYYAML_SETUP_TYPE = distutils - PYTHON_PYYAML_LICENSE = MIT - PYTHON_PYYAML_LICENSE_FILES = LICENSE --- -2.11.0 - diff --git a/buildroot-patches/0008-Downgrade-python-serial-to-3.0.patch b/buildroot-patches/0008-Downgrade-python-serial-to-3.0.patch index 7d9a2db5..4be966cd 100644 --- a/buildroot-patches/0008-Downgrade-python-serial-to-3.0.patch +++ b/buildroot-patches/0008-Downgrade-python-serial-to-3.0.patch @@ -1,6 +1,6 @@ -From fa3884456ec63fd876c239b0597db8973ca87a57 Mon Sep 17 00:00:00 2001 +From b331a66c7cc9efadf2dcb4ae26cd592bbecb4278 Mon Sep 17 00:00:00 2001 From: Peter Steenbergen -Date: Mon, 29 Oct 2018 14:28:05 +0100 +Date: Mon, 7 Jan 2019 14:57:24 +0100 Subject: [PATCH 1/1] Downgrade python-serial to 3.0 --- @@ -9,26 +9,28 @@ Subject: [PATCH 1/1] Downgrade python-serial to 3.0 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/python-serial/python-serial.hash b/package/python-serial/python-serial.hash -index f98a8b91b2..dbb72e395c 100644 +index 96209a9965..0c68849324 100644 --- a/package/python-serial/python-serial.hash +++ b/package/python-serial/python-serial.hash -@@ -1,3 +1,4 @@ - # md5 from http://pypi.python.org/pypi?:action=show_md5&digest=e849af7f8b7ec75cbc7a53da67c51a51, sha256 locally computed +@@ -1,5 +1,6 @@ + # md5, sha256 from https://pypi.org/pypi/pyserial/json + md5 ed6183b15519a0ae96675e9c3330c69b pyserial-3.4.tar.gz + sha256 6e2d401fdee0eab996cf734e67773a0143b932772ca8b42451440cfed942c627 pyserial-3.4.tar.gz +sha256 056c2d96c83c009d8d04aad43a90f91f10f6a97d42c0d9656c2655c63fb8ff07 pyserial-3.0.tar.gz - md5 e849af7f8b7ec75cbc7a53da67c51a51 pyserial-3.1.tar.gz - sha256 c8ffdcbd8bfd308842409e558848c32aa3499a1bfe95a591e4210072b9520f1e pyserial-3.1.tar.gz + # Locally computed sha256 checksums + sha256 a89d951d157e2c199fbbe7ecf8d41bc3bc93de166db524aa6b9b610dbccc832d LICENSE.txt diff --git a/package/python-serial/python-serial.mk b/package/python-serial/python-serial.mk -index ce7ec07062..9294c4e43c 100644 +index d583ac65ab..70cf6452f5 100644 --- a/package/python-serial/python-serial.mk +++ b/package/python-serial/python-serial.mk @@ -4,9 +4,9 @@ # ################################################################################ --PYTHON_SERIAL_VERSION = 3.1 +-PYTHON_SERIAL_VERSION = 3.4 +PYTHON_SERIAL_VERSION = 3.0 PYTHON_SERIAL_SOURCE = pyserial-$(PYTHON_SERIAL_VERSION).tar.gz --PYTHON_SERIAL_SITE = https://pypi.python.org/packages/ce/9c/694ce79a9d4a164e109aeba1a40fba23336f3b7554978553e22a5d41d54d +-PYTHON_SERIAL_SITE = https://files.pythonhosted.org/packages/cc/74/11b04703ec416717b247d789103277269d567db575d2fd88f25d9767fe3d +PYTHON_SERIAL_SITE = https://files.pythonhosted.org/packages/69/89/24fc8c26e23710a0d8fdf9e8134b28ceeab421d3f3e0165ceca6bdb98193 PYTHON_SERIAL_LICENSE = BSD-3-Clause PYTHON_SERIAL_LICENSE_FILES = LICENSE.txt diff --git a/buildroot-patches/0010-Downgrade-python-tornado-to-4.2.1.patch b/buildroot-patches/0010-Downgrade-python-tornado-to-4.5.3.patch similarity index 71% rename from buildroot-patches/0010-Downgrade-python-tornado-to-4.2.1.patch rename to buildroot-patches/0010-Downgrade-python-tornado-to-4.5.3.patch index 112c8291..c4db5d00 100644 --- a/buildroot-patches/0010-Downgrade-python-tornado-to-4.2.1.patch +++ b/buildroot-patches/0010-Downgrade-python-tornado-to-4.5.3.patch @@ -1,14 +1,14 @@ -From 6da3d4e89056a749613da580f0f32e2bc5e69f2d Mon Sep 17 00:00:00 2001 +From 558f6ce4014280563a57eecd446969034ab36d77 Mon Sep 17 00:00:00 2001 From: Peter Steenbergen -Date: Mon, 29 Oct 2018 15:36:21 +0100 -Subject: [PATCH 1/1] Downgrade python-tornado to 4.2.1 +Date: Mon, 7 Jan 2019 16:36:09 +0100 +Subject: [PATCH 1/1] Downgrade python-tornado to 4.5.3 --- .../python-tornado/0001-Disable-SSL-checks.patch | 45 ---------------------- package/python-tornado/Config.in | 2 - - package/python-tornado/python-tornado.hash | 7 ++-- - package/python-tornado/python-tornado.mk | 6 +-- - 4 files changed, 7 insertions(+), 53 deletions(-) + package/python-tornado/python-tornado.hash | 1 + + package/python-tornado/python-tornado.mk | 4 +- + 4 files changed, 3 insertions(+), 49 deletions(-) delete mode 100644 package/python-tornado/0001-Disable-SSL-checks.patch diff --git a/package/python-tornado/0001-Disable-SSL-checks.patch b/package/python-tornado/0001-Disable-SSL-checks.patch @@ -76,36 +76,32 @@ index 1afbdc5729..a0ee78fb7a 100644 select BR2_PACKAGE_PYTHON_BACKPORTS_ABC if BR2_PACKAGE_PYTHON # runtime select BR2_PACKAGE_PYTHON_CERTIFI if BR2_PACKAGE_PYTHON # runtime diff --git a/package/python-tornado/python-tornado.hash b/package/python-tornado/python-tornado.hash -index c64e537eed..4fc7ad45a3 100644 +index fbf5efa60a..7cfaefad73 100644 --- a/package/python-tornado/python-tornado.hash +++ b/package/python-tornado/python-tornado.hash -@@ -1,3 +1,4 @@ --# md5, sha256 from https://pypi.python.org/pypi/tornado/json --md5 e5e24ce1c8a4e6442dc38d470172f59e tornado-5.0.2.tar.gz --sha256 1b83d5c10550f2653380b4c77331d6f8850f287c4f67d7ce1e1c639d9222fbc7 tornado-5.0.2.tar.gz -+# md5 from https://pypi.python.org/pypi/tornado/json, sha256 locally computed -+md5 838687d20923360af5ab59f101e9e02e tornado-4.5.1.tar.gz -+sha256 db0904a28253cfe53e7dedc765c71596f3c53bb8a866ae50123320ec1a7b73fd tornado-4.5.1.tar.gz -+sha256 a16fcdc4f76b184cb82f4f9eaeeacef6113b524b26a2cb331222e4a7fa6f2969 tornado-4.2.1.tar.gz +@@ -1,5 +1,6 @@ + # md5, sha256 from https://pypi.org/pypi/tornado/json + md5 a1ce4f392d30ff0ebcb255150d89b826 tornado-5.1.1.tar.gz + sha256 4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409 tornado-5.1.1.tar.gz ++sha256 6d14e47eab0e15799cf3cdcc86b0b98279da68522caace2bd7ce644287685f0a tornado-4.5.3.tar.gz + # Locally computed sha256 checksums + sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-tornado/python-tornado.mk b/package/python-tornado/python-tornado.mk -index ed3a61fcf8..d04190d046 100644 +index 71f536f023..b86e476fd6 100644 --- a/package/python-tornado/python-tornado.mk +++ b/package/python-tornado/python-tornado.mk -@@ -4,11 +4,11 @@ +@@ -4,9 +4,9 @@ # ################################################################################ --PYTHON_TORNADO_VERSION = 5.0.2 -+PYTHON_TORNADO_VERSION = 4.2.1 +-PYTHON_TORNADO_VERSION = 5.1.1 ++PYTHON_TORNADO_VERSION = 4.5.3 PYTHON_TORNADO_SOURCE = tornado-$(PYTHON_TORNADO_VERSION).tar.gz --PYTHON_TORNADO_SITE = https://pypi.python.org/packages/cf/d1/3be271ae5eba9fb59df63c9891fdc7d8044b999e8ac145994cdbfd2ae66a -+PYTHON_TORNADO_SITE = https://files.pythonhosted.org/packages/ec/af/c40ad78dacdef134f3e08b3103c3c859b14ceb9639d344811339227b6444 +-PYTHON_TORNADO_SITE = https://files.pythonhosted.org/packages/e6/78/6e7b5af12c12bdf38ca9bfe863fcaf53dc10430a312d0324e76c1e5ca426 ++PYTHON_TORNADO_SITE = https://files.pythonhosted.org/packages/e3/7b/e29ab3d51c8df66922fea216e2bddfcb6430fb29620e5165b16a216e0d3c PYTHON_TORNADO_LICENSE = Apache-2.0 --PYTHON_TORNADO_LICENSE_FILES = LICENSE + PYTHON_TORNADO_LICENSE_FILES = LICENSE PYTHON_TORNADO_SETUP_TYPE = setuptools - - $(eval $(python-package)) -+$(eval $(host-python-package)) -- 2.11.0 diff --git a/buildroot-patches/0012-Add-host-openssl-dependency-to-python3.patch b/buildroot-patches/0012-Add-host-openssl-dependency-to-python3.patch index 1b5d73d2..49b32666 100644 --- a/buildroot-patches/0012-Add-host-openssl-dependency-to-python3.patch +++ b/buildroot-patches/0012-Add-host-openssl-dependency-to-python3.patch @@ -1,6 +1,6 @@ -From 1d0657e62f0c754ba53f1ac49636cdc30e1ac133 Mon Sep 17 00:00:00 2001 +From f1468008e466ce9aa27449c98ce775b292945190 Mon Sep 17 00:00:00 2001 From: Peter Steenbergen -Date: Mon, 29 Oct 2018 16:18:13 +0100 +Date: Mon, 7 Jan 2019 16:59:08 +0100 Subject: [PATCH 1/1] Add host-openssl dependency to python3 --- @@ -8,10 +8,10 @@ Subject: [PATCH 1/1] Add host-openssl dependency to python3 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/python3/python3.mk b/package/python3/python3.mk -index 6e61108661..e432e1da8f 100644 +index 8fbb95b9ad..0f8cce45dc 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk -@@ -33,8 +33,7 @@ HOST_PYTHON3_CONF_OPTS += \ +@@ -26,8 +26,7 @@ HOST_PYTHON3_CONF_OPTS += \ --enable-unicodedata \ --disable-test-modules \ --disable-idle3 \ @@ -21,12 +21,12 @@ index 6e61108661..e432e1da8f 100644 # Make sure that LD_LIBRARY_PATH overrides -rpath. # This is needed because libpython may be installed at the same time that -@@ -47,7 +46,7 @@ HOST_PYTHON3_CONF_ENV += \ +@@ -40,7 +39,7 @@ HOST_PYTHON3_CONF_ENV += \ PYTHON3_DEPENDENCIES = host-python3 libffi --HOST_PYTHON3_DEPENDENCIES = host-expat host-zlib -+HOST_PYTHON3_DEPENDENCIES = host-expat host-zlib host-openssl +-HOST_PYTHON3_DEPENDENCIES = host-expat host-zlib host-libffi ++HOST_PYTHON3_DEPENDENCIES = host-expat host-zlib host-libffi host-openssl PYTHON3_INSTALL_STAGING = YES diff --git a/buildroot-patches/0013-Bump-rpi-firmware-to-version-45c6ee3cd7f36a2376b691a.patch b/buildroot-patches/0013-Bump-rpi-firmware-to-version-e1bd9b0b8cda901ee9b23cbb8b3334cde71320a7.patch similarity index 53% rename from buildroot-patches/0013-Bump-rpi-firmware-to-version-45c6ee3cd7f36a2376b691a.patch rename to buildroot-patches/0013-Bump-rpi-firmware-to-version-e1bd9b0b8cda901ee9b23cbb8b3334cde71320a7.patch index 75753818..19c96896 100644 --- a/buildroot-patches/0013-Bump-rpi-firmware-to-version-45c6ee3cd7f36a2376b691a.patch +++ b/buildroot-patches/0013-Bump-rpi-firmware-to-version-e1bd9b0b8cda901ee9b23cbb8b3334cde71320a7.patch @@ -1,32 +1,32 @@ -From 7e13709029b97845255e3641b7549f379ec53fd7 Mon Sep 17 00:00:00 2001 +From 5a4474b1d8d7d5f59d7de05a64360d46c39241cd Mon Sep 17 00:00:00 2001 From: Peter Steenbergen -Date: Tue, 30 Oct 2018 14:26:46 +0100 +Date: Mon, 7 Jan 2019 17:11:18 +0100 Subject: [PATCH 1/1] Bump rpi-firmware to version: - 45c6ee3cd7f36a2376b691affbc02dfc689b8056 + e1bd9b0b8cda901ee9b23cbb8b3334cde71320a7 --- - package/rpi-firmware/rpi-firmware.hash | 1 + + package/rpi-firmware/rpi-firmware.hash | 2 +- package/rpi-firmware/rpi-firmware.mk | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rpi-firmware/rpi-firmware.hash b/package/rpi-firmware/rpi-firmware.hash -index d481ee524f..fddc02ee7e 100644 +index 728c53fe9a..85b760fa9b 100644 --- a/package/rpi-firmware/rpi-firmware.hash +++ b/package/rpi-firmware/rpi-firmware.hash -@@ -1,2 +1,3 @@ +@@ -1,2 +1,2 @@ # Locally computed - sha256 5edff641f216d2e09c75469dc2e9fc66aff290e212a1cd43ed31c499f99ea055 rpi-firmware-287af2a2be0787a5d45281d1d6183a2161c798d4.tar.gz -+sha256 d9295b794e8a93a9bb8b5fe8cf612fea7f4a22f4a8abbbd3f56a20c96e63428a rpi-firmware-45c6ee3cd7f36a2376b691affbc02dfc689b8056.tar.gz +-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 853ab6ed02..2187990240 100644 +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 = 287af2a2be0787a5d45281d1d6183a2161c798d4 -+RPI_FIRMWARE_VERSION = 45c6ee3cd7f36a2376b691affbc02dfc689b8056 +-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 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 new file mode 100644 index 00000000..21ea1b32 --- /dev/null +++ b/buildroot-patches/0014-Downgrade-python-requests-to-2.20.0.patch @@ -0,0 +1,40 @@ +From eda2b1e6268b4410f62e220c7565528c75657d38 Mon Sep 17 00:00:00 2001 +From: Peter Steenbergen +Date: Tue, 8 Jan 2019 14:42:40 +0100 +Subject: [PATCH 1/1] Downgrade python-requests to 2.20.0 + +--- + package/python-requests/python-requests.hash | 1 + + package/python-requests/python-requests.mk | 4 ++-- + 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 +--- 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 ++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 +--- 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.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/97/10/92d25b93e9c266c94b76a5548f020f3f1dd0eb40649cb1993532c0af8f4c + PYTHON_REQUESTS_SETUP_TYPE = setuptools + PYTHON_REQUESTS_LICENSE = Apache-2.0 + PYTHON_REQUESTS_LICENSE_FILES = LICENSE +-- +2.11.0 + diff --git a/buildroot-patches/0015-Remove-python2-dependency-from-python-typing.patch b/buildroot-patches/0015-Remove-python2-dependency-from-python-typing.patch new file mode 100644 index 00000000..05c25d58 --- /dev/null +++ b/buildroot-patches/0015-Remove-python2-dependency-from-python-typing.patch @@ -0,0 +1,24 @@ +From aa61c7e2818d8514a9c5ad1f216aea57bcbf0f91 Mon Sep 17 00:00:00 2001 +From: Peter Steenbergen +Date: Wed, 9 Jan 2019 13:19:13 +0100 +Subject: [PATCH 1/1] Remove python2 dependency from python-typing Mycroft MSK + and MSN require it although Python 2.x should not need it. + +--- + package/python-typing/Config.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/package/python-typing/Config.in b/package/python-typing/Config.in +index 81b7d71b4b..3d7376f28b 100644 +--- a/package/python-typing/Config.in ++++ b/package/python-typing/Config.in +@@ -1,6 +1,5 @@ + config BR2_PACKAGE_PYTHON_TYPING + bool "python-typing" +- depends on BR2_PACKAGE_PYTHON + help + Type Hints for Python. This is a backport of the standard + library typing module to Python versions older than 3.5. +-- +2.11.0 + diff --git a/scripts/build.sh b/scripts/build.sh index 11493b25..11175013 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -1,13 +1,16 @@ #!/bin/bash set -e +mkdir -p release +mkdir -p logs + all_platforms=(rpi3) for platform in "${all_platforms[@]}"; do -# make -C buildroot BR2_EXTERNAL=../buildroot-external distclean -# make -C buildroot BR2_EXTERNAL=../buildroot-external mycroftos_${platform}_defconfig + 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 makemenuconfig + make -C buildroot BR2_EXTERNAL=../buildroot-external menuconfig make -C buildroot BR2_EXTERNAL=../buildroot-external 2>&1 | tee logs/buildroot_output.txt cp -f buildroot/output/images/sdcard.img release/MycroftOS_${platform}.img