1
0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-06-09 04:13:52 +00:00

ti-img-rogue-driver: Fix build error due to .SECONDARY/.NOTINTERMEDIATE

There is a build error under master that is not present in kirkstone
related to .SECONDARY/.NOTINTERMEDIATE being set differently between the
ti-img-rogue-driver repo and the kernel.  The long term solution to
allow this code to be built on both kirkstone/master is being
investigated.  In the meantime, this patch gets things building on
master.

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
This commit is contained in:
Ryan Eatmon
2023-11-01 13:07:21 -05:00
parent 128a5074b8
commit 4c0952f066
2 changed files with 37 additions and 0 deletions
@@ -0,0 +1,35 @@
From 738dfc1b33a83e9995ed7f65ec41ebe2fc6a90ed Mon Sep 17 00:00:00 2001
From: Ryan Eatmon <reatmon@ti.com>
Date: Wed, 1 Nov 2023 10:04:29 -0500
Subject: [PATCH] build: kbuild: Makefile.template: use SECONDARY
For some reason on master we are seeing an error:
| make[5]: *** .NOTINTERMEDIATE and .SECONDARY are mutually exclusive. Stop.
Flip this back to .SECONDARY to fix this build issue.
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Upstream-Status: Pending
---
build/linux/kbuild/Makefile.template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build/linux/kbuild/Makefile.template b/build/linux/kbuild/Makefile.template
index aa19d66..31e37fb 100644
--- a/build/linux/kbuild/Makefile.template
+++ b/build/linux/kbuild/Makefile.template
@@ -54,7 +54,7 @@
include $(OUT)/config_kernel.mk
-.NOTINTERMEDIATE:
+.SECONDARY:
define symlink-source-file
@if [ ! -e $(dir $@) ]; then mkdir -p $(dir $@); fi
--
2.17.1
@@ -20,6 +20,8 @@ BRANCH = "linuxws/kirkstone/k6.1/${PV}"
SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-driver.git;protocol=https;branch=${BRANCH}"
SRC_URI:append = " file://0001-build-kbuild-Makefile.template-use-SECONDARY.patch"
S = "${WORKDIR}/git"
SRCREV = "778aa5d1e104f36c7f7c1f50e99f8499cbbdadbb"