Fixed Missing Kernel Artifact

Author: PythonPlumber

.github/workflows/cmake.yml

@@ -26,28 +26,35 @@ jobs:
             libgcc-s1-i386-cross \
             wget
 
+      - name: Cache AI Model
+        id: cache-model
+        uses: actions/cache@v4
+        with:
+          path: assets/smollm2.gguf
+          key: ${{ runner.os }}-model-smollm2
+
       - name: Download AI Model Asset
+        if: steps.cache-model.outputs.cache-hit != 'true'
         run: |
           mkdir -p assets
-          if [ ! -f assets/smollm2.gguf ]; then
-            wget -O assets/smollm2.gguf https://huggingface.co/bartowski/SmolLM2-135M-Instruct-GGUF/resolve/main/SmolLM2-135M-Instruct-Q4_K_M.gguf
-          fi
+          wget -O assets/smollm2.gguf https://huggingface.co/bartowski/SmolLM2-135M-Instruct-GGUF/resolve/main/SmolLM2-135M-Instruct-Q4_K_M.gguf
+
+      - name: Configure CMake
+        run: |
+          cmake -B build \
+            -DCMAKE_C_COMPILER=i686-linux-gnu-gcc \
+            -DCMAKE_ASM_NASM_COMPILER=nasm \
+            -DCMAKE_BUILD_TYPE=Release
 
       - name: Build BasicallyLinux
         run: |
-          mkdir -p bin
-          mkdir -p build
-          # We use GCC as the linker wrapper to automatically locate libgcc.a
-          # This solves the __udivdi3 and __divdi3 errors
-          make CC=i686-linux-gnu-gcc \
-               LD=i686-linux-gnu-gcc \
-               AS=nasm
+          cmake --build build
 
       - name: Archive Artifacts
         if: success()
         uses: actions/upload-artifact@v4
         with:
           name: basicallylinux-alpha
           path: |
-            kernel.bin
+            build/kernel.bin
             assets/smollm2.gguf

CMakeLists.txt

@@ -0,0 +1,84 @@
+cmake_minimum_required(VERSION 3.16)
+project(BasicallyLinux C ASM_NASM)
+
+# Enable NASM support
+enable_language(ASM_NASM)
+
+# Toolchain configuration (can be overridden by command line)
+set(CMAKE_C_COMPILER i686-linux-gnu-gcc)
+set(CMAKE_ASM_NASM_COMPILER nasm)
+
+# Compilation flags
+add_compile_options(
+    -ffreestanding
+    -O2
+    -Wall
+    -Wextra
+    -m32
+    -fno-pie
+    -fno-PIC
+    -fno-stack-protector
+    -nostdlib
+    -nostdinc
+    -msse
+    -msse2
+)
+
+include_directories(include)
+
+# Source discovery
+file(GLOB_RECURSE ASM_SOURCES "src/*.s")
+file(GLOB_RECURSE C_SOURCES "src/*.c")
+
+# Exclude specific files if needed
+list(FILTER C_SOURCES EXCLUDE REGEX "src/drivers/vga.c")
+
+# Handle AI Model Blob
+set(ASSETS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/assets")
+set(MODEL_BLOB "")
+
+# Check for model candidates
+set(CANDIDATES
+    "${ASSETS_DIR}/smollm2.gguf"
+    "${ASSETS_DIR}/smollm-135m.gguf"
+    "${ASSETS_DIR}/SmolLM2-135M-Instruct-Q4_K_M.gguf"
+)
+
+foreach(CANDIDATE ${CANDIDATES})
+    if(EXISTS "${CANDIDATE}")
+        set(MODEL_BLOB "${CANDIDATE}")
+        message(STATUS "Found AI model blob: ${MODEL_BLOB}")
+        break()
+    endif()
+endforeach()
+
+if(MODEL_BLOB)
+    set(MODEL_OBJ "${CMAKE_CURRENT_BINARY_DIR}/model.o")
+    add_custom_command(
+        OUTPUT ${MODEL_OBJ}
+        COMMAND i686-linux-gnu-objcopy -I binary -O elf32-i386 -B i386 
+                --rename-section .data=.ai_model,alloc,load,readonly,data,contents 
+                "${MODEL_BLOB}" "${MODEL_OBJ}"
+        DEPENDS "${MODEL_BLOB}"
+        COMMENT "Converting AI model blob to object file"
+    )
+    # Add the object file to the sources
+    list(APPEND ASM_SOURCES ${MODEL_OBJ})
+else()
+    message(WARNING "AI model blob not found. Kernel will be built without AI support.")
+endif()
+
+# Build Kernel Binary
+set(LINKER_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/linker.ld")
+
+# We use add_executable but we need to control the linking process
+add_executable(kernel.bin ${ASM_SOURCES} ${C_SOURCES})
+
+set_target_properties(kernel.bin PROPERTIES
+    LINK_FLAGS "-T \"${LINKER_SCRIPT}\" -nostdlib -m32 -no-pie -Wl,-z,noexecstack"
+    SUFFIX ""
+    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+)
+
+# Link with libgcc for arithmetic operations
+target_link_libraries(kernel.bin gcc)

Makefile

@@ -9,7 +9,7 @@ LDFLAGS := -T linker.ld -nostdlib -m32 -no-pie -Wl,-z,noexecstack
 
 SRC_DIR := src
 BUILD_DIR := build
-MODEL_BLOB := $(firstword $(wildcard assets/smollm-135m.gguf) $(wildcard assets/SmolLM2-135M-Instruct-Q4_K_M.gguf))
+MODEL_BLOB := $(firstword $(wildcard assets/smollm2.gguf) $(wildcard assets/smollm-135m.gguf) $(wildcard assets/SmolLM2-135M-Instruct-Q4_K_M.gguf))
 MODEL_OBJ := $(BUILD_DIR)/model.o
 
 ASM_SRCS := $(shell find $(SRC_DIR) -name "*.s")
@@ -40,7 +40,7 @@ $(BUILD_DIR)/%.c.o: $(SRC_DIR)/%.c
 	$(CC) $(CFLAGS) -c $< -o $@
 
 kernel.bin: $(OBJS) linker.ld
-	$(LD) $(LDFLAGS) $(OBJS) -lgcc
+	$(LD) $(LDFLAGS) -o $@ $(OBJS) -lgcc
 
 $(MODEL_OBJ): $(MODEL_BLOB)
 	mkdir -p $(dir $@)