Change KERNEL_IMAGE to QEMU_KERNEL_IMAGE

Author: gsingh93

.github/workflows/build.yml

@@ -156,10 +156,10 @@ jobs:
 
     - name: Run kernel
       run: |
-        KERNEL_IMAGE=./kernel-image/$IMAGE_NAME make run
-        KERNEL_IMAGE=./kernel-image/$IMAGE_NAME ROOTFS=./rootfs-${{ matrix.arch }} make run
-        KERNEL_IMAGE=./kernel-image/$IMAGE_NAME INITRD=./alpine-${{ matrix.arch }}.cpio.gz make run
-        KERNEL_IMAGE=./kernel-image/$IMAGE_NAME CPU=2 MEM=2048M QEMU_EXTRA_ARGS="" QEMU_EXTRA_KERNEL_CMDLINE="nokaslr" make run
+        QEMU_KERNEL_IMAGE=./kernel-image/$IMAGE_NAME make run
+        QEMU_KERNEL_IMAGE=./kernel-image/$IMAGE_NAME ROOTFS=./rootfs-${{ matrix.arch }} make run
+        QEMU_KERNEL_IMAGE=./kernel-image/$IMAGE_NAME INITRD=./alpine-${{ matrix.arch }}.cpio.gz make run
+        QEMU_KERNEL_IMAGE=./kernel-image/$IMAGE_NAME CPU=2 MEM=2048M QEMU_EXTRA_ARGS="" QEMU_EXTRA_KERNEL_CMDLINE="nokaslr" make run
 
     - name: Upload rootfs artifact
       uses: actions/upload-artifact@v3

Makefile

@@ -66,7 +66,7 @@ help:
 	@echo '      MEM                           - Specify the memory size in MB to use when running QEMU (default: 1024)'
 	@echo '      QEMU_EXTRA_ARGS               - Specify additional arguments to pass to QEMU (default: "")'
 	@echo '      QEMU_EXTRA_KERNEL_CMDLINE     - Specify additional arguments to pass to the kernel (default: "")'
-	@echo '      KERNEL_IMAGE                  - The path to the kernel image to run (x86_64 default: $$LINUX_OUT/arch/$$ARCH/boot/bzImage, arm64 default: $$LINUX_OUT/arch/$$ARCH/boot/Image)'
+	@echo '      QEMU_KERNEL_IMAGE             - The path to the kernel image to run (x86_64 default: $$LINUX_OUT/arch/$$ARCH/boot/bzImage, arm64 default: $$LINUX_OUT/arch/$$ARCH/boot/Image)'
 	@echo '      ROOTFS                        - The path to the rootfs image file (default: rootfs/rootfs-$$ARCH.img)'
 	@echo '      ROOTFS_FORMAT                 - The format of the rootfs image file (default: qcow2)'
 	@echo '      INITRD                        - The path to a gziped initramfs CPIO file to use instead of a rootfs image (default: "")'
@@ -131,10 +131,10 @@ LINUX_CONFIG := $(LINUX_OUT)/.config
 
 ifeq ($(ARCH),x86_64)
   TARGET := x86_64-pc-linux-gnu
-  KERNEL_IMAGE ?= $(LINUX_OUT)/arch/$(ARCH)/boot/bzImage
+  KERNEL_IMAGE := $(LINUX_OUT)/arch/$(ARCH)/boot/bzImage
 else ifeq ($(ARCH),arm64)
   TARGET := aarch64-linux-gnu
-  KERNEL_IMAGE ?= $(LINUX_OUT)/arch/$(ARCH)/boot/Image
+  KERNEL_IMAGE := $(LINUX_OUT)/arch/$(ARCH)/boot/Image
 endif
 
 LINUX_MAKE := \
@@ -291,13 +291,14 @@ QEMU_EXTRA_KERNEL_CMDLINE ?=
 GDB ?= 0
 INITRD ?=
 RDINIT ?= /sbin/init
+QEMU_KERNEL_IMAGE ?= $(KERNEL_IMAGE)
 
 QEMU_ARGS := \
   -m $(MEM) \
   -smp $(CPU) \
   -nographic \
   -no-reboot \
-  -kernel $(KERNEL_IMAGE) \
+  -kernel $(QEMU_KERNEL_IMAGE) \
   -netdev user,id=eth0,hostfwd=tcp::7777-:7777,hostfwd=tcp::2222-:22,hostfwd=tcp::2223-:23 -device virtio-net-pci,netdev=eth0 \
   -virtfs local,security_model=mapped-xattr,path=$(SHARED_DIR),mount_tag=shared \
   $(QEMU_EXTRA_ARGS)
@@ -334,7 +335,7 @@ else
     -append "console=ttyAMA0 selinux=0 $(QEMU_EXTRA_KERNEL_CMDLINE)"
 endif
 
-RUN_DEPS := $(KERNEL_IMAGE)
+RUN_DEPS := $(QEMU_KERNEL_IMAGE)
 
 .PHONY: run
 run: $(RUN_DEPS) | $(SHARED_DIR)