From 0b3fa7e9c108d114e18ff7c62a1e20f979f89a90 Mon Sep 17 00:00:00 2001 From: j1nx Date: Thu, 8 Dec 2022 20:47:01 +0100 Subject: [PATCH 1/8] Get rpi3_64-gui inline with rpi4_64-gui --- .../configs/rpi3_64-gui_defconfig | 193 +++++++----------- 1 file changed, 74 insertions(+), 119 deletions(-) diff --git a/buildroot-external/configs/rpi3_64-gui_defconfig b/buildroot-external/configs/rpi3_64-gui_defconfig index 8e66ded3..3443437c 100644 --- a/buildroot-external/configs/rpi3_64-gui_defconfig +++ b/buildroot-external/configs/rpi3_64-gui_defconfig @@ -1,4 +1,5 @@ BR2_aarch64=y +BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y BR2_DL_DIR="../../downloads" BR2_CCACHE=y @@ -23,22 +24,24 @@ BR2_INIT_SYSTEMD=y # BR2_TARGET_ENABLE_ROOT_LOGIN is not set BR2_SYSTEM_BIN_SH_BASH=y # BR2_TARGET_GENERIC_GETTY is not set +# BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set BR2_SYSTEM_DHCP="eth0" # BR2_ENABLE_LOCALE_PURGE is not set BR2_GENERATE_LOCALE="en_US.UTF-8" BR2_SYSTEM_ENABLE_NLS=y BR2_ROOTFS_USERS_TABLES="$(BR2_EXTERNAL)/user_table.txt" -BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL)/rootfs-overlay $(BR2_EXTERNAL)/board/raspberrypi/rootfs-overlay $(BR2_EXTERNAL)/board/raspberrypi3-64/rootfs-overlay" +BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL)/rootfs-overlay $(BR2_EXTERNAL)/board/raspberrypi/rootfs-overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL)/board/raspberrypi3-64/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL)/board/raspberrypi3-64/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="--rpi3" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/1.20220331.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL)/board/raspberrypi/kernel.config" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/refs/tags/1.20221104.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL)/kernel/ovos.config $(BR2_EXTERNAL)/kernel/device-drivers.config $(BR2_EXTERNAL)/board/raspberrypi/kernel.config" BR2_LINUX_KERNEL_LZ4=y BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2837-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2710-rpi-zero-2" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2837-rpi-3-b" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y BR2_PACKAGE_LINUX_TOOLS_GPIO=y @@ -61,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 @@ -264,19 +269,22 @@ 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 BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y -BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y BR2_PACKAGE_NFS_UTILS=y BR2_PACKAGE_NTFS_3G=y +BR2_PACKAGE_SQUASHFS=y +BR2_PACKAGE_SQUASHFS_LZ4=y +BR2_PACKAGE_SQUASHFS_LZMA=y +BR2_PACKAGE_SQUASHFS_LZO=y +BR2_PACKAGE_SQUASHFS_XZ=y BR2_PACKAGE_DEJAVU=y BR2_PACKAGE_LIBERATION=y -BR2_PACKAGE_GLMARK2=y BR2_PACKAGE_MESA3D=y -BR2_PACKAGE_MESA3D_LLVM=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_QT5=y @@ -311,69 +319,11 @@ BR2_PACKAGE_XKEYBOARD_CONFIG=y BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI=y BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT=y BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI=y -BR2_PACKAGE_LINUX_FIRMWARE=y -BR2_PACKAGE_LINUX_FIRMWARE_IBT=y -BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7650=y -BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174A_BT=y -BR2_PACKAGE_LINUX_FIRMWARE_AR3011=y -BR2_PACKAGE_LINUX_FIRMWARE_AR3012_USB=y -BR2_PACKAGE_LINUX_FIRMWARE_TI_CC2560=y -BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_6002=y -BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_6003=y -BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_6004=y -BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_7010=y -BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9170=y -BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271=y -BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA998X=y -BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160=y -BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3168=y -BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_5000=y -BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2A=y -BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2B=y -BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7260=y -BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7265D=y -BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8000C=y -BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8265=y -BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_9XXX=y -BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V8=y -BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V9=y -BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8688=y -BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8787=y -BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8797=y -BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8797=y -BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8801=y -BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8887=y -BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8897=y -BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8897=y -BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_PCIE8897=y -BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y -BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174=y -BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61=y -BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y -BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y -BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y -BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y -BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y -BR2_PACKAGE_LINUX_FIRMWARE_REDPINE_RS9113=y -BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X=y -BR2_PACKAGE_LINUX_FIRMWARE_TI_WL128X=y -BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y -BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y -BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4=y -BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T5=y -BR2_PACKAGE_LINUX_FIRMWARE_INTEL_E100=y -BR2_PACKAGE_LINUX_FIRMWARE_QLOGIC_4X=y -BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y BR2_PACKAGE_RPI_FIRMWARE=y -BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y -BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y -BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI_X=y -BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI_CD=y +BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y +BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4_X=y +BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4_CD=y BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="$(BR2_EXTERNAL)/board/raspberrypi/config_3_64bit.txt" -BR2_PACKAGE_UX500_FIRMWARE=y -BR2_PACKAGE_WILC1000_FIRMWARE=y -BR2_PACKAGE_WILINK_BT_FIRMWARE=y -BR2_PACKAGE_ZD1211_FIRMWARE=y BR2_PACKAGE_AVRDUDE=y BR2_PACKAGE_DBUS_CPP=y BR2_PACKAGE_EDID_DECODE=y @@ -390,9 +340,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 @@ -408,6 +355,7 @@ BR2_PACKAGE_PYTHON_ARROW=y BR2_PACKAGE_PYTHON_AUTOBAHN=y BR2_PACKAGE_PYTHON_CHERRYPY=y BR2_PACKAGE_PYTHON_COLORAMA=y +BR2_PACKAGE_PYTHON_COLORZERO=y BR2_PACKAGE_PYTHON_CONFIGSHELL_FB=y BR2_PACKAGE_PYTHON_DAEMONIZE=y BR2_PACKAGE_PYTHON_DBUS_NEXT=y @@ -418,7 +366,6 @@ BR2_PACKAGE_PYTHON_FLASK_JSONRPC=y BR2_PACKAGE_PYTHON_FLASK_LOGIN=y BR2_PACKAGE_PYTHON_FLASK_SQLALCHEMY=y BR2_PACKAGE_PYTHON_FLATBUFFERS=y -BR2_PACKAGE_PYTHON_GPIOZERO=y BR2_PACKAGE_PYTHON_HUMANIZE=y BR2_PACKAGE_PYTHON_JSON_SCHEMA_VALIDATOR=y BR2_PACKAGE_PYTHON_JSONMODELS=y @@ -435,7 +382,8 @@ BR2_PACKAGE_PYTHON_PIP=y BR2_PACKAGE_PYTHON_PSUTIL=y BR2_PACKAGE_PYTHON_PYJWT=y BR2_PACKAGE_PYTHON_PYUDEV=y -BR2_PACKAGE_PYTHON_PYUSB=y +BR2_PACKAGE_PYTHON_RPI_GPIO=y +BR2_PACKAGE_PYTHON_RPI_WS281X=y BR2_PACKAGE_PYTHON_SDNOTIFY=y BR2_PACKAGE_PYTHON_SERIAL=y BR2_PACKAGE_PYTHON_SIP=y @@ -445,13 +393,13 @@ BR2_PACKAGE_PYTHON_SOCKETIO=y BR2_PACKAGE_PYTHON_SPIDEV=y BR2_PACKAGE_PYTHON_SYSTEMD=y BR2_PACKAGE_PYTHON_TEXTTABLE=y -BR2_PACKAGE_PYTHON_TORNADO=y BR2_PACKAGE_PYTHON_TWISTED=y BR2_PACKAGE_PYTHON_TWISTED_HTTP2=y BR2_PACKAGE_PYTHON_TWISTED_TLS=y BR2_PACKAGE_PYTHON_VALIDATORS=y BR2_PACKAGE_PYTHON_WATCHDOG=y BR2_PACKAGE_PYTHON_WEBSOCKET_CLIENT=y +BR2_PACKAGE_ALSA_LIB_PYTHON=y BR2_PACKAGE_ALSA_PLUGINS=y BR2_PACKAGE_LIBAO=y BR2_PACKAGE_LIBSAMPLERATE=y @@ -464,7 +412,6 @@ BR2_PACKAGE_LIBARCHIVE_BSDTAR=y BR2_PACKAGE_LIBARCHIVE_BSDCPIO=y BR2_PACKAGE_LIBARCHIVE_BSDCAT=y BR2_PACKAGE_LIBZIP=y -BR2_PACKAGE_LZ4=y BR2_PACKAGE_CA_CERTIFICATES=y BR2_PACKAGE_GNUTLS_OPENSSL=y BR2_PACKAGE_GNUTLS_TOOLS=y @@ -496,18 +443,19 @@ 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 @@ -518,7 +466,10 @@ BR2_PACKAGE_PCRE2_32=y BR2_PACKAGE_BLUEZ_TOOLS=y BR2_PACKAGE_BLUEZ5_UTILS_OBEX=y BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y +BR2_PACKAGE_BLUEZ5_UTILS_MONITOR=y +BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y +BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID=y BR2_PACKAGE_CRDA=y BR2_PACKAGE_DNSMASQ=y BR2_PACKAGE_DNSMASQ_DNSSEC=y @@ -533,11 +484,13 @@ BR2_PACKAGE_NTP=y BR2_PACKAGE_NTP_NTPDATE=y BR2_PACKAGE_NTP_NTPTIME=y BR2_PACKAGE_OPENSSH=y +BR2_PACKAGE_SAMBA4=y BR2_PACKAGE_SHAIRPORT_SYNC=y BR2_PACKAGE_SHAIRPORT_SYNC_CONVOLUTION=y BR2_PACKAGE_SHAIRPORT_SYNC_DBUS=y BR2_PACKAGE_SHAIRPORT_SYNC_LIBSOXR=y BR2_PACKAGE_WGET=y +BR2_PACKAGE_WIRELESS_TOOLS=y BR2_PACKAGE_WPA_SUPPLICANT=y BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y BR2_PACKAGE_WPA_SUPPLICANT_MESH_NETWORKING=y @@ -548,7 +501,6 @@ BR2_PACKAGE_WPA_SUPPLICANT_CLI=y BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO=y BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y BR2_PACKAGE_WPA_SUPPLICANT_DBUS=y -BR2_PACKAGE_BASH_COMPLETION=y BR2_PACKAGE_FILE=y BR2_PACKAGE_SCREEN=y BR2_PACKAGE_SUDO=y @@ -562,30 +514,28 @@ BR2_PACKAGE_SYSTEMD_HIBERNATE=y BR2_PACKAGE_SYSTEMD_LOCALED=y BR2_PACKAGE_SYSTEMD_LOGIND=y # BR2_PACKAGE_SYSTEMD_NETWORKD is not set +BR2_PACKAGE_SYSTEMD_OOMD=y BR2_PACKAGE_SYSTEMD_POLKIT=y 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_SYSTEMD_RFKILL=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 # BR2_PACKAGE_VIM_RUNTIME is not set -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_LABEL="rootfs1" -BR2_TARGET_ROOTFS_EXT2_SIZE="4000M" -BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O 64bit -U c0932a41-44cf-463b-8152-d43188553ed4" +BR2_TARGET_ROOTFS_SQUASHFS=y +BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_PACKAGE_HOST_CMAKE=y BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_E2FSPROGS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MKPASSWD=y BR2_PACKAGE_HOST_MTOOLS=y @@ -595,6 +545,8 @@ BR2_PACKAGE_HOST_PYTHON_LXML=y BR2_PACKAGE_HOST_PYTHON_SIX=y BR2_PACKAGE_HOST_PYTHON_XLRD=y BR2_PACKAGE_HOST_RUSTC=y +BR2_PACKAGE_HOST_RUST=y +BR2_PACKAGE_BARESIP=y BR2_PACKAGE_BTSPEAKER=y BR2_PACKAGE_FANN=y BR2_PACKAGE_GROWDISK_SERVICE=y @@ -647,13 +599,18 @@ BR2_PACKAGE_SPOTIFYD=y BR2_PACKAGE_TENSORFLOW_LITE=y BR2_PACKAGE_USERLAND_TOOLS=y BR2_PACKAGE_VOCALFUSION=y +BR2_PACKAGE_WHISPERCPP=y +BR2_PACKAGE_WIFI_CONNECT=y BR2_PACKAGE_WIRINGPI2=y +BR2_PACKAGE_XORGPROTO_MESAFIX=y BR2_PACKAGE_PYTHON_ADAPT_PARSER=y BR2_PACKAGE_PYTHON_ASTRAL=y BR2_PACKAGE_PYTHON_AUDIO_METADATA=y +BR2_PACKAGE_PYTHON_BOARD=y BR2_PACKAGE_PYTHON_CLICK_DEFAULT_GROUP=y BR2_PACKAGE_PYTHON_COMBO_LOCK=y BR2_PACKAGE_PYTHON_COVERALLS=y +BR2_PACKAGE_PYTHON_CUTECHARTS=y BR2_PACKAGE_PYTHON_DATACLASSES=y BR2_PACKAGE_PYTHON_DEPRECATED=y BR2_PACKAGE_PYTHON_FEEDPARSER=y @@ -665,9 +622,11 @@ BR2_PACKAGE_PYTHON_GOOGLE_API_PYTHON_CLIENT=y BR2_PACKAGE_PYTHON_GOOGLE_TRANS_NEW=y BR2_PACKAGE_PYTHON_GPSDCLIENT=y BR2_PACKAGE_PYTHON_GTTS=y +BR2_PACKAGE_PYTHON_HIJRI_CONVERTER=y BR2_PACKAGE_PYTHON_HOLIDAYS=y BR2_PACKAGE_PYTHON_HUMANHASH3=y BR2_PACKAGE_PYTHON_KTHREAD=y +BR2_PACKAGE_PYTHON_LANGCODES=y BR2_PACKAGE_PYTHON_LAZY=y BR2_PACKAGE_PYTHON_LEVENSHTEIN=y BR2_PACKAGE_PYTHON_MEMORY_TEMPFILE=y @@ -693,16 +652,18 @@ BR2_PACKAGE_PYTHON_PETACT=y BR2_PACKAGE_PYTHON_PHONEME_GUESSER=y BR2_PACKAGE_PYTHON_POCKETSPHINX=y BR2_PACKAGE_PYTHON_PRECISE_LITE_RUNNER=y -BR2_PACKAGE_PYTHON_PRECISE_RUNNER=y BR2_PACKAGE_PYTHON_PULSECTL=y +BR2_PACKAGE_PYTHON_PYAUDIO=y BR2_PACKAGE_PYTHON_PYCHROMECAST=y BR2_PACKAGE_PYTHON_PYCPUINFO=y BR2_PACKAGE_PYTHON_PYEE=y +BR2_PACKAGE_PYTHON_PYFTDI=y BR2_PACKAGE_PYTHON_PYJOKES=y BR2_PACKAGE_PYTHON_PYMPLAYER=y BR2_PACKAGE_PYTHON_PYOWM=y BR2_PACKAGE_PYTHON_PYTHRAN=y BR2_PACKAGE_PYTHON_PYTZDATA=y +BR2_PACKAGE_PYTHON_PYWEBIO=y BR2_PACKAGE_PYTHON_QUANTULUM3=y BR2_PACKAGE_PYTHON_RAKEKEYWORDS=y BR2_PACKAGE_PYTHON_RAPIDFUZZ=y @@ -714,6 +675,7 @@ BR2_PACKAGE_PYTHON_SMBUS2=y BR2_PACKAGE_PYTHON_SMMAP=y BR2_PACKAGE_PYTHON_SONOPY=y BR2_PACKAGE_PYTHON_SOURCE=y +BR2_PACKAGE_PYTHON_SYSV_IPC=y BR2_PACKAGE_PYTHON_TAILHEAD=y BR2_PACKAGE_PYTHON_TFLIT=y BR2_PACKAGE_PYTHON_TUTUBO=y @@ -730,9 +692,11 @@ BR2_PACKAGE_PYTHON_YOUTUBE_SEARCHER=y BR2_PACKAGE_PYTHON_YT_DLP=y BR2_PACKAGE_MYCROFT_GUI=y BR2_PACKAGE_PYTHON_OVOS_CLI_CLIENT=y +BR2_PACKAGE_PYTHON_OVOS_CONFIG=y BR2_PACKAGE_PYTHON_OVOS_CORE=y -BR2_PACKAGE_MYCROFT_SERVICE=y BR2_PACKAGE_PYTHON_OVOS_AUDIO_PLUGIN_SIMPLE=y +BR2_PACKAGE_PYTHON_OVOS_BACKEND_CLIENT=y +BR2_PACKAGE_PYTHON_OVOS_BACKEND_MANAGER=y BR2_PACKAGE_PYTHON_OVOS_CONFIG_ASSISTANT=y BR2_PACKAGE_PYTHON_OVOS_LINGUA_FRANCA=y BR2_PACKAGE_PYTHON_OVOS_LOCAL_BACKEND=y @@ -743,11 +707,11 @@ BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_ALSA=y BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_BALENA_WIFI=y BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_BRIGHTNESS_CONTROL_RPI=y BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_COLOR_SCHEME_MANAGER=y +BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_CONFIGURATION_PROVIDER=y BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_CONNECTIVITY_EVENTS=y BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_DASHBOARD=y BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_DISPLAY_MANAGER_IPC=y BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_GUI_NETWORK_CLIENT=y -BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_GPSD=y BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_IPGEO=y BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_MK2=y BR2_PACKAGE_PYTHON_OVOS_PHAL_PLUGIN_NETWORK_MANAGER=y @@ -760,13 +724,15 @@ BR2_PACKAGE_PYTHON_OVOS_SKILL_INSTALLER=y BR2_PACKAGE_PYTHON_OVOS_SKILL_MANAGER=y BR2_PACKAGE_PYTHON_OVOS_STT_HTTP_SERVER=y BR2_PACKAGE_PYTHON_OVOS_STT_PLUGIN_CHROMIUM=y -BR2_PACKAGE_PYTHON_OVOS_STT_PLUGIN_POCKETSPHINX=y +BR2_PACKAGE_PYTHON_OVOS_STT_PLUGIN_SELENE=y BR2_PACKAGE_PYTHON_OVOS_STT_PLUGIN_VOSK=y +BR2_PACKAGE_PYTHON_OVOS_STT_PLUGIN_WHISPERCPP=y BR2_PACKAGE_PYTHON_OVOS_STT_SERVER_PLUGIN=y BR2_PACKAGE_PYTHON_NEON_TTS_PLUGIN_LARYNX_SERVER=y BR2_PACKAGE_PYTHON_OVOS_TTS_PLUGIN_MARYTTS=y BR2_PACKAGE_PYTHON_OVOS_TTS_PLUGIN_MIMIC=y BR2_PACKAGE_PYTHON_OVOS_TTS_PLUGIN_MIMIC2=y +BR2_PACKAGE_PYTHON_OVOS_TTS_PLUGIN_MIMIC3_SERVER=y BR2_PACKAGE_PYTHON_OVOS_TTS_PLUGIN_PICO=y BR2_PACKAGE_PYTHON_OVOS_TTS_SERVER=y BR2_PACKAGE_PYTHON_OVOS_TTS_SERVER_PLUGIN=y @@ -775,32 +741,21 @@ BR2_PACKAGE_PYTHON_OVOS_VAD_PLUGIN_WEBRTCVAD=y BR2_PACKAGE_PYTHON_OVOS_VLC_PLUGIN=y BR2_PACKAGE_PYTHON_OVOS_WORKSHOP=y BR2_PACKAGE_PYTHON_OVOS_WW_PLUGIN_POCKETSPHINX=y -BR2_PACKAGE_PYTHON_OVOS_WW_PLUGIN_PRECISE=y BR2_PACKAGE_PYTHON_OVOS_WW_PLUGIN_PRECISE_LITE=y -BR2_PACKAGE_MYCROFT_SKILL_AUDIO_RECORD=y -BR2_PACKAGE_MYCROFT_SKILL_CAMERA=y -BR2_PACKAGE_MYCROFT_SKILL_CONFIGURATION=y -BR2_PACKAGE_MYCROFT_SKILL_DATE_TIME=y -BR2_PACKAGE_MYCROFT_SKILL_DDG=y -BR2_PACKAGE_MYCROFT_SKILL_INSTALLER=y -BR2_PACKAGE_MYCROFT_SKILL_IP=y -BR2_PACKAGE_MYCROFT_SKILL_JOKE=y -BR2_PACKAGE_MYCROFT_SKILL_NAPTIME=y -BR2_PACKAGE_MYCROFT_SKILL_NEWS=y -BR2_PACKAGE_MYCROFT_SKILL_OVOS_ALARM=y -BR2_PACKAGE_MYCROFT_SKILL_OVOS_HOMESCREEN=y -BR2_PACKAGE_MYCROFT_SKILL_OVOS_INFO=y -BR2_PACKAGE_MYCROFT_SKILL_OVOS_NOTES=y -BR2_PACKAGE_MYCROFT_SKILL_OVOS_SETTINGS=y -BR2_PACKAGE_MYCROFT_SKILL_OVOS_SETUP=y -BR2_PACKAGE_MYCROFT_SKILL_OVOS_STOP=y -BR2_PACKAGE_MYCROFT_SKILL_OVOS_TIMER=y -BR2_PACKAGE_MYCROFT_SKILL_OVOS_VOLUME=y -BR2_PACKAGE_MYCROFT_SKILL_PERSONAL=y -BR2_PACKAGE_MYCROFT_SKILL_REMINDER=y -BR2_PACKAGE_MYCROFT_SKILL_SINGING=y -BR2_PACKAGE_MYCROFT_SKILL_SPELLING=y -BR2_PACKAGE_MYCROFT_SKILL_UNKNOWN=y -BR2_PACKAGE_MYCROFT_SKILL_WEATHER=y -BR2_PACKAGE_MYCROFT_SKILL_WOLFIE=y -BR2_PACKAGE_MYCROFT_SKILL_YOUTUBE_MUSIC=y +BR2_PACKAGE_PYTHON_OVOS_WW_PLUGIN_VOSK=y +BR2_PACKAGE_SKILL_ALERTS=y +BR2_PACKAGE_SKILL_OVOS_DATE_TIME=y +BR2_PACKAGE_SKILL_OVOS_DDG=y +BR2_PACKAGE_SKILL_OVOS_FALLBACK_UNKNOWN=y +BR2_PACKAGE_SKILL_OVOS_HOMESCREEN=y +BR2_PACKAGE_SKILL_OVOS_NAPTIME=y +BR2_PACKAGE_SKILL_OVOS_NEWS=y +BR2_PACKAGE_SKILL_OVOS_NOTES=y +BR2_PACKAGE_SKILL_OVOS_SETTINGS=y +BR2_PACKAGE_SKILL_OVOS_SETUP=y +BR2_PACKAGE_SKILL_OVOS_STOP=y +BR2_PACKAGE_SKILL_OVOS_VOLUME=y +BR2_PACKAGE_SKILL_OVOS_PERSONAL=y +BR2_PACKAGE_SKILL_OVOS_WEATHER=y +BR2_PACKAGE_SKILL_OVOS_WOLFIE=y +BR2_PACKAGE_SKILL_YOUTUBE_MUSIC=y From fb90883647e628eb418ec41e0712a78182b6e335 Mon Sep 17 00:00:00 2001 From: j1nx Date: Thu, 8 Dec 2022 20:57:52 +0100 Subject: [PATCH 2/8] Fix rpi firmware switch for rpi3 --- buildroot-external/configs/rpi3_64-gui_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/buildroot-external/configs/rpi3_64-gui_defconfig b/buildroot-external/configs/rpi3_64-gui_defconfig index 3443437c..94c15bd8 100644 --- a/buildroot-external/configs/rpi3_64-gui_defconfig +++ b/buildroot-external/configs/rpi3_64-gui_defconfig @@ -1,5 +1,4 @@ BR2_aarch64=y -BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y BR2_DL_DIR="../../downloads" BR2_CCACHE=y @@ -320,9 +319,10 @@ BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI=y BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT=y BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI=y BR2_PACKAGE_RPI_FIRMWARE=y -BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y -BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4_X=y -BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4_CD=y +BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y +BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y +BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI_X=y +BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI_CD=y BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="$(BR2_EXTERNAL)/board/raspberrypi/config_3_64bit.txt" BR2_PACKAGE_AVRDUDE=y BR2_PACKAGE_DBUS_CPP=y From 124de8e2534558132d432a7fbbce61275b9683d9 Mon Sep 17 00:00:00 2001 From: j1nx Date: Sat, 10 Dec 2022 18:45:17 +0100 Subject: [PATCH 3/8] Fix linux defconfig mistake --- buildroot-external/configs/rpi3_64-gui_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildroot-external/configs/rpi3_64-gui_defconfig b/buildroot-external/configs/rpi3_64-gui_defconfig index 94c15bd8..cedb38b7 100644 --- a/buildroot-external/configs/rpi3_64-gui_defconfig +++ b/buildroot-external/configs/rpi3_64-gui_defconfig @@ -36,7 +36,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="--rpi3" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/refs/tags/1.20221104.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" +BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL)/kernel/ovos.config $(BR2_EXTERNAL)/kernel/device-drivers.config $(BR2_EXTERNAL)/board/raspberrypi/kernel.config" BR2_LINUX_KERNEL_LZ4=y BR2_LINUX_KERNEL_DTS_SUPPORT=y From 7e816c4452ccd6a0ca2c5ba69e662bb141480ebc Mon Sep 17 00:00:00 2001 From: j1nx Date: Sat, 10 Dec 2022 19:30:11 +0100 Subject: [PATCH 4/8] Fix kf5_kconfig_compiler --- buildroot-external/package/kf5-kconfig/kf5-kconfig.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildroot-external/package/kf5-kconfig/kf5-kconfig.mk b/buildroot-external/package/kf5-kconfig/kf5-kconfig.mk index 98467ef0..2718fffc 100644 --- a/buildroot-external/package/kf5-kconfig/kf5-kconfig.mk +++ b/buildroot-external/package/kf5-kconfig/kf5-kconfig.mk @@ -26,7 +26,7 @@ KF5_KCONFIG_CONF_OPTS = -DCMAKE_CXX_FLAGS="$(KF5_KCONFIG_CXXFLAGS)" KF5_KCONFIG_POST_INSTALL_STAGING_HOOKS = KF5_KCONFIG_COMPILER_FIX define KF5_KCONFIG_COMPILER_FIX - cp /usr/lib/libexec/kf5/kconfig_compiler_kf5 $(STAGING_DIR)/usr/lib/libexec/ + cp /usr/lib/libexec/kf5/kconfig_compiler_kf5 $(STAGING_DIR)/usr/lib/libexec/kf5/ endef $(eval $(cmake-package)) From 221c2d13b0599db011330d92e541e6a87715fd91 Mon Sep 17 00:00:00 2001 From: j1nx Date: Sat, 10 Dec 2022 20:25:58 +0100 Subject: [PATCH 5/8] Fix python-ovos-cli-client.hash mistake --- .../package/python-ovos-cli-client/python-ovos-cli-client.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildroot-external/package/python-ovos-cli-client/python-ovos-cli-client.hash b/buildroot-external/package/python-ovos-cli-client/python-ovos-cli-client.hash index 577e1aec..06b1d35b 100644 --- a/buildroot-external/package/python-ovos-cli-client/python-ovos-cli-client.hash +++ b/buildroot-external/package/python-ovos-cli-client/python-ovos-cli-client.hash @@ -1 +1 @@ -sha256 39ce081b9674a416fa8dfdd098dbafbc286e6e2f7f3ba3dc3d01f57d95e14448 python-ovos-cli-client-5f6d69372e292010374361ce7e5c2f2388250b47.tar.gz +sha256 60efdd8c50c9e46729dc7d862fd2722254856e9ff0161c14aab12544b5174290 python-ovos-cli-client-5f6d69372e292010374361ce7e5c2f2388250b47.tar.gz From 0f441057c4b0853b30699ffa2aa85316dfe93721 Mon Sep 17 00:00:00 2001 From: j1nx Date: Mon, 12 Dec 2022 12:10:24 +0100 Subject: [PATCH 6/8] Fix snapast server mpd.py permission error --- buildroot-external/package/snapcast/snapcast.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/buildroot-external/package/snapcast/snapcast.mk b/buildroot-external/package/snapcast/snapcast.mk index 537199e5..b74d2967 100644 --- a/buildroot-external/package/snapcast/snapcast.mk +++ b/buildroot-external/package/snapcast/snapcast.mk @@ -20,6 +20,7 @@ define SNAPSERVER_INSTALL_CONFIG mkdir -p $(TARGET_DIR)/etc/snapcast $(INSTALL) -m 0755 -D $(@D)/debian/snapserver.default $(TARGET_DIR)/etc/snapcast/snapserver $(INSTALL) -m 0755 -D $(@D)/server/etc/snapserver.conf $(TARGET_DIR)/etc/ + chmod +r $(TARGET_DIR)/usr/share/snapserver/plug-ins/meta_mpd.py endef From b6500ad95d817b80629776f72f4dfedfe77812e0 Mon Sep 17 00:00:00 2001 From: j1nx Date: Mon, 12 Dec 2022 13:55:54 +0100 Subject: [PATCH 7/8] Fix image creation scripts --- .../board/raspberrypi/config_3_64bit.txt | 4 ++-- .../raspberrypi/genimage-raspberrypi3-64.cfg | 22 +++++++++++++++---- .../board/raspberrypi3-64/cmdline.txt | 1 - .../board/raspberrypi3-64/config.txt | 1 - 4 files changed, 20 insertions(+), 8 deletions(-) delete mode 120000 buildroot-external/board/raspberrypi3-64/cmdline.txt delete mode 120000 buildroot-external/board/raspberrypi3-64/config.txt diff --git a/buildroot-external/board/raspberrypi/config_3_64bit.txt b/buildroot-external/board/raspberrypi/config_3_64bit.txt index b065d979..ade40bcb 100644 --- a/buildroot-external/board/raspberrypi/config_3_64bit.txt +++ b/buildroot-external/board/raspberrypi/config_3_64bit.txt @@ -5,8 +5,8 @@ # and http://elinux.org/RPiconfig for a description of config.txt syntax # We always use the same names, the real used variant is selected by # BR2_PACKAGE_RPI_FIRMWARE_{DEFAULT,X,CD} choice -start_file=startx.elf -fixup_file=fixupx.dat +start_file=start_x.elf +fixup_file=fixup_x.dat kernel=Image diff --git a/buildroot-external/board/raspberrypi/genimage-raspberrypi3-64.cfg b/buildroot-external/board/raspberrypi/genimage-raspberrypi3-64.cfg index 135a8c94..33cfed03 100644 --- a/buildroot-external/board/raspberrypi/genimage-raspberrypi3-64.cfg +++ b/buildroot-external/board/raspberrypi/genimage-raspberrypi3-64.cfg @@ -17,7 +17,15 @@ image boot.vfat { "Image" } } - size = 96M + size = 64M +} + +image overlayfs.ext4 { + name = "overlayfs" + ext4 { + use-mke2fs = "true" + } + size = 64M } image sdcard.img { @@ -26,7 +34,7 @@ image sdcard.img { partition-table-type = "hybrid" } - partition boot1 { + partition boot { partition-type = 0xC partition-uuid = 9262aee5-2d23-4e09-baac-280591e2e834 partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b @@ -34,9 +42,15 @@ image sdcard.img { image = "boot.vfat" } - partition rootfs1 { + partition rootfs { partition-uuid = c0932a41-44cf-463b-8152-d43188553ed4 partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae - image = "rootfs.ext4" + image = "rootfs.squashfs" + } + + partition overlayfs { + partition-uuid = f1326040-5236-40eb-b683-aaa100a9afcf + partition-type-uuid = 0fc63daf-8483-4772-8e79-3d69d8477de4 + image = "overlayfs.ext4" } } diff --git a/buildroot-external/board/raspberrypi3-64/cmdline.txt b/buildroot-external/board/raspberrypi3-64/cmdline.txt deleted file mode 120000 index e684d0d9..00000000 --- a/buildroot-external/board/raspberrypi3-64/cmdline.txt +++ /dev/null @@ -1 +0,0 @@ -../raspberrypi/cmdline.txt \ No newline at end of file diff --git a/buildroot-external/board/raspberrypi3-64/config.txt b/buildroot-external/board/raspberrypi3-64/config.txt deleted file mode 120000 index a08512ea..00000000 --- a/buildroot-external/board/raspberrypi3-64/config.txt +++ /dev/null @@ -1 +0,0 @@ -../raspberrypi/config.txt \ No newline at end of file From fc8875907a9ea9dc2e3eeb670c6192e6be80f5e5 Mon Sep 17 00:00:00 2001 From: j1nx Date: Mon, 12 Dec 2022 14:40:33 +0100 Subject: [PATCH 8/8] Implement whisper* changes --- buildroot-external/configs/rpi3_64-gui_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildroot-external/configs/rpi3_64-gui_defconfig b/buildroot-external/configs/rpi3_64-gui_defconfig index cedb38b7..cb9c3aa7 100644 --- a/buildroot-external/configs/rpi3_64-gui_defconfig +++ b/buildroot-external/configs/rpi3_64-gui_defconfig @@ -599,6 +599,7 @@ BR2_PACKAGE_SPOTIFYD=y BR2_PACKAGE_TENSORFLOW_LITE=y BR2_PACKAGE_USERLAND_TOOLS=y BR2_PACKAGE_VOCALFUSION=y +BR2_PACKAGE_WHISPER_TFLITE=y BR2_PACKAGE_WHISPERCPP=y BR2_PACKAGE_WIFI_CONNECT=y BR2_PACKAGE_WIRINGPI2=y @@ -726,7 +727,6 @@ BR2_PACKAGE_PYTHON_OVOS_STT_HTTP_SERVER=y BR2_PACKAGE_PYTHON_OVOS_STT_PLUGIN_CHROMIUM=y BR2_PACKAGE_PYTHON_OVOS_STT_PLUGIN_SELENE=y BR2_PACKAGE_PYTHON_OVOS_STT_PLUGIN_VOSK=y -BR2_PACKAGE_PYTHON_OVOS_STT_PLUGIN_WHISPERCPP=y BR2_PACKAGE_PYTHON_OVOS_STT_SERVER_PLUGIN=y BR2_PACKAGE_PYTHON_NEON_TTS_PLUGIN_LARYNX_SERVER=y BR2_PACKAGE_PYTHON_OVOS_TTS_PLUGIN_MARYTTS=y