diff mbox series

[v2,2/2] linux-starfive: Fix build with GNU make 4.4

Message ID 20250411101752.16954-3-ubely@ilbers.de
State New
Headers show
Series Fix riscv64/trixie build | expand

Commit Message

Uladzimir Bely April 11, 2025, 10:15 a.m. UTC 
After updating "make" in trixie, kernel build fails with errors like:

```
make[10]: *** .NOTINTERMEDIATE and .SECONDARY are mutually exclusive.  Stop.
make[9]: *** [../scripts/Makefile.build:480: drivers/gpu/drm/img/img-rogue] Error 2
make[9]: *** Waiting for unfinished jobs....
```

Branch "JH7110_VisionFive2_devel" we are using still doesn't include
required fix, so borrow it from branch "pinetab-6.6.y-devel".
---
 ...ogue-fix-build-issue-on-GNU-Make-4.4.patch | 29 +++++++++++++++++++
 .../linux-starfive_6.6.20-visionfive2.bb      |  1 +
 2 files changed, 30 insertions(+)
 create mode 100644 meta-isar/recipes-kernel/linux/files/0001-drm-img-rogue-fix-build-issue-on-GNU-Make-4.4.patch
diff mbox series

Patch

diff --git a/meta-isar/recipes-kernel/linux/files/0001-drm-img-rogue-fix-build-issue-on-GNU-Make-4.4.patch b/meta-isar/recipes-kernel/linux/files/0001-drm-img-rogue-fix-build-issue-on-GNU-Make-4.4.patch
new file mode 100644
index 00000000..b7e7a0e6
--- /dev/null
+++ b/meta-isar/recipes-kernel/linux/files/0001-drm-img-rogue-fix-build-issue-on-GNU-Make-4.4.patch
@@ -0,0 +1,29 @@ 
+From 6b09bb490fb1a575a023c168a6db2d2470129885 Mon Sep 17 00:00:00 2001
+From: Icenowy Zheng <uwu@icenowy.me>
+Date: Sat, 22 Jun 2024 22:03:02 +0800
+Subject: [PATCH] drm: img-rogue: fix build issue on GNU Make 4.4+
+
+Signed-off-by: Icenowy Zheng <uwu@icenowy.me>
+---
+ drivers/gpu/drm/img/img-rogue/Makefile | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/drivers/gpu/drm/img/img-rogue/Makefile b/drivers/gpu/drm/img/img-rogue/Makefile
+index ee37ef8cadbf..fe3bad2b77ea 100644
+--- a/drivers/gpu/drm/img/img-rogue/Makefile
++++ b/drivers/gpu/drm/img/img-rogue/Makefile
+@@ -73,7 +73,11 @@ WINDOW_SYSTEM=nulldrmws
+ #include $(OUT)/config_kernel.mk
+ include $(srctree)/$(src)/config_kernel.mk
+ 
++ifneq ($(and $(filter notintermediate, $(.FEATURES)),$(filter-out 4.4,$(MAKE_VERSION))),)
++.NOTINTERMEDIATE:
++else
+ .SECONDARY:
++endif
+ 
+ define symlink-source-file
+ @if [ ! -e $(dir $@) ]; then mkdir -p $(dir $@); fi
+-- 
+2.49.0
+
diff --git a/meta-isar/recipes-kernel/linux/linux-starfive_6.6.20-visionfive2.bb b/meta-isar/recipes-kernel/linux/linux-starfive_6.6.20-visionfive2.bb
index 80c2d3ff..e4433c5d 100644
--- a/meta-isar/recipes-kernel/linux/linux-starfive_6.6.20-visionfive2.bb
+++ b/meta-isar/recipes-kernel/linux/linux-starfive_6.6.20-visionfive2.bb
@@ -8,6 +8,7 @@  require recipes-kernel/linux/linux-custom.inc
 SRC_URI += " \
     https://github.com/starfive-tech/linux/archive/${SRCREV}.tar.gz;downloadfilename=linux-starfive-${SRCREV}.tar.gz \
     file://0001-btrfs-fix-kvcalloc-arguments-order-in-btrfs_ioctl_se.patch \
+    file://0001-drm-img-rogue-fix-build-issue-on-GNU-Make-4.4.patch \
     file://starfive2_extra.cfg"
 SRCREV = "d0e7c0486d768a294f4f2b390d00dab8bee5d726"
 SRC_URI[sha256sum] = "86f1bb78a84222d4a3d22779e335023a228cd865df866fd08af6a7816eca3add"