From: Ryan Eatmon <reatmon@ti.com>
To: Praneeth Bajjuri <praneeth@ti.com>,
Denys Dmytriyenko <denys@konsulko.com>,
<meta-ti@lists.yoctoproject.org>
Subject: [meta-ti][master][PATCH] ti-img-rogue-driver: Fix build error due to .SECONDARY/.NOTINTERMEDIATE
Date: Wed, 1 Nov 2023 13:11:24 -0500 [thread overview]
Message-ID: <20231101181124.23636-1-reatmon@ti.com> (raw)
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>
---
...uild-Makefile.template-use-SECONDARY.patch | 35 +++++++++++++++++++
.../ti-img-rogue-driver_23.2.6460340.bb | 2 ++
2 files changed, 37 insertions(+)
create mode 100644 meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-build-kbuild-Makefile.template-use-SECONDARY.patch
diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-build-kbuild-Makefile.template-use-SECONDARY.patch b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-build-kbuild-Makefile.template-use-SECONDARY.patch
new file mode 100644
index 00000000..0989116e
--- /dev/null
+++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-build-kbuild-Makefile.template-use-SECONDARY.patch
@@ -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
+
diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_23.2.6460340.bb b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_23.2.6460340.bb
index a74cc7b8..e47a1175 100644
--- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_23.2.6460340.bb
+++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_23.2.6460340.bb
@@ -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"
--
2.17.1
reply other threads:[~2023-11-01 18:11 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231101181124.23636-1-reatmon@ti.com \
--to=reatmon@ti.com \
--cc=denys@konsulko.com \
--cc=meta-ti@lists.yoctoproject.org \
--cc=praneeth@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).