From fefc9a138f4d4f26e6b676c4cdca77b3140e4206 Mon Sep 17 00:00:00 2001
From: "marcel.braun" <marcel.braun@ost.ch>
Date: Tue, 17 Feb 2026 17:41:10 +0100
Subject: Save WIP

---
 cmake/Modules/GenerateBootableIso.cmake | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'cmake/Modules/GenerateBootableIso.cmake')

diff --git a/cmake/Modules/GenerateBootableIso.cmake b/cmake/Modules/GenerateBootableIso.cmake
index 3d1ee30..abdc907 100644
--- a/cmake/Modules/GenerateBootableIso.cmake
+++ b/cmake/Modules/GenerateBootableIso.cmake
@@ -3,6 +3,13 @@ include_guard(GLOBAL)
 function(target_generate_bootable_iso TARGET)
     find_package("grub-mkrescue")
 
+    # set(MODULE_SRC 
+    #     "${PROJECT_SOURCE_DIR}/arch/${CMAKE_SYSTEM_PROCESSOR}/support/test.img"
+    # )
+    # set(MODULE_DST
+    #     "$<TARGET_FILE_DIR:${TARGET}>/isofs/test.img"
+    # )
+
     file(GENERATE
         OUTPUT "$<TARGET_FILE_DIR:${TARGET}>/isofs/boot/grub/grub.cfg"
         INPUT "${PROJECT_SOURCE_DIR}/arch/${CMAKE_SYSTEM_PROCESSOR}/support/grub.cfg.in"
@@ -10,6 +17,10 @@ function(target_generate_bootable_iso TARGET)
 
     add_custom_command(TARGET "${TARGET}"
         POST_BUILD
+        # COMMAND "${CMAKE_COMMAND}" -E make_directory "$<TARGET_FILE_DIR:${TARGET}>/isofs"
+        # COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${MODULE_SRC}" "${MODULE_DST}"
+        COMMAND "${CMAKE_COMMAND}" -E make_directory "$<TARGET_FILE_DIR:${TARGET}>/isofs"
+        COMMAND "${CMAKE_COMMAND}" -E copy_directory "${PROJECT_SOURCE_DIR}/arch/${CMAKE_SYSTEM_PROCESSOR}/support/modules" "$<TARGET_FILE_DIR:${TARGET}>/isofs/modules"
         COMMAND "${GRUB_MKRESCUE_EXE}"
         "-o"
         "$<TARGET_FILE_DIR:${TARGET}>/${TARGET}.iso"
@@ -19,4 +30,5 @@ function(target_generate_bootable_iso TARGET)
         BYPRODUCTS "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$<CONFIGURATION>/${TARGET}.iso"
         COMMENT "Creating bootable ISO image"
     )
+    
 endfunction()
-- 
cgit v1.2.3


From bbbf8c9032a54da4115d57d2897f8bb0a698895b Mon Sep 17 00:00:00 2001
From: "marcel.braun" <marcel.braun@ost.ch>
Date: Tue, 17 Feb 2026 18:41:25 +0100
Subject: Copy modules to isofs folder

---
 cmake/Modules/GenerateBootableIso.cmake | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'cmake/Modules/GenerateBootableIso.cmake')

diff --git a/cmake/Modules/GenerateBootableIso.cmake b/cmake/Modules/GenerateBootableIso.cmake
index abdc907..b798787 100644
--- a/cmake/Modules/GenerateBootableIso.cmake
+++ b/cmake/Modules/GenerateBootableIso.cmake
@@ -3,13 +3,6 @@ include_guard(GLOBAL)
 function(target_generate_bootable_iso TARGET)
     find_package("grub-mkrescue")
 
-    # set(MODULE_SRC 
-    #     "${PROJECT_SOURCE_DIR}/arch/${CMAKE_SYSTEM_PROCESSOR}/support/test.img"
-    # )
-    # set(MODULE_DST
-    #     "$<TARGET_FILE_DIR:${TARGET}>/isofs/test.img"
-    # )
-
     file(GENERATE
         OUTPUT "$<TARGET_FILE_DIR:${TARGET}>/isofs/boot/grub/grub.cfg"
         INPUT "${PROJECT_SOURCE_DIR}/arch/${CMAKE_SYSTEM_PROCESSOR}/support/grub.cfg.in"
@@ -17,8 +10,6 @@ function(target_generate_bootable_iso TARGET)
 
     add_custom_command(TARGET "${TARGET}"
         POST_BUILD
-        # COMMAND "${CMAKE_COMMAND}" -E make_directory "$<TARGET_FILE_DIR:${TARGET}>/isofs"
-        # COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${MODULE_SRC}" "${MODULE_DST}"
         COMMAND "${CMAKE_COMMAND}" -E make_directory "$<TARGET_FILE_DIR:${TARGET}>/isofs"
         COMMAND "${CMAKE_COMMAND}" -E copy_directory "${PROJECT_SOURCE_DIR}/arch/${CMAKE_SYSTEM_PROCESSOR}/support/modules" "$<TARGET_FILE_DIR:${TARGET}>/isofs/modules"
         COMMAND "${GRUB_MKRESCUE_EXE}"
-- 
cgit v1.2.3


From 9330cc6345e0eed83e16f8af5aae54484c059177 Mon Sep 17 00:00:00 2001
From: Lukas Oesch <lukasoesch20@gmail.com>
Date: Wed, 8 Apr 2026 09:42:01 +0200
Subject: fix build when modules folder is missing

---
 cmake/Modules/GenerateBootableIso.cmake | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'cmake/Modules/GenerateBootableIso.cmake')

diff --git a/cmake/Modules/GenerateBootableIso.cmake b/cmake/Modules/GenerateBootableIso.cmake
index b798787..39a0ebd 100644
--- a/cmake/Modules/GenerateBootableIso.cmake
+++ b/cmake/Modules/GenerateBootableIso.cmake
@@ -3,6 +3,14 @@ include_guard(GLOBAL)
 function(target_generate_bootable_iso TARGET)
     find_package("grub-mkrescue")
 
+    set(MODULES_DIR "${PROJECT_SOURCE_DIR}/arch/${CMAKE_SYSTEM_PROCESSOR}/support/modules")
+    set(COPY_MODULES_COMMAND)
+    if(EXISTS "${MODULES_DIR}")
+        set(COPY_MODULES_COMMAND
+            COMMAND "${CMAKE_COMMAND}" -E copy_directory "${MODULES_DIR}" "$<TARGET_FILE_DIR:${TARGET}>/isofs/modules"
+        )
+    endif()
+
     file(GENERATE
         OUTPUT "$<TARGET_FILE_DIR:${TARGET}>/isofs/boot/grub/grub.cfg"
         INPUT "${PROJECT_SOURCE_DIR}/arch/${CMAKE_SYSTEM_PROCESSOR}/support/grub.cfg.in"
@@ -11,7 +19,7 @@ function(target_generate_bootable_iso TARGET)
     add_custom_command(TARGET "${TARGET}"
         POST_BUILD
         COMMAND "${CMAKE_COMMAND}" -E make_directory "$<TARGET_FILE_DIR:${TARGET}>/isofs"
-        COMMAND "${CMAKE_COMMAND}" -E copy_directory "${PROJECT_SOURCE_DIR}/arch/${CMAKE_SYSTEM_PROCESSOR}/support/modules" "$<TARGET_FILE_DIR:${TARGET}>/isofs/modules"
+        ${COPY_MODULES_COMMAND}
         COMMAND "${GRUB_MKRESCUE_EXE}"
         "-o"
         "$<TARGET_FILE_DIR:${TARGET}>/${TARGET}.iso"
-- 
cgit v1.2.3