]> git.ipfire.org Git - thirdparty/openwrt.git/commitdiff
kernel: update fb package on x86 for kernel 6.12
authorMieczyslaw Nalewaj <namiltd@yahoo.com>
Sun, 27 Apr 2025 16:49:13 +0000 (18:49 +0200)
committerChristian Marangi <ansuelsmth@gmail.com>
Wed, 30 Apr 2025 14:26:44 +0000 (16:26 +0200)
For kernel 6.12 the fb package uses video-common.ko instead of fbdev.ko.
The patch switches these files depending on the kernel version.

Ref:
 - https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-6.12.y&id=2fd001cd36005846caa6456fff1008c6f5bae9d4
 - https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-6.12.y&id=34cda5ab89d4f30bc8d8f8d28980a7b8c68db6ec

Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
Link: https://github.com/openwrt/openwrt/pull/16547
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
package/kernel/linux/modules/video.mk

index 9bb030bf57fd0dffc62bae0c0c875486d5623eab..66aa22d26d4d95db952a1261ab47a2ff3aea6110 100644 (file)
@@ -138,8 +138,9 @@ define KernelPackage/fb/description
 endef
 
 define KernelPackage/fb/x86
-  FILES+=$(LINUX_DIR)/arch/x86/video/fbdev.ko
-  AUTOLOAD:=$(call AutoLoad,06,fbdev fb font)
+  FILES+=$(LINUX_DIR)/arch/x86/video/fbdev.ko@lt6.12 \
+       $(LINUX_DIR)/arch/x86/video/video-common.ko@ge6.12
+  AUTOLOAD:=$(call AutoLoad,06,fbdev@lt6.12 video-common@ge6.12 fb font)
 endef
 
 $(eval $(call KernelPackage,fb))