From e4863b3378670e7c79883b48805c8c0222b1427c Mon Sep 17 00:00:00 2001 From: Christian Schwarz Date: Thu, 16 Nov 2023 10:56:20 +0000 Subject: [PATCH] hack: for kernel, use a pre-built 6.5 mainline build from some ubuntu website In a local experiment, bpftrace kprobe:vfs_write works with it. https://kernel.ubuntu.com/mainline/v6.5.11/ --- .gitignore | 2 ++ Makefile | 14 ++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 2ea0c8ef9..468f1eb52 100644 --- a/.gitignore +++ b/.gitignore @@ -25,5 +25,7 @@ testbin/* *.qcow2 neonvm/hack/vmlinuz +linux-image-unsigned-6.5.11-060511-generic_6.5.11-060511.202311151304_amd64 +linux-image-unsigned-6.5.11-060511-generic_6.5.11-060511.202311151304_amd64.deb rendered_manifests diff --git a/Makefile b/Makefile index 9fdc9bb99..d2cea7fb9 100644 --- a/Makefile +++ b/Makefile @@ -239,14 +239,12 @@ endif .PHONY: kernel kernel: ## Build linux kernel. rm -f neonvm/hack/vmlinuz - docker buildx build \ - --build-arg KERNEL_VERSION=$(VM_KERNEL_VERSION) \ - --output type=local,dest=neonvm/hack/ \ - --platform linux/amd64 \ - --pull \ - --no-cache \ - --file neonvm/hack/Dockerfile.kernel-builder \ - neonvm/hack + rm -f linux-image-unsigned-6.5.11-060511-generic_6.5.11-060511.202311151304_amd64.deb + rm -rf linux-image-unsigned-6.5.11-060511-generic_6.5.11-060511.202311151304_amd64 + curl -o linux-image-unsigned-6.5.11-060511-generic_6.5.11-060511.202311151304_amd64.deb https://kernel.ubuntu.com/mainline/v6.5.11/amd64/linux-image-unsigned-6.5.11-060511-generic_6.5.11-060511.202311151304_amd64.deb + mkdir linux-image-unsigned-6.5.11-060511-generic_6.5.11-060511.202311151304_amd64 + dpkg-deb -x linux-image-unsigned-6.5.11-060511-generic_6.5.11-060511.202311151304_amd64.deb linux-image-unsigned-6.5.11-060511-generic_6.5.11-060511.202311151304_amd64 + cp linux-image-unsigned-6.5.11-060511-generic_6.5.11-060511.202311151304_amd64/boot/vmlinuz-6.5.11-060511-generic neonvm/hack/vmlinuz .PHONY: check-local-context check-local-context: ## Asserts that the current kubectl context is pointing at k3d or kind, to avoid accidentally applying to prod