From: Mieczyslaw Nalewaj Date: Sun, 27 Apr 2025 16:49:13 +0000 (+0200) Subject: kernel: update fb package on x86 for kernel 6.12 X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=87c083940201f75099929b94aff3ae7167afe073;p=openwrt%2Fstaging%2Fxback.git 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 Link: https://github.com/openwrt/openwrt/pull/16547 Signed-off-by: Christian Marangi --- 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@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))