File fix-ftbfs-v5.19.patch of Package intel-ipu6

Overview Repositories Revisions Requests Users Attributes Meta

File fix-ftbfs-v5.19.patch of Package intel-ipu6

From: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
Date: Fri, 1 Sep 2023 16:42:30 +0800
Subject: Fix ftbfs against v5.19 kernels without any prior ipu6 patches

---
 Makefile                              |  1 -
 drivers/media/pci/intel/ipu6/Makefile | 10 +++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 24f6b12..d9ba6bb 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,6 @@ export CONFIG_IPU_SINGLE_BE_SOC_DEVICE = n
 ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_IPU_BRIDGE)),true)
 export CONFIG_IPU_ISYS_BRIDGE = y
 endif
-export EXTERNAL_BUILD = 1
 obj-y += drivers/media/pci/intel/
 
 export CONFIG_VIDEO_HM11B1 = m
diff --git a/drivers/media/pci/intel/ipu6/Makefile b/drivers/media/pci/intel/ipu6/Makefile
index 23f8cdb..c15bbab 100644
--- a/drivers/media/pci/intel/ipu6/Makefile
+++ b/drivers/media/pci/intel/ipu6/Makefile
@@ -1,10 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 # Copyright (c) 2017 - 2024 Intel Corporation.
 
-ifneq ($(EXTERNAL_BUILD), 1)
-srcpath := $(srctree)
-endif
-
 ccflags-y += -DIPU_TPG_FRAME_SYNC -DIPU_PSYS_GPC \
 		-DIPU_ISYS_GPC
 
@@ -57,6 +53,6 @@ endif
 
 obj-$(CONFIG_VIDEO_INTEL_IPU6)		+= intel-ipu6-psys.o
 
-ccflags-y += -I$(srcpath)/$(src)/../../../../../include/
-ccflags-y += -I$(srcpath)/$(src)/../
-ccflags-y += -I$(srcpath)/$(src)/
+ccflags-y += -I$(src)/..
+ccflags-y += -I$(src)
+ccflags-y += -I$(M)/backport-include/ -I$(M)/include/

Places

File fix-ftbfs-v5.19.patch of Package intel-ipu6

Places