[openwrt/openwrt] kernel: update fb package on x86 for kernel 6.12

LEDE Commits lede-commits at lists.infradead.org
Wed Apr 30 07:28:03 PDT 2025


ansuel pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/87c083940201f75099929b94aff3ae7167afe073

commit 87c083940201f75099929b94aff3ae7167afe073
Author: Mieczyslaw Nalewaj <namiltd at yahoo.com>
AuthorDate: Sun Apr 27 18:49:13 2025 +0200

    kernel: update fb package on x86 for kernel 6.12
    
    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 at yahoo.com>
    Link: https://github.com/openwrt/openwrt/pull/16547
    Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
---
 package/kernel/linux/modules/video.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/kernel/linux/modules/video.mk b/package/kernel/linux/modules/video.mk
index 9bb030bf57..66aa22d26d 100644
--- a/package/kernel/linux/modules/video.mk
+++ b/package/kernel/linux/modules/video.mk
@@ -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 at lt6.12 \
+	$(LINUX_DIR)/arch/x86/video/video-common.ko at ge6.12
+  AUTOLOAD:=$(call AutoLoad,06,fbdev at lt6.12 video-common at ge6.12 fb font)
 endef
 
 $(eval $(call KernelPackage,fb))




More information about the lede-commits mailing list