Skip to content

Commit

Permalink
Use kernel 5.10 by default
Browse files Browse the repository at this point in the history
Signed-off-by: Kyle Harding <[email protected]>
  • Loading branch information
klutchell committed Mar 1, 2024
1 parent 9dc63e9 commit 8031495
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ RUN apt-get update \
vim-tiny \
&& rm -rf /var/lib/apt/lists/*

ARG KERNEL_BRANCH=6.1
ARG KERNEL_BRANCH=5.10

RUN git clone --depth 1 -c advice.detachedHead=false \
--branch "v${KERNEL_BRANCH}" https://github.com/torvalds/linux.git .
Expand All @@ -38,14 +38,14 @@ RUN git apply -v ./*.patch
###############################################

FROM linux.git AS vmconfig-arm64
ARG KERNEL_BRANCH
ARG KERNEL_BRANCH=5.10
COPY vmlinux/${KERNEL_BRANCH}/microvm-kernel-arm64-${KERNEL_BRANCH}.config ./.config
FROM vmconfig-arm64 AS vmlinux-arm64
RUN make Image && lz4 -9 ./arch/arm64/boot/Image ./vmlinux.bin.lz4

###############################################
FROM linux.git AS vmconfig-amd64
ARG KERNEL_BRANCH
ARG KERNEL_BRANCH=5.10
COPY vmlinux/${KERNEL_BRANCH}/microvm-kernel-x86_64-${KERNEL_BRANCH}.config ./.config
FROM vmconfig-amd64 AS vmlinux-amd64
RUN make vmlinux && lz4 -9 ./vmlinux ./vmlinux.bin.lz4
Expand Down
2 changes: 1 addition & 1 deletion vmlinux/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARCH ?= $(shell uname -m)
KERNEL_BRANCH ?= 6.1
KERNEL_BRANCH ?= 5.10
MAKEFILE_DIR := $(realpath $(shell dirname $(firstword $(MAKEFILE_LIST))))

# normalize architecture to machine and platform
Expand Down

0 comments on commit 8031495

Please sign in to comment.