From 0cd1fc0fe543eaff04b0263b10b92b056cdef6dd Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Sun, 1 May 2022 14:10:35 +0200 Subject: [PATCH] x86: detangle meraki-mx100 / nu801 build confusion Grommish reported the dreaded build error that happend with 5.4 since the kernel didn't have the cgpio v2 interface. His reason for the removed 5.4 was that the octeon target had a memory leak issue, so he had to backport the removed 5.4 kernel for his tests. Chen Minqiang chimed in and noted that no matter what (i.e. @TARGET_x86 in depends) didn't prevent the package from being build on other targets. From what I can tell, the reason for this was that +nu801 meant that kmod-meraki-mx100 pulled in an unconditional dependency as part of to the kernel build. |scripts/package-metadata.pl mk tmp/.packageinfo | |$(curdir)/kernel/linux/compile += $(curdir)/firmware/linux-firmware/compile \ | $(curdir)/firmware/prism54-firmware/compile \ | $(curdir)/kernel/gpio-button-hotplug/compile \ | >>> $(curdir)/system/gpio-cdev/nu801/compile <<< change this by making the dependency conditional on the meraki-mx100 module itself. Note that the nu801 enables/sets the KCONFIG for the cgpio v2 interface itself, since the userspace program and not the kernel meraki-mx100 relies on it. Reference: Reported-by: Grommish Reported-by: Chen Minqiang Signed-off-by: Christian Lamparter --- target/linux/x86/modules.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/linux/x86/modules.mk b/target/linux/x86/modules.mk index a57a470e8d5..2f7f783c163 100644 --- a/target/linux/x86/modules.mk +++ b/target/linux/x86/modules.mk @@ -106,7 +106,8 @@ define KernelPackage/meraki-mx100 SUBMENU:=$(OTHER_MENU) TITLE:=Cisco Meraki MX100 Platform Driver DEPENDS:=@TARGET_x86 +kmod-tg3 +kmod-gpio-button-hotplug +kmod-leds-gpio \ - +kmod-usb-ledtrig-usbport +nu801 +kmod-itco-wdt +kmod-leds-uleds + +kmod-usb-ledtrig-usbport +PACKAGE_kmod-meraki-mx100:nu801 +kmod-itco-wdt \ + +kmod-leds-uleds KCONFIG:=CONFIG_MERAKI_MX100 FILES:=$(LINUX_DIR)/drivers/platform/x86/meraki-mx100.ko AUTOLOAD:=$(call AutoLoad,60,meraki-mx100,1) -- 2.30.2