From: <rs@ti.com>
To: <detheridge@ti.com>, <denys@konsulko.com>, <reatmon@ti.com>
Cc: <meta-ti@lists.yoctoproject.org>
Subject: [meta-ti][master][PATCH 2/2] ti-img-rogue-driver: drop kbuild patch again
Date: Thu, 8 Feb 2024 17:37:22 -0600 [thread overview]
Message-ID: <20240208233722.2565237-3-rs@ti.com> (raw)
In-Reply-To: <20240208233722.2565237-1-rs@ti.com>
From: Randolph Sapp <rs@ti.com>
Drop the kbuild patch now that we have integrated an equivalent solution
into the upstream branch.
Signed-off-by: Randolph Sapp <rs@ti.com>
---
...uild-Makefile.template-use-SECONDARY.patch | 35 -------------------
1 file changed, 35 deletions(-)
delete 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
deleted file mode 100644
index 0989116e..00000000
--- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-build-kbuild-Makefile.template-use-SECONDARY.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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
-
--
2.43.0
prev parent reply other threads:[~2024-02-08 23:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-08 23:37 [meta-ti][master][PATCH 0/2] Fix rogue driver compilation with lts prep rs
2024-02-08 23:37 ` [meta-ti][master][PATCH 1/2] ti-img-rogue-*: switch branches to new lts rs
2024-02-09 3:13 ` Ryan Eatmon
[not found] ` <17B213457AB20D5B.15017@lists.yoctoproject.org>
2024-02-09 3:16 ` Ryan Eatmon
2024-02-09 3:24 ` Res Sapp
2024-02-08 23:37 ` rs [this message]
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=20240208233722.2565237-3-rs@ti.com \
--to=rs@ti.com \
--cc=denys@konsulko.com \
--cc=detheridge@ti.com \
--cc=meta-ti@lists.yoctoproject.org \
--cc=reatmon@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).