ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-02-07 11:30:37 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

gpio-cdev: move kmod-leds-uleds dependency to MX100

Browse Source 
The inclusion of the kmod-leds-uleds into the userspace
nu801 package causes a circular dependency inside the
buildsystem... which causes it to be picked regardless
of other DEPENDS values.

In case of the mx100, this could be solved by moving the
kmod-leds-uled dependency to the kmod-meraki-mx100.

Bonus: drop @!LINUX_5_4 from kmod-meraki-mx100
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
This commit is contained in:
Christian Lamparter 2022-03-27 15:04:29 +02:00
parent 7368345450
commit eeb8fd4ce7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/system/gpio-cdev/nu801/Makefile
View File

@ -20,7 +20,7 @@ define Package/nu801
SECTION:=utils SECTION:=utils
CATEGORY:=Utilities CATEGORY:=Utilities
SUBMENU:=Userspace GPIO Drivers SUBMENU:=Userspace GPIO Drivers
DEPENDS:=@TARGET_x86 +kmod-leds-uleds DEPENDS:=@TARGET_x86
KCONFIG:=CONFIG_GPIO_CDEV=y KCONFIG:=CONFIG_GPIO_CDEV=y
TITLE:=NU801 LED Driver TITLE:=NU801 LED Driver
endef endef

4
target/linux/x86/modules.mk
View File

@ -87,8 +87,8 @@ $(eval $(call KernelPackage,pcengines-apuv2))
define KernelPackage/meraki-mx100 define KernelPackage/meraki-mx100
SUBMENU:=$(OTHER_MENU) SUBMENU:=$(OTHER_MENU)
TITLE:=Cisco Meraki MX100 Platform Driver TITLE:=Cisco Meraki MX100 Platform Driver
DEPENDS:=@TARGET_x86 @!LINUX_5_4 +kmod-tg3 +kmod-gpio-button-hotplug +kmod-leds-gpio \ DEPENDS:=@TARGET_x86 +kmod-tg3 +kmod-gpio-button-hotplug +kmod-leds-gpio \
+kmod-usb-ledtrig-usbport +nu801 +kmod-itco-wdt +kmod-usb-ledtrig-usbport +nu801 +kmod-itco-wdt +kmod-leds-uleds
KCONFIG:=CONFIG_MERAKI_MX100 KCONFIG:=CONFIG_MERAKI_MX100
FILES:=$(LINUX_DIR)/drivers/platform/x86/meraki-mx100.ko FILES:=$(LINUX_DIR)/drivers/platform/x86/meraki-mx100.ko
AUTOLOAD:=$(call AutoLoad,60,meraki-mx100,1) AUTOLOAD:=$(call AutoLoad,60,meraki-mx100,1)