From 7d44d0327979ab3c4f94e2901f5f557a54ca4133 Mon Sep 17 00:00:00 2001 From: "Dustin C. Hatch" Date: Sat, 30 Aug 2025 15:36:07 -0500 Subject: [PATCH] Force built-in kernel support for filesystems the `KCONFIG_ENABLE_OPT` macro will not switch a `=m` value to `=y`, so if the downstream kernel configuration already enables these filesystems as modules, they will not get built into the kernel image, making the system unbootable. We need to call `KCONFIG_SET_OPT` instead to explicitly set them to be built-in. --- external.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/external.mk b/external.mk index 70028c7..6597e1e 100644 --- a/external.mk +++ b/external.mk @@ -10,14 +10,14 @@ SKELETON_INIT_SYSTEMD_ROOTFS_PRE_CMD_HOOKS = # Enable required kernel options for Aimee OS storage define AIMEEOS_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_BLK_DEV_INITRD) -$(call KCONFIG_ENABLE_OPT,CONFIG_BTRFS_FS) $(call KCONFIG_ENABLE_OPT,CONFIG_EFI) -$(call KCONFIG_ENABLE_OPT,CONFIG_MSDOS_FS) $(call KCONFIG_ENABLE_OPT,CONFIG_NLS_CODEPAGE_437) $(call KCONFIG_ENABLE_OPT,CONFIG_NLS_ISO8859_1) $(call KCONFIG_ENABLE_OPT,CONFIG_NLS_UTF8) -$(call KCONFIG_ENABLE_OPT,CONFIG_SQUASHFS) $(call KCONFIG_ENABLE_OPT,CONFIG_VFAT_FS) +$(call KCONFIG_SET_OPT,CONFIG_BTRFS_FS,y) +$(call KCONFIG_SET_OPT,CONFIG_SQUASHFS,y) +$(call KCONFIG_SET_OPT,CONFIG_MSDOS_FS,y) endef LINUX_KCONFIG_FIXUP_CMDS += $(AIMEEOS_LINUX_CONFIG_FIXUPS)