From d879a37cb3bcea915d33f300fc3fc0241db18882 Mon Sep 17 00:00:00 2001 From: Max Wash Date: Sat, 30 May 2026 10:14:38 +0100 Subject: [PATCH] cmake: update kernel name references --- CMakeLists.txt | 2 +- arch/x86_64/Platform/Rosetta.cmake | 2 +- arch/x86_64/test/check-results | 2 +- services/herdd/CMakeLists.txt | 2 +- sys/bootstrap/CMakeLists.txt | 2 +- sys/ld/CMakeLists.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 44dbe87..4839249 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ check_pie_supported() set(sys_dir ${CMAKE_CURRENT_BINARY_DIR}/sys) -set(kernel_name mango_kernel) +set(kernel_name magenta_kernel) set(bsp_name rosetta-system.bsp) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) diff --git a/arch/x86_64/Platform/Rosetta.cmake b/arch/x86_64/Platform/Rosetta.cmake index 5da06bb..9b405ee 100644 --- a/arch/x86_64/Platform/Rosetta.cmake +++ b/arch/x86_64/Platform/Rosetta.cmake @@ -7,7 +7,7 @@ find_program(C_COMPILER x86_64-elf-gcc REQUIRED) find_program(CXX_COMPILER x86_64-elf-g++ REQUIRED) #find_program(ASM_COMPILER x86_64-elf-as REQUIRED) -add_compile_definitions(__mango__=1 __rosetta__=1) +add_compile_definitions(__magenta__=1 __rosetta__=1) set(CMAKE_C_COMPILER ${C_COMPILER}) set(CMAKE_CXX_COMPILER ${CXX_COMPILER}) diff --git a/arch/x86_64/test/check-results b/arch/x86_64/test/check-results index c7c6c35..ef7bd74 100644 --- a/arch/x86_64/test/check-results +++ b/arch/x86_64/test/check-results @@ -16,7 +16,7 @@ def successful_boot(boot_log, out): log(out, "Multiple kernel panics!") return 1 - nr_boots = boot_log.count('Mango kernel version') + nr_boots = boot_log.count('Magenta kernel version') if nr_boots == 0: log(out, "Kernel didn't start!") return 1 diff --git a/services/herdd/CMakeLists.txt b/services/herdd/CMakeLists.txt index 796eba1..69783b9 100644 --- a/services/herdd/CMakeLists.txt +++ b/services/herdd/CMakeLists.txt @@ -2,7 +2,7 @@ file(GLOB sources *.c) add_executable(herdd ${sources}) target_link_libraries(herdd libc libc-runtime - libmango libpthread liblaunch librosetta + libmagenta libpthread liblaunch librosetta fx-core fx-ds fx-serial) sysroot_add_program( diff --git a/sys/bootstrap/CMakeLists.txt b/sys/bootstrap/CMakeLists.txt index 2d15511..bc302fc 100644 --- a/sys/bootstrap/CMakeLists.txt +++ b/sys/bootstrap/CMakeLists.txt @@ -4,7 +4,7 @@ file(GLOB arch_sources arch/${CMAKE_SYSTEM_PROCESSOR}/*.S) add_executable(bootstrap ${c_sources} ${arch_sources}) target_link_libraries(bootstrap - libmango librosetta + libmagenta librosetta libc-core libc-malloc libc-pthread libfs-static liblaunch-static diff --git a/sys/ld/CMakeLists.txt b/sys/ld/CMakeLists.txt index 9ba1f6e..1f80616 100644 --- a/sys/ld/CMakeLists.txt +++ b/sys/ld/CMakeLists.txt @@ -8,7 +8,7 @@ set_target_properties(ld PROPERTIES SUFFIX ".so") target_link_libraries(ld - libc-core libc-malloc libc-io libmango librosetta libxpc-static + libc-core libc-malloc libc-io libmagenta librosetta libxpc-static interface::fs) target_compile_options(ld PRIVATE