From b784fef82bce43e1322b5be7a5a478d03e8e9396 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 29 Dec 2025 19:42:42 +0000
Subject: [PATCH] Switch to building kernel from kernel.org instead of Ubuntu
 package

Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
---
 scripts/docker-image-download-kernel.sh | 71 +++++++++++++++++++++----
 scripts/docker-image-install-tools.sh   |  9 +++-
 2 files changed, 69 insertions(+), 11 deletions(-)

diff --git a/scripts/docker-image-download-kernel.sh b/scripts/docker-image-download-kernel.sh
index 29ea3f2..272842c 100755
--- a/scripts/docker-image-download-kernel.sh
+++ b/scripts/docker-image-download-kernel.sh
@@ -1,16 +1,67 @@
 #!/bin/bash
-# Download a minimal Linux kernel for UEFI image
+# Download and build a minimal Linux kernel from kernel.org
 
 set -e
 
-mkdir -p /kernel
-apt-get update
-apt-get download linux-image-generic
+echo "=== Building minimal Linux kernel from kernel.org ==="
 
-# The linux-image-generic is a metapackage, we need to get the actual kernel
-KERNEL_VERSION=$(apt-cache depends linux-image-generic | grep Depends | grep linux-image | head -1 | awk '{print $2}')
-apt-get download $KERNEL_VERSION
+# Use a stable LTS kernel version
+KERNEL_VERSION="6.6.68"
+KERNEL_MAJOR=$(echo $KERNEL_VERSION | cut -d. -f1)
 
-# Extract the actual kernel package (not the metapackage)
-dpkg -x ${KERNEL_VERSION}*.deb /kernel
-rm -rf /var/lib/apt/lists/* linux-image-*.deb
+mkdir -p /kernel/build
+cd /kernel/build
+
+# Download kernel source
+echo "Downloading kernel ${KERNEL_VERSION}..."
+wget -q --show-progress https://cdn.kernel.org/pub/linux/kernel/v${KERNEL_MAJOR}.x/linux-${KERNEL_VERSION}.tar.xz
+
+# Extract
+echo "Extracting kernel source..."
+tar -xf linux-${KERNEL_VERSION}.tar.xz
+cd linux-${KERNEL_VERSION}
+
+# Create minimal config for x86_64 UEFI boot
+echo "Configuring kernel for minimal UEFI boot..."
+make defconfig
+make kvm_guest.config
+
+# Enable essential features for SparkOS
+scripts/config --enable CONFIG_EFI
+scripts/config --enable CONFIG_EFI_STUB
+scripts/config --enable CONFIG_DEVTMPFS
+scripts/config --enable CONFIG_DEVTMPFS_MOUNT
+scripts/config --enable CONFIG_TMPFS
+scripts/config --enable CONFIG_PROC_FS
+scripts/config --enable CONFIG_SYSFS
+scripts/config --enable CONFIG_EXT4_FS
+scripts/config --enable CONFIG_VFAT_FS
+scripts/config --enable CONFIG_NLS_CODEPAGE_437
+scripts/config --enable CONFIG_NLS_ISO8859_1
+scripts/config --enable CONFIG_TTY
+scripts/config --enable CONFIG_SERIAL_8250
+scripts/config --enable CONFIG_SERIAL_8250_CONSOLE
+
+# Disable unnecessary features to speed up build
+scripts/config --disable CONFIG_DEBUG_INFO
+scripts/config --disable CONFIG_DEBUG_INFO_BTF
+scripts/config --disable CONFIG_DEBUG_INFO_DWARF4
+scripts/config --disable CONFIG_DEBUG_INFO_DWARF5
+scripts/config --disable CONFIG_GDB_SCRIPTS
+scripts/config --set-str CONFIG_LOCALVERSION "-sparkos"
+
+# Build kernel (use all available cores)
+echo "Building kernel (this may take several minutes)..."
+make -j$(nproc) bzImage
+
+# Copy kernel to expected location
+echo "Installing kernel..."
+mkdir -p /kernel/boot
+cp arch/x86/boot/bzImage /kernel/boot/vmlinuz-${KERNEL_VERSION}
+
+# Clean up build directory to save space
+cd /
+rm -rf /kernel/build
+
+echo "Kernel build complete: /kernel/boot/vmlinuz-${KERNEL_VERSION}"
+ls -lh /kernel/boot/
diff --git a/scripts/docker-image-install-tools.sh b/scripts/docker-image-install-tools.sh
index d73b93a..2b4cf9f 100755
--- a/scripts/docker-image-install-tools.sh
+++ b/scripts/docker-image-install-tools.sh
@@ -17,5 +17,12 @@ apt-get install -y \
     wget \
     busybox-static \
     kmod \
-    udev
+    udev \
+    bc \
+    bison \
+    flex \
+    libelf-dev \
+    libssl-dev \
+    xz-utils \
+    cpio
 rm -rf /var/lib/apt/lists/*