From dd2ad17869e01927d5ab98a231096ac7d59f5dc0 Mon Sep 17 00:00:00 2001
From: j1nx <p.steenbergen@j1nx.nl>
Date: Mon, 16 Dec 2024 15:59:10 +0000
Subject: [PATCH] More dracut work

---
 buildroot                                              | 2 +-
 buildroot-external/board/ovos/raspberrypi/grub-efi.cfg | 4 ++--
 buildroot-external/configs/rpi4_64_defconfig           | 8 ++++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/buildroot b/buildroot
index fb2de1fc..cb869be2 160000
--- a/buildroot
+++ b/buildroot
@@ -1 +1 @@
-Subproject commit fb2de1fc070863113f1e50d6588ed561b9faeb2e
+Subproject commit cb869be2b2c5788ebe6cea31d4d6b2718441e95c
diff --git a/buildroot-external/board/ovos/raspberrypi/grub-efi.cfg b/buildroot-external/board/ovos/raspberrypi/grub-efi.cfg
index 612491b8..f28fb3c1 100644
--- a/buildroot-external/board/ovos/raspberrypi/grub-efi.cfg
+++ b/buildroot-external/board/ovos/raspberrypi/grub-efi.cfg
@@ -73,11 +73,11 @@ regexp --set 1:boothd (.+),.+ ${root}
 save_env -f /EFI/BOOT/grub.env ustate boot_counter rootfs
 
 menuentry "OpenVoiceOS - Slot A ${rootfs_status_A}" {
-  linux (${boothd},gpt2)/boot/kernel root=PARTUUID=c0932a41-44cf-463b-8152-d43188553ed4 rootrw=PARTUUID=f1326040-5236-40eb-b683-aaa100a9afcf init=/init $default_cmdline $cmdline
+  linux (${boothd},gpt2)/boot/kernel root=UUID=c0932a41-44cf-463b-8152-d43188553ed4 rootrw=UUID=f1326040-5236-40eb-b683-aaa100a9afcf $default_cmdline $cmdline
 }
 
 menuentry "OpenVoiceOS - Slot B ${rootfs_status_B}" {
-  linux (${boothd},gpt3)/boot/kernel root=PARTUUID=3adea996-45ad-4928-920e-ffb5aedd00cb rootrw=PARTUUID=f1326040-5236-40eb-b683-aaa100a9afcf init=/init $default_cmdline $cmdline
+  linux (${boothd},gpt3)/boot/kernel root=UUID=3adea996-45ad-4928-920e-ffb5aedd00cb rootrw=UUID=f1326040-5236-40eb-b683-aaa100a9afcf $default_cmdline $cmdline
 }
 
 menuentry "OpenVoiceOS - Slot A (Rescue shell)" {
diff --git a/buildroot-external/configs/rpi4_64_defconfig b/buildroot-external/configs/rpi4_64_defconfig
index cf3b0357..6733e273 100644
--- a/buildroot-external/configs/rpi4_64_defconfig
+++ b/buildroot-external/configs/rpi4_64_defconfig
@@ -1,7 +1,11 @@
 BR2_aarch64=y
 BR2_cortex_a72=y
-BR2_TOOLCHAIN_EXTERNAL=y
-BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y
+BR2_BINUTILS_VERSION_2_41_X=y
+BR2_BINUTILS_GPROFNG=y
+BR2_GCC_VERSION_14_X=y
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_TOOLCHAIN_BUILDROOT_FORTRAN=y
 BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY=y
 BR2_WGET="wget --passive-ftp -nd -t 3"
 BR2_DL_DIR="../../downloads"