From accd9fb1170eba4ee55b72b2aadbadc306e53fef Mon Sep 17 00:00:00 2001 From: Jordan Speicher Date: Sun, 16 Jan 2022 10:33:30 -0600 Subject: [PATCH 1/4] Update snapclient to v0.26.0 --- buildroot-external/package/snapcast/snapcast.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildroot-external/package/snapcast/snapcast.mk b/buildroot-external/package/snapcast/snapcast.mk index cd2d2d0..b4e2454 100644 --- a/buildroot-external/package/snapcast/snapcast.mk +++ b/buildroot-external/package/snapcast/snapcast.mk @@ -4,7 +4,7 @@ # ################################################################################ -SNAPCAST_VERSION = v0.17.1 +SNAPCAST_VERSION = v0.26.0 SNAPCAST_SITE = $(call github,badaix,snapcast,$(SNAPCAST_VERSION)) SNAPCAST_DEPENDENCIES = libogg alsa-lib avahi # libstdcpp libatomic libflac libvorbisidec SNAPCAST_LICENSE = GPL-3.0+ From 125aad68766260db0772336c888fdb67ab9f608a Mon Sep 17 00:00:00 2001 From: Jordan Speicher Date: Sun, 16 Jan 2022 10:33:50 -0600 Subject: [PATCH 2/4] Sync configs with buildroot 2021.11 --- buildroot-external/configs/snapos_rpi2_defconfig | 7 +++++-- buildroot-external/configs/snapos_rpi3_defconfig | 7 +++++-- buildroot-external/configs/snapos_rpi4_defconfig | 5 +++-- buildroot-external/configs/snapos_rpi_defconfig | 7 +++++-- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/buildroot-external/configs/snapos_rpi2_defconfig b/buildroot-external/configs/snapos_rpi2_defconfig index 2c1279f..58b4f52 100644 --- a/buildroot-external/configs/snapos_rpi2_defconfig +++ b/buildroot-external/configs/snapos_rpi2_defconfig @@ -5,7 +5,7 @@ BR2_ARM_FPU_NEON_VFPV4=y BR2_CCACHE=y BR2_CCACHE_DIR="$(HOME)/.ccache" BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_TARGET_GENERIC_HOSTNAME="snapcast" BR2_TARGET_GENERIC_ISSUE="Welcome to Snapcast" @@ -17,7 +17,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_SNAPOS_PATH)/board/raspberrypi/comm BR2_ROOTFS_POST_SCRIPT_ARGS="--add-wlan0 --add-audio --speedup-boot --raise-volume --mount-boot" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,raspberrypi-kernel_1.20190819-1)/linux-raspberrypi-kernel_1.20190819-1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,581049d718caf95f5feb00607ac748d5841cf27c)/linux-581049d718caf95f5feb00607ac748d5841cf27c.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2709-rpi-2-b" @@ -28,6 +28,9 @@ BR2_PACKAGE_ALSA_UTILS_APLAY=y BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG=y +BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y +BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi/config_default.txt" BR2_PACKAGE_DHCPCD=y BR2_PACKAGE_DROPBEAR=y BR2_PACKAGE_IW=y diff --git a/buildroot-external/configs/snapos_rpi3_defconfig b/buildroot-external/configs/snapos_rpi3_defconfig index 4e6e566..7ea4b34 100644 --- a/buildroot-external/configs/snapos_rpi3_defconfig +++ b/buildroot-external/configs/snapos_rpi3_defconfig @@ -4,7 +4,7 @@ BR2_ARM_FPU_NEON_VFPV4=y BR2_CCACHE=y BR2_CCACHE_DIR="$(HOME)/.ccache" BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_TARGET_GENERIC_HOSTNAME="snapcast" BR2_TARGET_GENERIC_ISSUE="Welcome to Snapcast" @@ -16,7 +16,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_SNAPOS_PATH)/board/raspberrypi/comm BR2_ROOTFS_POST_SCRIPT_ARGS="--add-pi3-miniuart-bt-overlay --add-wlan0 --add-audio --speedup-boot --raise-volume --mount-boot" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,raspberrypi-kernel_1.20190819-1)/linux-raspberrypi-kernel_1.20190819-1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,581049d718caf95f5feb00607ac748d5841cf27c)/linux-581049d718caf95f5feb00607ac748d5841cf27c.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b bcm2710-rpi-3-b-plus bcm2710-rpi-cm3" @@ -28,6 +28,9 @@ BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y BR2_PACKAGE_RPI_BT_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG=y +BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y +BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi3/config_3.txt" BR2_PACKAGE_RPI_WIFI_FIRMWARE=y BR2_PACKAGE_DHCPCD=y BR2_PACKAGE_DROPBEAR=y diff --git a/buildroot-external/configs/snapos_rpi4_defconfig b/buildroot-external/configs/snapos_rpi4_defconfig index 42ac077..c9058a4 100644 --- a/buildroot-external/configs/snapos_rpi4_defconfig +++ b/buildroot-external/configs/snapos_rpi4_defconfig @@ -4,7 +4,7 @@ BR2_ARM_FPU_NEON_VFPV4=y BR2_CCACHE=y BR2_CCACHE_DIR="$(HOME)/.ccache" BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_TARGET_GENERIC_HOSTNAME="snapcast" BR2_TARGET_GENERIC_ISSUE="Welcome to Snapcast" @@ -16,7 +16,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_SNAPOS_PATH)/board/raspberrypi/comm BR2_ROOTFS_POST_SCRIPT_ARGS="--add-pi3-miniuart-bt-overlay --add-wlan0 --add-audio --speedup-boot --raise-volume --mount-boot" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,raspberrypi-kernel_1.20190819-1)/linux-raspberrypi-kernel_1.20190819-1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2711-rpi-4-b" @@ -29,6 +29,7 @@ BR2_PACKAGE_RPI_BT_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG=y +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi4/config_4.txt" BR2_PACKAGE_RPI_WIFI_FIRMWARE=y BR2_PACKAGE_DHCPCD=y BR2_PACKAGE_DROPBEAR=y diff --git a/buildroot-external/configs/snapos_rpi_defconfig b/buildroot-external/configs/snapos_rpi_defconfig index 50bba05..da0909f 100644 --- a/buildroot-external/configs/snapos_rpi_defconfig +++ b/buildroot-external/configs/snapos_rpi_defconfig @@ -4,7 +4,7 @@ BR2_ARM_EABIHF=y BR2_CCACHE=y BR2_CCACHE_DIR="$(HOME)/.ccache" BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_TARGET_GENERIC_HOSTNAME="snapcast" BR2_TARGET_GENERIC_ISSUE="Welcome to Snapcast" @@ -16,7 +16,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_SNAPOS_PATH)/board/raspberrypi/comm BR2_ROOTFS_POST_SCRIPT_ARGS="--add-wlan0 --add-audio --speedup-boot --raise-volume --mount-boot" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,raspberrypi-kernel_1.20190819-1)/linux-raspberrypi-kernel_1.20190819-1.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,9878a118cbdb7779fd15caa45915d22bff381ba3)/linux-9878a118cbdb7779fd15caa45915d22bff381ba3.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-b bcm2708-rpi-b-plus bcm2708-rpi-cm" @@ -27,6 +27,9 @@ BR2_PACKAGE_ALSA_UTILS_APLAY=y BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG=y +BR2_PACKAGE_RPI_FIRMWARE_BOOTCODE_BIN=y +BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi/config_default.txt" BR2_PACKAGE_DHCPCD=y BR2_PACKAGE_DROPBEAR=y BR2_PACKAGE_IW=y From 19f4107c6cf13f3035fd41a09cd1776309fcfdd0 Mon Sep 17 00:00:00 2001 From: Jordan Speicher Date: Thu, 20 Jan 2022 10:15:14 -0600 Subject: [PATCH 3/4] Remove deprecated `-Dwext` flag to wpa_supplicant --- buildroot-external/board/raspberrypi/common/post-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildroot-external/board/raspberrypi/common/post-build.sh b/buildroot-external/board/raspberrypi/common/post-build.sh index e11b53e..7c97513 100755 --- a/buildroot-external/board/raspberrypi/common/post-build.sh +++ b/buildroot-external/board/raspberrypi/common/post-build.sh @@ -13,7 +13,7 @@ do auto wlan0 iface wlan0 inet dhcp - pre-up wpa_supplicant -B -Dwext -iwlan0 -c/etc/wpa_supplicant.conf + pre-up wpa_supplicant -B -iwlan0 -c/etc/wpa_supplicant.conf post-down killall -q wpa_supplicant wait-delay 15 __EOF__ From e6b6e7d2a88a0535628193176e4ce2fb8f4c2ccf Mon Sep 17 00:00:00 2001 From: Jordan Speicher Date: Thu, 20 Jan 2022 10:18:16 -0600 Subject: [PATCH 4/4] Remove deprecated wpa_supplicant.conf entry --- buildroot-external/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/buildroot-external/README.md b/buildroot-external/README.md index 35b03a0..1b3c7d8 100644 --- a/buildroot-external/README.md +++ b/buildroot-external/README.md @@ -28,7 +28,6 @@ To build out of tree, add `O=/PATH/TO/BUILD/DIR` and continue in this directory ### WiFi To enable WiFi, add your WiFi's SSID and password to `/etc/wpa_supplicant.conf`: ``` -ctrl_interface=/var/run/wpa_supplicant ap_scan=1 network={