From 128533412e8c2eeca4801dfbaed635f5c7273240 Mon Sep 17 00:00:00 2001 From: Rick Carlino Date: Wed, 29 Dec 2021 16:37:31 -0600 Subject: [PATCH] 1.17.3-farmbot.3 --- VERSION | 2 +- nerves_defconfig | 8 +++++++- rootfs_overlay/etc/erlinit.config | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index d5b876e..4433fb8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.17.3-farmbot.2 +1.17.3-farmbot.3 diff --git a/nerves_defconfig b/nerves_defconfig index 0a92fd1..fa492bb 100644 --- a/nerves_defconfig +++ b/nerves_defconfig @@ -22,6 +22,7 @@ BR2_INIT_NONE=y BR2_ROOTFS_DEVICE_TABLE="${BR2_EXTERNAL_NERVES_PATH}/board/nerves-common/device_table.txt" BR2_ENABLE_LOCALE_WHITELIST="locale-archive" BR2_GENERATE_LOCALE="en_US.UTF-8" +BR2_ROOTFS_USERS_TABLES="${NERVES_DEFCONFIG_DIR}/users_table.txt" BR2_ROOTFS_OVERLAY="${BR2_EXTERNAL_NERVES_PATH}/board/nerves-common/rootfs_overlay ${NERVES_DEFCONFIG_DIR}/rootfs_overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="${NERVES_DEFCONFIG_DIR}/post-build.sh ${BR2_EXTERNAL_NERVES_PATH}/board/nerves-common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="${NERVES_DEFCONFIG_DIR}/post-createfs.sh" @@ -39,6 +40,8 @@ BR2_PACKAGE_ALSA_UTILS=y # BR2_PACKAGE_ALSA_UTILS_ALSAMIXER is not set BR2_PACKAGE_ALSA_UTILS_AMIXER=y BR2_PACKAGE_ALSA_UTILS_APLAY=y +BR2_PACKAGE_ESPEAK=y +BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_ALSA=y BR2_PACKAGE_F2FS_TOOLS=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y @@ -49,6 +52,7 @@ BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y BR2_PACKAGE_RPI_FIRMWARE_CUSTOM_VERSION="1.20211007" BR2_PACKAGE_RPI_FIRMWARE_X=y +BR2_PACKAGE_AVRDUDE=y BR2_PACKAGE_PIGPIO=y # BR2_PACKAGE_RNG_TOOLS_JITTERENTROPY_LIBRARY is not set BR2_PACKAGE_RPI_USERLAND=y @@ -69,7 +73,9 @@ BR2_PACKAGE_WPA_SUPPLICANT_HOTSPOT=y BR2_PACKAGE_WPA_SUPPLICANT_DEBUG_SYSLOG=y BR2_PACKAGE_WPA_SUPPLICANT_WPS=y BR2_PACKAGE_WPA_SUPPLICANT_WPA3=y -BR2_PACKAGE_WPA_SUPPLICANT_CTRL_IFACE=y +BR2_PACKAGE_WPA_SUPPLICANT_CLI=y +BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO=y +BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y # BR2_TARGET_ROOTFS_TAR is not set BR2_NERVES_SYSTEM_NAME="farmbot_system_rpi4" BR2_NERVES_ADDITIONAL_IMAGE_FILES="${NERVES_DEFCONFIG_DIR}/fwup.conf ${NERVES_DEFCONFIG_DIR}/cmdline.txt ${NERVES_DEFCONFIG_DIR}/config.txt" diff --git a/rootfs_overlay/etc/erlinit.config b/rootfs_overlay/etc/erlinit.config index 7b99564..f49ddd2 100644 --- a/rootfs_overlay/etc/erlinit.config +++ b/rootfs_overlay/etc/erlinit.config @@ -9,8 +9,8 @@ # Specify where erlinit should send the IEx prompt. Only one may be enabled at # a time. -#-c ttyS0 # UART pins on the GPIO connector --c tty1 # HDMI output +-c ttyS0 # UART pins on the GPIO connector +# -c tty1 # HDMI output # If more than one tty are available, always warn if the user is looking at the # wrong one.