diff options
| author | Christian Breunig <christian@breunig.cc> | 2026-05-06 20:30:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-05-06 20:30:20 +0200 |
| commit | 7b3f05c3ecbb57f7b0111d2f030e461f5d6071e5 (patch) | |
| tree | 34f97f8911e517216353ea1bacce659db5b5cf51 /scripts/package-build/linux-kernel/patches/intel-qat/0002-libusdm-kernel-space-fix-include-paths.patch | |
| parent | 0361367d9960c18e0aea54f04405cdcbfb2ff71a (diff) | |
| parent | b1151ea0bc7cce64c1398b5aa01eda607da74a37 (diff) | |
| download | vyos-build-7b3f05c3ecbb57f7b0111d2f030e461f5d6071e5.tar.gz vyos-build-7b3f05c3ecbb57f7b0111d2f030e461f5d6071e5.zip | |
Merge pull request #1177 from c-po/kernel-6.18
T8147: Update Linux Kernel to 6.18
Diffstat (limited to 'scripts/package-build/linux-kernel/patches/intel-qat/0002-libusdm-kernel-space-fix-include-paths.patch')
| -rw-r--r-- | scripts/package-build/linux-kernel/patches/intel-qat/0002-libusdm-kernel-space-fix-include-paths.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/scripts/package-build/linux-kernel/patches/intel-qat/0002-libusdm-kernel-space-fix-include-paths.patch b/scripts/package-build/linux-kernel/patches/intel-qat/0002-libusdm-kernel-space-fix-include-paths.patch new file mode 100644 index 00000000..299cd89a --- /dev/null +++ b/scripts/package-build/linux-kernel/patches/intel-qat/0002-libusdm-kernel-space-fix-include-paths.patch @@ -0,0 +1,23 @@ +From: Christian Breunig <christian@breunig.cc> +Subject: [PATCH] libusdm_drv: fix EXTRA_CFLAGS include handling for kernel builds + +The kernel Makefile incorrectly concatenates "-I" with $(INCLUDES), but +$(INCLUDES) already contains "-I..." entries from linux_2.6_kernel_space.mk. + +That yields broken compiler arguments like "-I-I/path/...", which breaks header +lookup on newer GCC (observed as missing qae_mem.h / Osal.h during out-of-tree +module builds against Linux 6.18). + +--- a/quickassist/utilities/libusdm_drv/linux/Makefile ++++ b/quickassist/utilities/libusdm_drv/linux/Makefile +@@ -187,7 +187,9 @@ export OUTPUT_NAME + #kernel space rules here + #produce two artefacts: module and static library and copy them + ifeq ($(OS),linux) +-EXTRA_CFLAGS+=-I$(INCLUDES) -Werror -ftree-ter ++# INCLUDES already contains "-I..." entries (see env_files/linux_2.6_kernel_space.mk). ++# Prefixing with "-I" again breaks header lookup on newer toolchains (GCC 14+). ++EXTRA_CFLAGS+=$(INCLUDES) -Werror -ftree-ter + obj-m+=$(OUTPUT_NAME).o + $(OUTPUT_NAME)-objs :=$(patsubst %.c,%.o, $(MODULE_SOURCES)) $(ADDITIONAL_KERNEL_LIBS) + lib-m := $(patsubst %.c,%.o, $(SOURCES)) $(patsubst %.S,%.o, $(ASM_SOURCES)) |