From 6996743e658d6bd5347bb0d706c104c7298fb6f1 Mon Sep 17 00:00:00 2001 From: Erich Ritz Date: Wed, 22 Nov 2023 15:06:39 -0600 Subject: [PATCH] Makefile: Use $(MODLIB)/build/source symlink for kernel source After kernel commit d8131c2965d5ee59bfa4d548641e52a13cbe17c9 ("kbuild: remove $(MODLIB)/source symlink") https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d8131c2965d5ee59bfa4d548641e52a13cbe17c9 $(MODLIB)/source no longer exists. Add support for $(MODLIB)/build/source. --- kernel-open/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kernel-open/Makefile b/kernel-open/Makefile index e0ed5e955..4859ac66f 100644 --- a/kernel-open/Makefile +++ b/kernel-open/Makefile @@ -28,7 +28,7 @@ else else KERNEL_UNAME ?= $(shell uname -r) KERNEL_MODLIB := /lib/modules/$(KERNEL_UNAME) - KERNEL_SOURCES := $(shell test -d $(KERNEL_MODLIB)/source && echo $(KERNEL_MODLIB)/source || echo $(KERNEL_MODLIB)/build) + KERNEL_SOURCES := $(shell test -d $(KERNEL_MODLIB)/source && echo $(KERNEL_MODLIB)/source || $(shell test -d $(KERNEL_MODLIB)/build/source && echo $(KERNEL_MODLIB)/build/source || echo $(KERNEL_MODLIB)/build) endif KERNEL_OUTPUT := $(KERNEL_SOURCES) @@ -46,6 +46,10 @@ else KERNEL_OUTPUT := $(KERNEL_MODLIB)/build KBUILD_PARAMS := KBUILD_OUTPUT=$(KERNEL_OUTPUT) endif + ifeq ($(KERNEL_SOURCES), $(KERNEL_MODLIB)/build/source) + KERNEL_OUTPUT := $(KERNEL_MODLIB)/build + KBUILD_PARAMS := KBUILD_OUTPUT=$(KERNEL_OUTPUT) + endif endif CC ?= cc