From f5afcc2c2ade59b479154a2e1dfe25e64bd8c0db Mon Sep 17 00:00:00 2001 From: j1nx Date: Sat, 28 Oct 2023 14:31:43 +0000 Subject: [PATCH] [ALL] Bump buildroot + podman/crun [RPI] Update configs for it. --- buildroot | 2 +- buildroot-external/board/ovos/raspberrypi/cmdline.txt | 2 +- buildroot-external/configs/rpi3_64_defconfig | 2 +- buildroot-external/configs/rpi4_64_defconfig | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/buildroot b/buildroot index fbd68508..297e5e4d 160000 --- a/buildroot +++ b/buildroot @@ -1 +1 @@ -Subproject commit fbd68508f33cdd950828933e8566a52bcc77ed9c +Subproject commit 297e5e4d50c9491cea6cbb0f5c0a6a8d6b6323a9 diff --git a/buildroot-external/board/ovos/raspberrypi/cmdline.txt b/buildroot-external/board/ovos/raspberrypi/cmdline.txt index 23483cb2..2d51b8e2 100644 --- a/buildroot-external/board/ovos/raspberrypi/cmdline.txt +++ b/buildroot-external/board/ovos/raspberrypi/cmdline.txt @@ -1 +1 @@ -dwc_otg.lpm_enable=0 acpi=off cgroup_enable=memory psi=1 usb-storage.quirks=174c:55aa:u,2109:0715:u,152d:0578:u,152d:0579:u,152d:1561:u,174c:0829:u,14b0:0206:u +snd_bcm2835.enable_headphones=1 snd_bcm2835.enable_hdmi=1 snd_bcm2835.enable_compat_alsa=0 dwc_otg.lpm_enable=0 acpi=off cgroup_enable=memory psi=1 usb-storage.quirks=174c:55aa:u,2109:0715:u,152d:0578:u,152d:0579:u,152d:1561:u,174c:0829:u,14b0:0206:u diff --git a/buildroot-external/configs/rpi3_64_defconfig b/buildroot-external/configs/rpi3_64_defconfig index 6ae717d7..b9794737 100644 --- a/buildroot-external/configs/rpi3_64_defconfig +++ b/buildroot-external/configs/rpi3_64_defconfig @@ -29,7 +29,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL)/board/ovos/raspberrypi/rpi3/post-i BR2_ROOTFS_POST_SCRIPT_ARGS="--rpi3" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,a319c6c1a5661af2014b98cd0a02526e7f2f515a)/linux-a319c6c1a5661af2014b98cd0a02526e7f2f515a.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,5a52cae54a05499a8487f392cf5dfc3d8a837e6f)/linux-5a52cae54a05499a8487f392cf5dfc3d8a837e6f.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL)/kernel/ovos.config $(BR2_EXTERNAL)/kernel/device-drivers.config $(BR2_EXTERNAL)/kernel/docker.config $(BR2_EXTERNAL)/board/ovos/raspberrypi/kernel.config" BR2_LINUX_KERNEL_LZ4=y diff --git a/buildroot-external/configs/rpi4_64_defconfig b/buildroot-external/configs/rpi4_64_defconfig index d3e9a9f0..c6e66e78 100644 --- a/buildroot-external/configs/rpi4_64_defconfig +++ b/buildroot-external/configs/rpi4_64_defconfig @@ -4,6 +4,7 @@ BR2_PACKAGE_GLIBC_UTILS=y BR2_BINUTILS_VERSION_2_39_X=y BR2_GCC_VERSION_12_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY=y BR2_DL_DIR="../../downloads" BR2_CCACHE=y BR2_CCACHE_DIR="ccache" @@ -29,7 +30,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL)/board/ovos/raspberrypi/rpi4/post-i BR2_ROOTFS_POST_SCRIPT_ARGS="--rpi4" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,a319c6c1a5661af2014b98cd0a02526e7f2f515a)/linux-a319c6c1a5661af2014b98cd0a02526e7f2f515a.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,5a52cae54a05499a8487f392cf5dfc3d8a837e6f)/linux-5a52cae54a05499a8487f392cf5dfc3d8a837e6f.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL)/kernel/ovos.config $(BR2_EXTERNAL)/kernel/device-drivers.config $(BR2_EXTERNAL)/kernel/docker.config $(BR2_EXTERNAL)/board/ovos/raspberrypi/kernel.config" BR2_LINUX_KERNEL_LZ4=y