From 9794d3223001432a13933f6be16a1c355c9f44d5 Mon Sep 17 00:00:00 2001 From: j1nx Date: Fri, 30 Sep 2022 13:41:30 +0200 Subject: [PATCH] More fixes and tweaks. --- .../raspberrypi/genimage-raspberrypi4-64.cfg | 4 +- buildroot-external/busybox.config | 103 ++++++++++-------- .../configs/rpi4_64-gui_defconfig | 14 +-- .../package/ovos-splash/ovos-splash.mk | 7 ++ buildroot-external/rootfs-overlay/etc/fstab | 2 +- .../etc/pulse/mycroft-sj201-default.pa | 4 +- 6 files changed, 79 insertions(+), 55 deletions(-) diff --git a/buildroot-external/board/raspberrypi/genimage-raspberrypi4-64.cfg b/buildroot-external/board/raspberrypi/genimage-raspberrypi4-64.cfg index 5db3c598..8d603689 100644 --- a/buildroot-external/board/raspberrypi/genimage-raspberrypi4-64.cfg +++ b/buildroot-external/board/raspberrypi/genimage-raspberrypi4-64.cfg @@ -14,7 +14,7 @@ image boot.vfat { "Image" } } - size = 96M + size = 64M } image overlayfs.ext4 { @@ -22,7 +22,7 @@ image overlayfs.ext4 { ext4 { use-mke2fs = "true" } - size = 256M + size = 64M } image sdcard.img { diff --git a/buildroot-external/busybox.config b/buildroot-external/busybox.config index d0cda35b..e8cce7be 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.33.0 -# Thu May 6 12:36:41 2021 +# Busybox version: 1.35.0 +# Fri Sep 30 11:58:24 2022 # CONFIG_HAVE_DOT_CONFIG=y @@ -94,9 +94,12 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y CONFIG_PASSWORD_MINLEN=6 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_NON_POSIX_CP=y +# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set +CONFIG_FEATURE_USE_SENDFILE=y +CONFIG_FEATURE_COPYBUF_KB=4 +CONFIG_MONOTONIC_SYSCALL=y +CONFIG_IOCTL_HEX2STR_ERROR=y CONFIG_FEATURE_EDITING=y CONFIG_FEATURE_EDITING_MAX_LEN=1024 # CONFIG_FEATURE_EDITING_VI is not set @@ -120,14 +123,6 @@ CONFIG_UNICODE_WIDE_WCHARS=y # CONFIG_UNICODE_BIDI_SUPPORT is not set # CONFIG_UNICODE_NEUTRAL_TABLE 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 -CONFIG_FEATURE_COPYBUF_KB=4 -CONFIG_FEATURE_SKIP_ROOTFS=y -CONFIG_MONOTONIC_SYSCALL=y -CONFIG_IOCTL_HEX2STR_ERROR=y -CONFIG_FEATURE_HWIB=y # # Applets @@ -162,6 +157,8 @@ CONFIG_FEATURE_BZIP2_DECOMPRESS=y CONFIG_CPIO=y CONFIG_FEATURE_CPIO_O=y CONFIG_FEATURE_CPIO_P=y +CONFIG_FEATURE_CPIO_IGNORE_DEVNO=y +CONFIG_FEATURE_CPIO_RENUMBER_INODES=y CONFIG_DPKG=y CONFIG_DPKG_DEB=y CONFIG_GZIP=y @@ -197,6 +194,22 @@ CONFIG_FEATURE_LZMA_FAST=y # # Coreutils # +CONFIG_FEATURE_VERBOSE=y + +# +# Common options for date and touch +# +CONFIG_FEATURE_TIMEZONE=y + +# +# Common options for cp and mv +# +CONFIG_FEATURE_PRESERVE_HARDLINKS=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y CONFIG_BASENAME=y CONFIG_CAT=y CONFIG_FEATURE_CATN=y @@ -207,11 +220,13 @@ CONFIG_CHOWN=y CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y CONFIG_CHROOT=y CONFIG_CKSUM=y +CONFIG_CRC32=y CONFIG_COMM=y CONFIG_CP=y CONFIG_FEATURE_CP_LONG_OPTIONS=y CONFIG_FEATURE_CP_REFLINK=y CONFIG_CUT=y +CONFIG_FEATURE_CUT_REGEX=y CONFIG_DATE=y CONFIG_FEATURE_DATE_ISOFMT=y # CONFIG_FEATURE_DATE_NANO is not set @@ -223,6 +238,7 @@ CONFIG_FEATURE_DD_IBS_OBS=y CONFIG_FEATURE_DD_STATUS=y CONFIG_DF=y CONFIG_FEATURE_DF_FANCY=y +CONFIG_FEATURE_SKIP_ROOTFS=y CONFIG_DIRNAME=y CONFIG_DOS2UNIX=y CONFIG_UNIX2DOS=y @@ -316,7 +332,6 @@ CONFIG_TEST2=y CONFIG_FEATURE_TEST_64=y CONFIG_TIMEOUT=y CONFIG_TOUCH=y -CONFIG_FEATURE_TOUCH_NODEREF=y CONFIG_FEATURE_TOUCH_SUSV3=y CONFIG_TR=y CONFIG_FEATURE_TR_CLASSES=y @@ -342,21 +357,6 @@ CONFIG_USERS=y CONFIG_WHOAMI=y CONFIG_YES=y -# -# Common options -# -CONFIG_FEATURE_VERBOSE=y - -# -# Common options for cp and mv -# -CONFIG_FEATURE_PRESERVE_HARDLINKS=y - -# -# Common options for df, du, ls -# -CONFIG_FEATURE_HUMAN_READABLE=y - # # Console Utilities # @@ -424,6 +424,7 @@ CONFIG_VI=y CONFIG_FEATURE_VI_MAX_LEN=4096 # CONFIG_FEATURE_VI_8BIT is not set CONFIG_FEATURE_VI_COLON=y +CONFIG_FEATURE_VI_COLON_EXPAND=y CONFIG_FEATURE_VI_YANKMARK=y CONFIG_FEATURE_VI_SEARCH=y # CONFIG_FEATURE_VI_REGEX_SEARCH is not set @@ -437,6 +438,7 @@ CONFIG_FEATURE_VI_ASK_TERMINAL=y CONFIG_FEATURE_VI_UNDO=y CONFIG_FEATURE_VI_UNDO_QUEUE=y CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256 +CONFIG_FEATURE_VI_VERBOSE_STATUS=y CONFIG_FEATURE_ALLOW_EXEC=y # @@ -445,7 +447,11 @@ CONFIG_FEATURE_ALLOW_EXEC=y CONFIG_FIND=y CONFIG_FEATURE_FIND_PRINT0=y CONFIG_FEATURE_FIND_MTIME=y +CONFIG_FEATURE_FIND_ATIME=y +CONFIG_FEATURE_FIND_CTIME=y CONFIG_FEATURE_FIND_MMIN=y +CONFIG_FEATURE_FIND_AMIN=y +CONFIG_FEATURE_FIND_CMIN=y CONFIG_FEATURE_FIND_PERM=y CONFIG_FEATURE_FIND_TYPE=y CONFIG_FEATURE_FIND_EXECUTABLE=y @@ -453,6 +459,7 @@ CONFIG_FEATURE_FIND_XDEV=y CONFIG_FEATURE_FIND_MAXDEPTH=y CONFIG_FEATURE_FIND_NEWER=y CONFIG_FEATURE_FIND_INUM=y +CONFIG_FEATURE_FIND_SAMEFILE=y CONFIG_FEATURE_FIND_EXEC=y CONFIG_FEATURE_FIND_EXEC_PLUS=y CONFIG_FEATURE_FIND_USER=y @@ -485,9 +492,9 @@ CONFIG_FEATURE_XARGS_SUPPORT_ARGS_FILE=y # # Init Utilities # -CONFIG_BOOTCHARTD=y -CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER=y -CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE=y +# CONFIG_BOOTCHARTD is not set +# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set +# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set CONFIG_HALT=y CONFIG_POWEROFF=y CONFIG_REBOOT=y @@ -612,7 +619,7 @@ CONFIG_FEATURE_FDISK_WRITABLE=y # CONFIG_FEATURE_SGI_LABEL is not set # CONFIG_FEATURE_SUN_LABEL is not set # CONFIG_FEATURE_OSF_LABEL is not set -# CONFIG_FEATURE_GPT_LABEL is not set +CONFIG_FEATURE_GPT_LABEL=y CONFIG_FEATURE_FDISK_ADVANCED=y CONFIG_FINDFS=y CONFIG_FLOCK=y @@ -743,6 +750,7 @@ CONFIG_FEATURE_VOLUMEID_XFS=y # Miscellaneous Utilities # CONFIG_ADJTIMEX=y +CONFIG_ASCII=y # CONFIG_BBCONFIG is not set # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set CONFIG_BC=y @@ -768,14 +776,14 @@ CONFIG_FEATURE_CROND_D=y CONFIG_FEATURE_CROND_CALL_SENDMAIL=y CONFIG_FEATURE_CROND_SPECIAL_TIMES=y CONFIG_FEATURE_CROND_DIR="/var/spool/cron" -CONFIG_CRONTAB=y +# CONFIG_CRONTAB is not set # CONFIG_DEVFSD is not set # CONFIG_DEVFSD_MODLOAD is not set # CONFIG_DEVFSD_FG_NP is not set # CONFIG_DEVFSD_VERBOSE is not set # CONFIG_FEATURE_DEVFS is not set CONFIG_DEVMEM=y -CONFIG_FBSPLASH=y +# CONFIG_FBSPLASH is not set # CONFIG_FLASH_ERASEALL is not set # CONFIG_FLASH_LOCK is not set # CONFIG_FLASH_UNLOCK is not set @@ -838,6 +846,7 @@ CONFIG_UBIUPDATEVOL=y CONFIG_UBIRENAME=y CONFIG_VOLNAME=y CONFIG_WATCHDOG=y +# CONFIG_FEATURE_WATCHDOG_OPEN_TWICE is not set # # Networking Utilities @@ -846,6 +855,9 @@ CONFIG_FEATURE_IPV6=y # CONFIG_FEATURE_UNIX_LOCAL is not set CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y # CONFIG_VERBOSE_RESOLUTION_ERRORS is not set +# CONFIG_FEATURE_ETC_NETWORKS is not set +# CONFIG_FEATURE_ETC_SERVICES is not set +CONFIG_FEATURE_HWIB=y # CONFIG_FEATURE_TLS_SHA1 is not set CONFIG_ARP=y CONFIG_ARPING=y @@ -864,6 +876,7 @@ CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y CONFIG_HOSTNAME=y CONFIG_DNSDOMAINNAME=y CONFIG_HTTPD=y +CONFIG_FEATURE_HTTPD_PORT_DEFAULT=80 CONFIG_FEATURE_HTTPD_RANGES=y CONFIG_FEATURE_HTTPD_SETUID=y CONFIG_FEATURE_HTTPD_BASIC_AUTH=y @@ -956,6 +969,7 @@ CONFIG_FEATURE_TELNET_AUTOLOGIN=y CONFIG_FEATURE_TELNET_WIDTH=y CONFIG_TELNETD=y CONFIG_FEATURE_TELNETD_STANDALONE=y +CONFIG_FEATURE_TELNETD_PORT_DEFAULT=23 CONFIG_FEATURE_TELNETD_INETD_WAIT=y CONFIG_TFTP=y CONFIG_FEATURE_TFTP_PROGRESS_BAR=y @@ -976,6 +990,7 @@ CONFIG_VCONFIG=y CONFIG_WGET=y CONFIG_FEATURE_WGET_LONG_OPTIONS=y CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_FTP=y CONFIG_FEATURE_WGET_AUTHENTICATION=y CONFIG_FEATURE_WGET_TIMEOUT=y CONFIG_FEATURE_WGET_HTTPS=y @@ -1001,6 +1016,7 @@ CONFIG_FEATURE_UDHCPC6_RFC5970=y # # Common options for DHCP applets # +CONFIG_UDHCPC_DEFAULT_INTERFACE="eth0" # CONFIG_FEATURE_UDHCP_PORT is not set CONFIG_UDHCP_DEBUG=2 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 @@ -1011,24 +1027,26 @@ CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n" # # Print Utilities # -CONFIG_LPD=y -CONFIG_LPR=y -CONFIG_LPQ=y +# CONFIG_LPD is not set +# CONFIG_LPR is not set +# CONFIG_LPQ is not set # # Mail Utilities # +CONFIG_FEATURE_MIME_CHARSET="us-ascii" CONFIG_MAKEMIME=y -CONFIG_POPMAILDIR=y -CONFIG_FEATURE_POPMAILDIR_DELIVERY=y +# CONFIG_POPMAILDIR is not set +# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set CONFIG_REFORMIME=y CONFIG_FEATURE_REFORMIME_COMPAT=y CONFIG_SENDMAIL=y -CONFIG_FEATURE_MIME_CHARSET="us-ascii" # # Process Utilities # +CONFIG_FEATURE_FAST_TOP=y +CONFIG_FEATURE_SHOW_THREADS=y CONFIG_FREE=y CONFIG_FUSER=y CONFIG_IOSTAT=y @@ -1067,7 +1085,6 @@ CONFIG_FEATURE_TOPMEM=y CONFIG_UPTIME=y CONFIG_FEATURE_UPTIME_UTMP_SUPPORT=y CONFIG_WATCH=y -CONFIG_FEATURE_SHOW_THREADS=y # # Runit Utilities @@ -1132,8 +1149,8 @@ CONFIG_HUSH=y CONFIG_SHELL_HUSH=y CONFIG_HUSH_BASH_COMPAT=y CONFIG_HUSH_BRACE_EXPANSION=y -CONFIG_HUSH_LINENO_VAR=y # CONFIG_HUSH_BASH_SOURCE_CURDIR is not set +CONFIG_HUSH_LINENO_VAR=y CONFIG_HUSH_INTERACTIVE=y CONFIG_HUSH_SAVEHISTORY=y CONFIG_HUSH_JOB=y diff --git a/buildroot-external/configs/rpi4_64-gui_defconfig b/buildroot-external/configs/rpi4_64-gui_defconfig index f00316a0..fe8fee0d 100644 --- a/buildroot-external/configs/rpi4_64-gui_defconfig +++ b/buildroot-external/configs/rpi4_64-gui_defconfig @@ -64,11 +64,13 @@ BR2_PACKAGE_ALSA_UTILS_BAT=y BR2_PACKAGE_ALSA_UTILS_IECSET=y BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y BR2_PACKAGE_ESPEAK=y +BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_PULSEAUDIO=y BR2_PACKAGE_FFMPEG_GPL=y BR2_PACKAGE_FFMPEG_NONFREE=y # BR2_PACKAGE_FFMPEG_FFMPEG is not set BR2_PACKAGE_FFMPEG_AVRESAMPLE=y BR2_PACKAGE_FFMPEG_POSTPROC=y +BR2_PACKAGE_FLUIDSYNTH_PULSEAUDIO=y BR2_PACKAGE_GSTREAMER1=y BR2_PACKAGE_GST1_PLUGINS_BASE_INSTALL_TOOLS=y BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ADDER=y @@ -267,6 +269,7 @@ BR2_PACKAGE_JQ=y BR2_PACKAGE_MAKE=y BR2_PACKAGE_PATCH=y BR2_PACKAGE_PKGCONF=y +BR2_PACKAGE_CPIO=y BR2_PACKAGE_DOSFSTOOLS=y BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y @@ -339,9 +342,6 @@ BR2_PACKAGE_RNG_TOOLS=y BR2_PACKAGE_SPI_TOOLS=y BR2_PACKAGE_USBMOUNT=y BR2_PACKAGE_USBUTILS=y -BR2_PACKAGE_NODEJS=y -BR2_PACKAGE_NODEJS_NPM=y -BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL="node-red node-red-dashboard node-red-contrib-string" BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON3_PY_PYC=y BR2_PACKAGE_PYTHON3_2TO3=y @@ -445,18 +445,21 @@ BR2_PACKAGE_LIBMATROSKA=y BR2_PACKAGE_LIBMMS=y BR2_PACKAGE_LIBMPEG2_BINS=y BR2_PACKAGE_LIBOPUSENC=y +BR2_PACKAGE_C_ARES=y BR2_PACKAGE_GLIB_NETWORKING=y BR2_PACKAGE_LIBCURL_CURL=y BR2_PACKAGE_LIBHTTPPARSER=y BR2_PACKAGE_LIBIDN=y BR2_PACKAGE_LIBMICROHTTPD=y BR2_PACKAGE_LIBSHAIRPLAY=y +BR2_PACKAGE_NGHTTP2=y BR2_PACKAGE_BOOST_SYSTEM=y BR2_PACKAGE_CMOCKA=y BR2_PACKAGE_ELL=y BR2_PACKAGE_FLATBUFFERS=y BR2_PACKAGE_GTEST=y BR2_PACKAGE_LIBCAP_NG=y +BR2_PACKAGE_LIBUV=y BR2_PACKAGE_LINUX_PAM=y BR2_PACKAGE_PROTOBUF=y BR2_PACKAGE_LIBESTR=y @@ -516,13 +519,13 @@ BR2_PACKAGE_SYSTEMD_RANDOMSEED=y BR2_PACKAGE_SYSTEMD_REPART=y # BR2_PACKAGE_SYSTEMD_RESOLVED is not set # BR2_PACKAGE_SYSTEMD_VCONSOLE is not set -BR2_PACKAGE_SYSTEMD_BOOTCHART=y BR2_PACKAGE_TAR=y BR2_PACKAGE_UTIL_LINUX_BINARIES=y BR2_PACKAGE_UTIL_LINUX_HWCLOCK=y BR2_PACKAGE_UTIL_LINUX_KILL=y BR2_PACKAGE_UTIL_LINUX_MORE=y BR2_PACKAGE_UTIL_LINUX_PARTX=y +BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT=y BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y BR2_PACKAGE_NANO=y BR2_PACKAGE_VIM=y @@ -530,9 +533,6 @@ BR2_PACKAGE_VIM=y BR2_TARGET_ROOTFS_SQUASHFS=y BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y # BR2_TARGET_ROOTFS_TAR is not set -BR2_TARGET_GRUB2=y -BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI="boot linux ext2 fat squash4 part_msdos part_gpt normal efi_gop regexp loadenv echo cat test configfile" -BR2_TARGET_GRUB2_INSTALL_TOOLS=y BR2_PACKAGE_HOST_CMAKE=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_E2FSPROGS=y diff --git a/buildroot-external/package/ovos-splash/ovos-splash.mk b/buildroot-external/package/ovos-splash/ovos-splash.mk index c1d311e0..af7e38bd 100644 --- a/buildroot-external/package/ovos-splash/ovos-splash.mk +++ b/buildroot-external/package/ovos-splash/ovos-splash.mk @@ -10,6 +10,13 @@ OVOS_SPLASH_LICENSE = GPL-2.0+ OVOS_SPLASH_LICENSE_FILES = COPYING OVOS_SPLASH_AUTORECONF = YES +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +OVOS_SPLASH_DEPENDENCIES += systemd +OVOS_SPLASH_CONF_OPTS += --with-systemd +else +OVOS_SPLASH_CONF_OPTS += --without-systemd +endif + define OVOS_SPLASH_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 $(BR2_EXTERNAL_OPENVOICEOS_PATH)/package/ovos-splash/ovos-splash-start.service \ $(TARGET_DIR)/usr/lib/systemd/system/ovos-splash-start.service diff --git a/buildroot-external/rootfs-overlay/etc/fstab b/buildroot-external/rootfs-overlay/etc/fstab index caac4bdb..4a5b62db 100644 --- a/buildroot-external/rootfs-overlay/etc/fstab +++ b/buildroot-external/rootfs-overlay/etc/fstab @@ -1,4 +1,4 @@ # -#PARTUUID=9262aee5-2d23-4e09-baac-280591e2e834 /boot vfat defaults,noatime 0 0 +PARTUUID=9262aee5-2d23-4e09-baac-280591e2e834 /boot vfat defaults,noatime 0 0 #PARTUUID=c0932a41-44cf-463b-8152-d43188553ed4 / squashfs defaults,noatime 0 1 #PARTUUID=f1326040-5236-40eb-b683-aaa100a9afcf /mnt/overlay ext4 defaults,noatime 0 1 diff --git a/buildroot-external/rootfs-overlay/etc/pulse/mycroft-sj201-default.pa b/buildroot-external/rootfs-overlay/etc/pulse/mycroft-sj201-default.pa index b33f6588..ed427320 100644 --- a/buildroot-external/rootfs-overlay/etc/pulse/mycroft-sj201-default.pa +++ b/buildroot-external/rootfs-overlay/etc/pulse/mycroft-sj201-default.pa @@ -64,8 +64,8 @@ load-module module-position-event-sounds ### OpenVoiceOS Audio Settings load-module module-role-ducking load-module module-combine-sink sink_name=OpenVoiceOS -load-module module-remap-source source_name=VF_ASR_L source_properties="device.description='VocalFusion ASR recording'" master=alsa_input.platform-asoc-simple-card.0.stereo-fallback remix=no master_channel_map=front-left channel_map=mono -load-module module-remap-source source_name=VF_Comms_R source_properties="device.description='VocalFusion Comms recording'" master=alsa_input.platform-asoc-simple-card.0.stereo-fallback remix=no master_channel_map=front-right channel_map=mono +load-module module-remap-source source_name=VF_ASR_L source_properties="device.description='VocalFusion ASR recording'" master=alsa_input.platform-asoc-simple-card.0.stereo-fallback remix=no master_channel_map=front-right channel_map=mono +load-module module-remap-source source_name=VF_Comms_R source_properties="device.description='VocalFusion Comms recording'" master=alsa_input.platform-asoc-simple-card.0.stereo-fallback remix=no master_channel_map=front-left channel_map=mono set-default-source VF_ASR_L set-default-sink OpenVoiceOS