gwrx/openwrt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel: make kmod-hwmon-core selected by dependent modules

Browse Source 
Currently kmod-hwmon-* will not get into images unless kmod-hwmon-core is added
to DEVICE_PACKAGES as well. By changing the dependencies from "depends on" to
"select", we do not have the issue anymore.

Furthermore, we can remove most occurrences of the package from DEVICE_PACKAGES
and similar variables, as it is now pulled by dependent modules such as:
- kmod-hwmon-gpiofan
- kmod-hwmon-lm63
- kmod-hwmon-lm75
- kmod-hwmon-lm85
- kmod-hwmon-lm90

Signed-off-by: Sungbo Eo <mans0n@gorani.run>
[do not touch ar71xx, adjust line wrapping]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
Sungbo Eo 2020-03-05 23:22:47 +09:00 committed by Adrian Schmutzler
parent dffbe668ab
commit 4159054fbb
6 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/kernel/hwmon-gsc/Makefile
View File

@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/package.mk
define KernelPackage/hwmon-gsc define KernelPackage/hwmon-gsc
SUBMENU:=Hardware Monitoring Support SUBMENU:=Hardware Monitoring Support
DEPENDS:=@TARGET_imx6||TARGET_cns3xxx kmod-hwmon-core +kmod-i2c-core DEPENDS:=@TARGET_imx6||TARGET_cns3xxx +kmod-hwmon-core +kmod-i2c-core
TITLE:=Driver for the Gateworks System Controller TITLE:=Driver for the Gateworks System Controller
AUTOLOAD:=$(call AutoLoad,60,gsc) AUTOLOAD:=$(call AutoLoad,60,gsc)
FILES:=$(PKG_BUILD_DIR)/gsc.ko FILES:=$(PKG_BUILD_DIR)/gsc.ko

2
package/kernel/linux/modules/hwmon.mk
View File

@ -26,7 +26,7 @@ $(eval $(call KernelPackage,hwmon-core))
define AddDepends/hwmon define AddDepends/hwmon
SUBMENU:=$(HWMON_MENU) SUBMENU:=$(HWMON_MENU)
DEPENDS:=kmod-hwmon-core $(1) DEPENDS:=+kmod-hwmon-core $(1)
endef endef
define KernelPackage/hwmon-ads1015 define KernelPackage/hwmon-ads1015

5
target/linux/kirkwood/image/Makefile
View File

@ -65,7 +65,7 @@ define Device/iom_ix2-200
DEVICE_VENDOR := Iomega DEVICE_VENDOR := Iomega
DEVICE_MODEL := StorCenter ix2-200 DEVICE_MODEL := StorCenter ix2-200
DEVICE_DTS := kirkwood-iomega_ix2_200 DEVICE_DTS := kirkwood-iomega_ix2_200
DEVICE_PACKAGES := kmod-gpio-button-hotplug kmod-hwmon-core kmod-hwmon-lm63 DEVICE_PACKAGES := kmod-gpio-button-hotplug kmod-hwmon-lm63
DEVICE_TYPE:=nas DEVICE_TYPE:=nas
PAGESIZE := 512 PAGESIZE := 512
SUBPAGESIZE := 256 SUBPAGESIZE := 256
@ -137,8 +137,7 @@ TARGET_DEVICES += seagate_goflexhome
define Device/zyxel_nsa310b define Device/zyxel_nsa310b
DEVICE_VENDOR := ZyXEL DEVICE_VENDOR := ZyXEL
DEVICE_MODEL := NSA310b DEVICE_MODEL := NSA310b
DEVICE_PACKAGES := kmod-r8169 kmod-gpio-button-hotplug kmod-hwmon-core \ DEVICE_PACKAGES := kmod-r8169 kmod-gpio-button-hotplug kmod-hwmon-lm85
kmod-hwmon-lm85
BOARD_NAME := nsa310b BOARD_NAME := nsa310b
endef endef
TARGET_DEVICES += zyxel_nsa310b TARGET_DEVICES += zyxel_nsa310b

2
target/linux/mpc85xx/image/Makefile
View File

@ -111,7 +111,7 @@ define Device/freescale_p2020rdb
DEVICE_VENDOR := Freescale DEVICE_VENDOR := Freescale
DEVICE_MODEL := P2020RDB DEVICE_MODEL := P2020RDB
DEVICE_DTS_DIR := $(DTS_DIR)/fsl DEVICE_DTS_DIR := $(DTS_DIR)/fsl
DEVICE_PACKAGES := kmod-hwmon-core kmod-hwmon-lm90 kmod-rtc-ds1307 \ DEVICE_PACKAGES := kmod-hwmon-lm90 kmod-rtc-ds1307 \
kmod-gpio-pca953x kmod-eeprom-at24 kmod-gpio-pca953x kmod-eeprom-at24
BLOCKSIZE := 128k BLOCKSIZE := 128k
KERNEL := kernel-bin | gzip | \ KERNEL := kernel-bin | gzip | \

2
target/linux/oxnas/image/ox820.mk
View File

@ -71,7 +71,7 @@ define Device/shuttle_kd20
KERNEL_INITRAMFS = kernel-bin | append-dtb | uImage none | omninas-factory | encrypt-3des sohmuntitnlaes KERNEL_INITRAMFS = kernel-bin | append-dtb | uImage none | omninas-factory | encrypt-3des sohmuntitnlaes
DEVICE_PACKAGES := kmod-usb2-oxnas kmod-ata-oxnas-sata kmod-usb-ledtrig-usbport \ DEVICE_PACKAGES := kmod-usb2-oxnas kmod-ata-oxnas-sata kmod-usb-ledtrig-usbport \
kmod-usb3 kmod-i2c-gpio kmod-rtc-pcf8563 kmod-gpio-beeper \ kmod-usb3 kmod-i2c-gpio kmod-rtc-pcf8563 kmod-gpio-beeper \
kmod-hwmon-core kmod-hwmon-gpiofan \ kmod-hwmon-gpiofan \
kmod-md-mod kmod-md-raid0 kmod-md-raid1 kmod-fs-ext4 kmod-fs-xfs kmod-md-mod kmod-md-raid0 kmod-md-raid1 kmod-fs-ext4 kmod-fs-xfs
endef endef
TARGET_DEVICES += shuttle_kd20 TARGET_DEVICES += shuttle_kd20

5
target/linux/oxnas/ox820/profiles/00-default.mk
View File

@ -9,9 +9,8 @@ define Profile/Default
NAME:=Default Profile NAME:=Default Profile
PRIORITY:=1 PRIORITY:=1
PACKAGES:=\ PACKAGES:=\
kmod-i2c-gpio kmod-gpio-beeper kmod-hwmon-core \ kmod-i2c-gpio kmod-gpio-beeper kmod-hwmon-gpiofan \
kmod-hwmon-gpiofan kmod-rtc-pcf8563 kmod-rtc-ds1307 \ kmod-rtc-pcf8563 kmod-rtc-ds1307 kmod-usb3
kmod-usb3
endef endef
define Profile/Default/Description define Profile/Default/Description