From: Tony Ambardar Date: Sun, 21 Mar 2021 06:30:44 +0000 (-0700) Subject: kernel: robustify dependencies in kmod-sound-hda-core X-Git-Tag: v22.03.0-rc1~3014 X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=2ba0ab1930bd0f28404835b4393a6c99bcd0196c kernel: robustify dependencies in kmod-sound-hda-core Dependency tracking for kmod-sound-hda-core is fragile. Enabling some sound codecs (Realtek, Conexant, Sigmatel) implicitly adds a kmod-ledtrig-audio dependency, while an enabled kmod-ledtrig-audio can be picked up through enabling others (e.g. kmod-sound-hda-intel), and the behaviour can change across kernel versions. As kmod-ledtrig-audio is under 2KB, make it an unconditional dependency. Fixes: a374b8f19051 ("kernel: 5.10: update sound modules") Signed-off-by: Tony Ambardar --- diff --git a/package/kernel/linux/modules/sound.mk b/package/kernel/linux/modules/sound.mk index 2c11d078e1..e43be25bc6 100644 --- a/package/kernel/linux/modules/sound.mk +++ b/package/kernel/linux/modules/sound.mk @@ -304,10 +304,7 @@ $(eval $(call KernelPackage,sound-dummy)) define KernelPackage/sound-hda-core SUBMENU:=$(SOUND_MENU) TITLE:=HD Audio Sound Core Support - DEPENDS:= \ - +LINUX_5_10&&PACKAGE_kmod-sound-hda-codec-realtek:kmod-ledtrig-audio \ - +LINUX_5_10&&PACKAGE_kmod-sound-hda-codec-conexant:kmod-ledtrig-audio \ - +LINUX_5_10&&PACKAGE_kmod-sound-hda-codec-idt:kmod-ledtrig-audio + DEPENDS:=+kmod-ledtrig-audio KCONFIG:= \ CONFIG_SND_HDA_CORE \ CONFIG_SND_HDA_HWDEP=y \