Skip to content

Commit 112c235

Browse files
divinehawkrobimarko
authored andcommitted
kernel: fix kmod-fb/kmod-backlight dependency direction on 6.18
Since 6.18, fb.ko calls into the backlight class rather than the reverse, so it depends on backlight.ko when CONFIG_FB_BACKLIGHT is set, which in-tree only happens via FB_TFT's select. Building kmod-fb-tft on a 6.18 target with DISPLAY_SUPPORT therefore fails with: Package kmod-fb is missing dependencies for the following libraries: backlight.ko Declare the dependency on kmod-fb, conditional on kmod-backlight being built. An unconditional +kmod-backlight would form a recursive dependency with KernelPackage/backlight's +kmod-fb, both as a kconfig select cycle and as a circular PACK_ prerequisite that make resolves by dropping an edge. backlight.ko only references fb.ko on 6.12, so narrow that reverse dependency to +LINUX_6_12:kmod-fb, which leaves a single edge on 6.18. Signed-off-by: Matt Eaton <git@divinehawk.com> Link: openwrt/openwrt#24765 Signed-off-by: Robert Marko <robimarko@gmail.com>
1 parent 18725c4 commit 112c235

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

package/kernel/linux/modules/video.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ $(eval $(call KernelPackage,acpi-video))
5959
define KernelPackage/backlight
6060
SUBMENU:=$(VIDEO_MENU)
6161
TITLE:=Backlight support
62-
DEPENDS:=@DISPLAY_SUPPORT +kmod-fb
62+
DEPENDS:=@DISPLAY_SUPPORT +LINUX_6_12:kmod-fb
6363
HIDDEN:=1
6464
KCONFIG:=CONFIG_BACKLIGHT_CLASS_DEVICE \
6565
CONFIG_BACKLIGHT_LCD_SUPPORT=y \
@@ -113,7 +113,7 @@ $(eval $(call KernelPackage,backlight-pwm))
113113
define KernelPackage/fb
114114
SUBMENU:=$(VIDEO_MENU)
115115
TITLE:=Framebuffer and framebuffer console support
116-
DEPENDS:=@DISPLAY_SUPPORT
116+
DEPENDS:=@DISPLAY_SUPPORT +PACKAGE_kmod-backlight:kmod-backlight
117117
KCONFIG:= \
118118
CONFIG_FB \
119119
CONFIG_FB_DEVICE=y \

0 commit comments

Comments
 (0)