FAT32

2026-04-24 19:34:01 +00:00 · 2026-04-24 19:24:04 +08:00
parent 89cf6b030c
commit 78fdc87366
11 changed files with 1572 additions and 1105 deletions
--- a/140
+++ b/140
@@ -20,6 +20,19 @@ MENUCONFIG_ARGS ?=
 MENUCONFIG_PRESET ?=
 DISK_IMAGE_MB ?=
 CLEONOS_ENABLE ?= auto
+QEMU_DRIVE_IMAGE ?= build/x86_64/cleonos_disk.img
+SHOW_COMMANDS ?= 0
+V ?= 0
+
+ifneq ($(filter 1 ON on TRUE true YES yes Y y,$(SHOW_COMMANDS) $(V)),)
+Q :=
+CMAKE_BUILD_VERBOSE_ARG := --verbose
+CMAKE_CONFIG_VERBOSE_ARG := -DCMAKE_VERBOSE_MAKEFILE=ON
+else
+Q := @
+CMAKE_BUILD_VERBOSE_ARG :=
+CMAKE_CONFIG_VERBOSE_ARG :=
+endif

 ifeq ($(strip $(CMAKE_GENERATOR)),)
 GEN_ARG :=
@@ -84,7 +97,7 @@ ifneq ($(strip $(DISK_IMAGE_MB)),)
 CMAKE_PASSTHROUGH_ARGS += -DCLEONOS_DISK_IMAGE_MB=$(DISK_IMAGE_MB)
 endif

-.PHONY: all configure reconfigure menuconfig menuconfig-gui menuconfig-clks menuconfig-gui-clks setup setup-tools setup-limine kernel userapps ramdisk-root ramdisk disk-image iso run debug clean clean-all help
+.PHONY: all configure reconfigure menuconfig menuconfig-gui menuconfig-clks menuconfig-gui-clks setup setup-tools setup-limine kernel userapps ramdisk-root ramdisk disk-image iso run debug clean-drive-image clean clean-all help

 ifeq ($(CLEONOS_ENABLED_BOOL),1)
 all: iso
@@ -93,14 +106,14 @@ all: kernel
 endif

 configure:
-> @$(CMAKE) -S . -B $(CMAKE_BUILD_DIR) $(GEN_ARG) -DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) -DNO_COLOR=$(NO_COLOR) $(CMAKE_EXTRA_ARGS) $(CMAKE_PASSTHROUGH_ARGS)
+> $(Q)$(CMAKE) -S . -B $(CMAKE_BUILD_DIR) $(GEN_ARG) -DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) -DNO_COLOR=$(NO_COLOR) $(CMAKE_CONFIG_VERBOSE_ARG) $(CMAKE_EXTRA_ARGS) $(CMAKE_PASSTHROUGH_ARGS)

 reconfigure:
-> @rm -rf $(CMAKE_BUILD_DIR)
-> @$(MAKE) configure CMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) CMAKE_GENERATOR="$(CMAKE_GENERATOR)" CMAKE_EXTRA_ARGS="$(CMAKE_EXTRA_ARGS)" NO_COLOR="$(NO_COLOR)" LIMINE_SKIP_CONFIGURE="$(LIMINE_SKIP_CONFIGURE)" LIMINE_REF="$(LIMINE_REF)" LIMINE_REPO="$(LIMINE_REPO)" LIMINE_DIR="$(LIMINE_DIR)" LIMINE_BIN_DIR="$(LIMINE_BIN_DIR)" OBJCOPY_FOR_TARGET="$(OBJCOPY_FOR_TARGET)" OBJDUMP_FOR_TARGET="$(OBJDUMP_FOR_TARGET)" READELF_FOR_TARGET="$(READELF_FOR_TARGET)" CLEONOS_ENABLE="$(CLEONOS_ENABLE)"
+> $(Q)rm -rf $(CMAKE_BUILD_DIR)
+> $(Q)$(MAKE) configure CMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) CMAKE_GENERATOR="$(CMAKE_GENERATOR)" CMAKE_EXTRA_ARGS="$(CMAKE_EXTRA_ARGS)" NO_COLOR="$(NO_COLOR)" LIMINE_SKIP_CONFIGURE="$(LIMINE_SKIP_CONFIGURE)" LIMINE_REF="$(LIMINE_REF)" LIMINE_REPO="$(LIMINE_REPO)" LIMINE_DIR="$(LIMINE_DIR)" LIMINE_BIN_DIR="$(LIMINE_BIN_DIR)" OBJCOPY_FOR_TARGET="$(OBJCOPY_FOR_TARGET)" OBJDUMP_FOR_TARGET="$(OBJDUMP_FOR_TARGET)" READELF_FOR_TARGET="$(READELF_FOR_TARGET)" CLEONOS_ENABLE="$(CLEONOS_ENABLE)"

 menuconfig:
-> @if command -v $(PYTHON) >/dev/null 2>&1; then \
+> $(Q)if command -v $(PYTHON) >/dev/null 2>&1; then \
 >     $(PYTHON) scripts/menuconfig.py $(MENUCONFIG_SCOPE_ARG) $(MENUCONFIG_PRESET_ARG) $(MENUCONFIG_ARGS); \
 > elif command -v python >/dev/null 2>&1; then \
 >     python scripts/menuconfig.py $(MENUCONFIG_SCOPE_ARG) $(MENUCONFIG_PRESET_ARG) $(MENUCONFIG_ARGS); \
@@ -108,10 +121,10 @@ menuconfig:
 >     echo "python3/python not found"; \
 >     exit 1; \
 > fi
-> @$(MAKE) configure CMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) CMAKE_GENERATOR="$(CMAKE_GENERATOR)" CMAKE_EXTRA_ARGS="$(CMAKE_EXTRA_ARGS)" NO_COLOR="$(NO_COLOR)" LIMINE_SKIP_CONFIGURE="$(LIMINE_SKIP_CONFIGURE)" LIMINE_REF="$(LIMINE_REF)" LIMINE_REPO="$(LIMINE_REPO)" LIMINE_DIR="$(LIMINE_DIR)" LIMINE_BIN_DIR="$(LIMINE_BIN_DIR)" OBJCOPY_FOR_TARGET="$(OBJCOPY_FOR_TARGET)" OBJDUMP_FOR_TARGET="$(OBJDUMP_FOR_TARGET)" READELF_FOR_TARGET="$(READELF_FOR_TARGET)" CLEONOS_ENABLE="$(CLEONOS_ENABLE)"
+> $(Q)$(MAKE) configure CMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) CMAKE_GENERATOR="$(CMAKE_GENERATOR)" CMAKE_EXTRA_ARGS="$(CMAKE_EXTRA_ARGS)" NO_COLOR="$(NO_COLOR)" LIMINE_SKIP_CONFIGURE="$(LIMINE_SKIP_CONFIGURE)" LIMINE_REF="$(LIMINE_REF)" LIMINE_REPO="$(LIMINE_REPO)" LIMINE_DIR="$(LIMINE_DIR)" LIMINE_BIN_DIR="$(LIMINE_BIN_DIR)" OBJCOPY_FOR_TARGET="$(OBJCOPY_FOR_TARGET)" OBJDUMP_FOR_TARGET="$(OBJDUMP_FOR_TARGET)" READELF_FOR_TARGET="$(READELF_FOR_TARGET)" CLEONOS_ENABLE="$(CLEONOS_ENABLE)"

 menuconfig-gui:
-> @if command -v $(PYTHON) >/dev/null 2>&1; then \
+> $(Q)if command -v $(PYTHON) >/dev/null 2>&1; then \
 >     $(PYTHON) scripts/menuconfig.py --gui $(MENUCONFIG_SCOPE_ARG) $(MENUCONFIG_PRESET_ARG) $(MENUCONFIG_ARGS); \
 > elif command -v python >/dev/null 2>&1; then \
 >     python scripts/menuconfig.py --gui $(MENUCONFIG_SCOPE_ARG) $(MENUCONFIG_PRESET_ARG) $(MENUCONFIG_ARGS); \
@@ -119,10 +132,10 @@ menuconfig-gui:
 >     echo "python3/python not found"; \
 >     exit 1; \
 > fi
-> @$(MAKE) configure CMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) CMAKE_GENERATOR="$(CMAKE_GENERATOR)" CMAKE_EXTRA_ARGS="$(CMAKE_EXTRA_ARGS)" NO_COLOR="$(NO_COLOR)" LIMINE_SKIP_CONFIGURE="$(LIMINE_SKIP_CONFIGURE)" LIMINE_REF="$(LIMINE_REF)" LIMINE_REPO="$(LIMINE_REPO)" LIMINE_DIR="$(LIMINE_DIR)" LIMINE_BIN_DIR="$(LIMINE_BIN_DIR)" OBJCOPY_FOR_TARGET="$(OBJCOPY_FOR_TARGET)" OBJDUMP_FOR_TARGET="$(OBJDUMP_FOR_TARGET)" READELF_FOR_TARGET="$(READELF_FOR_TARGET)" CLEONOS_ENABLE="$(CLEONOS_ENABLE)"
+> $(Q)$(MAKE) configure CMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) CMAKE_GENERATOR="$(CMAKE_GENERATOR)" CMAKE_EXTRA_ARGS="$(CMAKE_EXTRA_ARGS)" NO_COLOR="$(NO_COLOR)" LIMINE_SKIP_CONFIGURE="$(LIMINE_SKIP_CONFIGURE)" LIMINE_REF="$(LIMINE_REF)" LIMINE_REPO="$(LIMINE_REPO)" LIMINE_DIR="$(LIMINE_DIR)" LIMINE_BIN_DIR="$(LIMINE_BIN_DIR)" OBJCOPY_FOR_TARGET="$(OBJCOPY_FOR_TARGET)" OBJDUMP_FOR_TARGET="$(OBJDUMP_FOR_TARGET)" READELF_FOR_TARGET="$(READELF_FOR_TARGET)" CLEONOS_ENABLE="$(CLEONOS_ENABLE)"

 menuconfig-clks:
-> @if command -v $(PYTHON) >/dev/null 2>&1; then \
+> $(Q)if command -v $(PYTHON) >/dev/null 2>&1; then \
 >     $(PYTHON) scripts/menuconfig.py --clks-only $(MENUCONFIG_PRESET_ARG) $(MENUCONFIG_ARGS); \
 > elif command -v python >/dev/null 2>&1; then \
 >     python scripts/menuconfig.py --clks-only $(MENUCONFIG_PRESET_ARG) $(MENUCONFIG_ARGS); \
@@ -130,10 +143,10 @@ menuconfig-clks:
 >     echo "python3/python not found"; \
 >     exit 1; \
 > fi
-> @$(MAKE) configure CMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) CMAKE_GENERATOR="$(CMAKE_GENERATOR)" CMAKE_EXTRA_ARGS="$(CMAKE_EXTRA_ARGS)" NO_COLOR="$(NO_COLOR)" LIMINE_SKIP_CONFIGURE="$(LIMINE_SKIP_CONFIGURE)" LIMINE_REF="$(LIMINE_REF)" LIMINE_REPO="$(LIMINE_REPO)" LIMINE_DIR="$(LIMINE_DIR)" LIMINE_BIN_DIR="$(LIMINE_BIN_DIR)" OBJCOPY_FOR_TARGET="$(OBJCOPY_FOR_TARGET)" OBJDUMP_FOR_TARGET="$(OBJDUMP_FOR_TARGET)" READELF_FOR_TARGET="$(READELF_FOR_TARGET)" CLEONOS_ENABLE="$(CLEONOS_ENABLE)"
+> $(Q)$(MAKE) configure CMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) CMAKE_GENERATOR="$(CMAKE_GENERATOR)" CMAKE_EXTRA_ARGS="$(CMAKE_EXTRA_ARGS)" NO_COLOR="$(NO_COLOR)" LIMINE_SKIP_CONFIGURE="$(LIMINE_SKIP_CONFIGURE)" LIMINE_REF="$(LIMINE_REF)" LIMINE_REPO="$(LIMINE_REPO)" LIMINE_DIR="$(LIMINE_DIR)" LIMINE_BIN_DIR="$(LIMINE_BIN_DIR)" OBJCOPY_FOR_TARGET="$(OBJCOPY_FOR_TARGET)" OBJDUMP_FOR_TARGET="$(OBJDUMP_FOR_TARGET)" READELF_FOR_TARGET="$(READELF_FOR_TARGET)" CLEONOS_ENABLE="$(CLEONOS_ENABLE)"

 menuconfig-gui-clks:
-> @if command -v $(PYTHON) >/dev/null 2>&1; then \
+> $(Q)if command -v $(PYTHON) >/dev/null 2>&1; then \
 >     $(PYTHON) scripts/menuconfig.py --gui --clks-only $(MENUCONFIG_PRESET_ARG) $(MENUCONFIG_ARGS); \
 > elif command -v python >/dev/null 2>&1; then \
 >     python scripts/menuconfig.py --gui --clks-only $(MENUCONFIG_PRESET_ARG) $(MENUCONFIG_ARGS); \
@@ -141,88 +154,99 @@ menuconfig-gui-clks:
 >     echo "python3/python not found"; \
 >     exit 1; \
 > fi
-> @$(MAKE) configure CMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) CMAKE_GENERATOR="$(CMAKE_GENERATOR)" CMAKE_EXTRA_ARGS="$(CMAKE_EXTRA_ARGS)" NO_COLOR="$(NO_COLOR)" LIMINE_SKIP_CONFIGURE="$(LIMINE_SKIP_CONFIGURE)" LIMINE_REF="$(LIMINE_REF)" LIMINE_REPO="$(LIMINE_REPO)" LIMINE_DIR="$(LIMINE_DIR)" LIMINE_BIN_DIR="$(LIMINE_BIN_DIR)" OBJCOPY_FOR_TARGET="$(OBJCOPY_FOR_TARGET)" OBJDUMP_FOR_TARGET="$(OBJDUMP_FOR_TARGET)" READELF_FOR_TARGET="$(READELF_FOR_TARGET)" CLEONOS_ENABLE="$(CLEONOS_ENABLE)"
+> $(Q)$(MAKE) configure CMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) CMAKE_GENERATOR="$(CMAKE_GENERATOR)" CMAKE_EXTRA_ARGS="$(CMAKE_EXTRA_ARGS)" NO_COLOR="$(NO_COLOR)" LIMINE_SKIP_CONFIGURE="$(LIMINE_SKIP_CONFIGURE)" LIMINE_REF="$(LIMINE_REF)" LIMINE_REPO="$(LIMINE_REPO)" LIMINE_DIR="$(LIMINE_DIR)" LIMINE_BIN_DIR="$(LIMINE_BIN_DIR)" OBJCOPY_FOR_TARGET="$(OBJCOPY_FOR_TARGET)" OBJDUMP_FOR_TARGET="$(OBJDUMP_FOR_TARGET)" READELF_FOR_TARGET="$(READELF_FOR_TARGET)" CLEONOS_ENABLE="$(CLEONOS_ENABLE)"

 setup: configure
-> @$(CMAKE) --build $(CMAKE_BUILD_DIR) --target setup
+> $(Q)$(CMAKE) --build $(CMAKE_BUILD_DIR) --target setup $(CMAKE_BUILD_VERBOSE_ARG)

 setup-tools: configure
-> @$(CMAKE) --build $(CMAKE_BUILD_DIR) --target setup-tools
+> $(Q)$(CMAKE) --build $(CMAKE_BUILD_DIR) --target setup-tools $(CMAKE_BUILD_VERBOSE_ARG)

 setup-limine: configure
-> @$(CMAKE) --build $(CMAKE_BUILD_DIR) --target setup-limine
+> $(Q)$(CMAKE) --build $(CMAKE_BUILD_DIR) --target setup-limine $(CMAKE_BUILD_VERBOSE_ARG)

 kernel: configure
-> @$(CMAKE) --build $(CMAKE_BUILD_DIR) --target kernel
+> $(Q)$(CMAKE) --build $(CMAKE_BUILD_DIR) --target kernel $(CMAKE_BUILD_VERBOSE_ARG)

 ifeq ($(CLEONOS_ENABLED_BOOL),1)
 userapps: configure
-> @$(CMAKE) --build $(CMAKE_BUILD_DIR) --target userapps
+> $(Q)$(CMAKE) --build $(CMAKE_BUILD_DIR) --target userapps $(CMAKE_BUILD_VERBOSE_ARG)

 ramdisk-root: configure
-> @$(CMAKE) --build $(CMAKE_BUILD_DIR) --target ramdisk-root
+> $(Q)$(CMAKE) --build $(CMAKE_BUILD_DIR) --target ramdisk-root $(CMAKE_BUILD_VERBOSE_ARG)

 ramdisk: configure
-> @$(CMAKE) --build $(CMAKE_BUILD_DIR) --target ramdisk
+> $(Q)$(CMAKE) --build $(CMAKE_BUILD_DIR) --target ramdisk $(CMAKE_BUILD_VERBOSE_ARG)

 disk-image: configure
-> @$(CMAKE) --build $(CMAKE_BUILD_DIR) --target disk-image
+> $(Q)$(CMAKE) --build $(CMAKE_BUILD_DIR) --target disk-image $(CMAKE_BUILD_VERBOSE_ARG)

 iso: configure
-> @$(CMAKE) --build $(CMAKE_BUILD_DIR) --target iso
+> $(Q)$(CMAKE) --build $(CMAKE_BUILD_DIR) --target iso $(CMAKE_BUILD_VERBOSE_ARG)

 run: configure
-> @$(CMAKE) --build $(CMAKE_BUILD_DIR) --target run
+> $(Q)$(CMAKE) --build $(CMAKE_BUILD_DIR) --target run $(CMAKE_BUILD_VERBOSE_ARG)

 debug: configure
-> @$(CMAKE) --build $(CMAKE_BUILD_DIR) --target debug
+> $(Q)$(CMAKE) --build $(CMAKE_BUILD_DIR) --target debug $(CMAKE_BUILD_VERBOSE_ARG)
 else
 userapps ramdisk-root ramdisk disk-image iso run debug:
-> @echo "target '$@' requires CLEONOS_ENABLE=ON and cleonos sources present"
-> @exit 1
+> $(Q)echo "target '$@' requires CLEONOS_ENABLE=ON and cleonos sources present"
+> $(Q)exit 1
 endif

 clean:
-> @if [ -d "$(CMAKE_BUILD_DIR)" ]; then \
->     $(CMAKE) --build $(CMAKE_BUILD_DIR) --target clean-x86; \
+> $(Q)if [ -d "$(CMAKE_BUILD_DIR)" ]; then \
+>     $(CMAKE) --build $(CMAKE_BUILD_DIR) --target clean-x86 $(CMAKE_BUILD_VERBOSE_ARG); \
 > else \
 >     rm -rf build/x86_64; \
 > fi
+> $(Q)$(MAKE) clean-drive-image QEMU_DRIVE_IMAGE="$(QEMU_DRIVE_IMAGE)"

 clean-all:
-> @if [ -d "$(CMAKE_BUILD_DIR)" ]; then \
->     $(CMAKE) --build $(CMAKE_BUILD_DIR) --target clean-all; \
+> $(Q)if [ -d "$(CMAKE_BUILD_DIR)" ]; then \
+>     $(CMAKE) --build $(CMAKE_BUILD_DIR) --target clean-all $(CMAKE_BUILD_VERBOSE_ARG); \
 > else \
 >     rm -rf build build-cmake; \
 > fi
+> $(Q)$(MAKE) clean-drive-image QEMU_DRIVE_IMAGE="$(QEMU_DRIVE_IMAGE)"
+
+clean-drive-image:
+> $(Q)rm -f "$(QEMU_DRIVE_IMAGE)"

 help:
-> @echo "CLeonOS (CMake-backed wrapper)"
-> @echo "Mode: CLEONOS_ENABLE=$(CLEONOS_ENABLE_EFFECTIVE) ($(CLEONOS_MODE_LABEL))"
-> @echo "  make configure"
-> @echo "  make menuconfig"
-> @echo "  make menuconfig-gui"
-> @echo "  make menuconfig-clks"
-> @echo "  make menuconfig-gui-clks"
-> @echo "  make setup"
-> @echo "  make userapps"
-> @echo "  make disk-image"
-> @echo "  make iso"
-> @echo "  make run"
-> @echo "  make debug"
-> @echo "  make clean"
-> @echo "  make clean-all"
-> @echo ""
-> @echo "Pass custom CMake cache args via:"
-> @echo "  make configure CMAKE_EXTRA_ARGS='-DLIMINE_SKIP_CONFIGURE=1 -DOBJCOPY_FOR_TARGET=objcopy'"
-> @echo "Direct passthrough is also supported:"
-> @echo "  make run LIMINE_SKIP_CONFIGURE=1"
-> @echo "Kernel-only mode:"
-> @echo "  make kernel CLEONOS_ENABLE=OFF"
-> @echo "  make -C clks kernel"
-> @echo "Disk image size example:"
-> @echo "  make run DISK_IMAGE_MB=128"
-> @echo "Preset examples:"
-> @echo "  make menuconfig MENUCONFIG_PRESET=full"
-> @echo "  make menuconfig MENUCONFIG_PRESET=minimal"
-> @echo "  make menuconfig-gui MENUCONFIG_PRESET=dev"
+> $(Q)echo "CLeonOS (CMake-backed wrapper)"
+> $(Q)echo "Mode: CLEONOS_ENABLE=$(CLEONOS_ENABLE_EFFECTIVE) ($(CLEONOS_MODE_LABEL))"
+> $(Q)echo "  make configure"
+> $(Q)echo "  make menuconfig"
+> $(Q)echo "  make menuconfig-gui"
+> $(Q)echo "  make menuconfig-clks"
+> $(Q)echo "  make menuconfig-gui-clks"
+> $(Q)echo "  make setup"
+> $(Q)echo "  make userapps"
+> $(Q)echo "  make disk-image"
+> $(Q)echo "  make iso"
+> $(Q)echo "  make run"
+> $(Q)echo "  make debug"
+> $(Q)echo "  make clean-drive-image"
+> $(Q)echo "  make clean"
+> $(Q)echo "  make clean-all"
+> $(Q)echo ""
+> $(Q)echo "Show commands:"
+> $(Q)echo "  make run V=1"
+> $(Q)echo "  make run SHOW_COMMANDS=1"
+> $(Q)echo "  (includes CMake build internals: compiler/linker command lines)"
+> $(Q)echo ""
+> $(Q)echo "Pass custom CMake cache args via:"
+> $(Q)echo "  make configure CMAKE_EXTRA_ARGS='-DLIMINE_SKIP_CONFIGURE=1 -DOBJCOPY_FOR_TARGET=objcopy'"
+> $(Q)echo "Direct passthrough is also supported:"
+> $(Q)echo "  make run LIMINE_SKIP_CONFIGURE=1"
+> $(Q)echo "Kernel-only mode:"
+> $(Q)echo "  make kernel CLEONOS_ENABLE=OFF"
+> $(Q)echo "  make -C clks kernel"
+> $(Q)echo "Disk image size example:"
+> $(Q)echo "  make run DISK_IMAGE_MB=128"
+> $(Q)echo "Preset examples:"
+> $(Q)echo "  make menuconfig MENUCONFIG_PRESET=full"
+> $(Q)echo "  make menuconfig MENUCONFIG_PRESET=minimal"
+> $(Q)echo "  make menuconfig-gui MENUCONFIG_PRESET=dev"