diff mbox series

[meta-ti,master,2/2] ti-img-rogue-driver: drop kbuild patch again

Message ID 20240208233722.2565237-3-rs@ti.com
State Superseded
Delegated to: Ryan Eatmon
Headers show
Series Fix rogue driver compilation with lts prep | expand

Commit Message

Randolph Sapp Feb. 8, 2024, 11:37 p.m. UTC 
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 mbox series

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
-