hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

treewide: make dependency on kmod-usb-net selective 

A bunch of kernel modules depends on kmod-usb-net, but does not
select it. Make AddDepends/usb-net selective, so we can drop
some redundant +kmod-usb-net definitions for DEVICE_PACKAGES.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
master
Adrian Schmutzler 2020-08-05 12:03:13 +02:00
parent c00b8dcf72
commit d4ac0ad543
10 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1136,7 +1136,7 @@ $(eval $(call KernelPackage,usb-net))
define AddDepends/usb-net define AddDepends/usb-net
SUBMENU:=$(USB_MENU) SUBMENU:=$(USB_MENU)
DEPENDS+=kmod-usb-net $(1) DEPENDS+=+kmod-usb-net $(1)
endef endef

2
target/linux/ath79/image/generic-tp-link.mk
View File

@ -428,7 +428,7 @@ define Device/tplink_tl-mr6400-v1
DEVICE_MODEL := TL-MR6400 DEVICE_MODEL := TL-MR6400
DEVICE_VARIANT := v1 DEVICE_VARIANT := v1
TPLINK_HWID := 0x64000001 TPLINK_HWID := 0x64000001
DEVICE_PACKAGES := kmod-usb2 kmod-usb-net kmod-usb-net-rndis kmod-usb-serial \ DEVICE_PACKAGES := kmod-usb2 kmod-usb-net-rndis kmod-usb-serial \
kmod-usb-serial-option adb-enablemodem kmod-usb-serial-option adb-enablemodem
SUPPORTED_DEVICES += tl-mr6400 SUPPORTED_DEVICES += tl-mr6400
endef endef

4
target/linux/ath79/image/generic.mk
View File

@ -416,8 +416,8 @@ define Device/comfast_cf-e5
SOC := qca9531 SOC := qca9531
DEVICE_VENDOR := COMFAST DEVICE_VENDOR := COMFAST
DEVICE_MODEL := CF-E5/E7 DEVICE_MODEL := CF-E5/E7
DEVICE_PACKAGES := rssileds kmod-usb2 kmod-usb-net \ DEVICE_PACKAGES := rssileds kmod-usb2 kmod-usb-net-qmi-wwan -swconfig \
kmod-usb-net-qmi-wwan -swconfig -uboot-envtools -uboot-envtools
IMAGE_SIZE := 16192k IMAGE_SIZE := 16192k
endef endef
TARGET_DEVICES += comfast_cf-e5 TARGET_DEVICES += comfast_cf-e5

2
target/linux/mxs/profiles/02-olinuxino-maxi.mk
View File

@ -8,7 +8,7 @@
define Profile/olinuxino-maxi define Profile/olinuxino-maxi
NAME:=Olimex OLinuXino Maxi/Mini boards NAME:=Olimex OLinuXino Maxi/Mini boards
PACKAGES += imx-bootlets uboot-mxs-mx23_olinuxino \ PACKAGES += imx-bootlets uboot-mxs-mx23_olinuxino \
kmod-usb-net kmod-usb-net-smsc95xx kmod-gpio-mcp23s08 \ kmod-usb-net-smsc95xx kmod-gpio-mcp23s08 \
kmod-leds-gpio kmod-ledtrig-heartbeat kmod-sound-core kmod-leds-gpio kmod-ledtrig-heartbeat kmod-sound-core
endef endef

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

@ -70,7 +70,7 @@ define Device/ti_omap3-beagle
DEVICE_VENDOR := BeagleBoard.org DEVICE_VENDOR := BeagleBoard.org
DEVICE_MODEL := OMAP3 TI beagleboard DEVICE_MODEL := OMAP3 TI beagleboard
# beagleboard doesn't have a network interface, support most common usb net # beagleboard doesn't have a network interface, support most common usb net
DEVICE_PACKAGES := kmod-usb-net \ DEVICE_PACKAGES := \
kmod-usb-net-asix kmod-usb-net-asix-ax88179 kmod-usb-net-hso \ kmod-usb-net-asix kmod-usb-net-asix-ax88179 kmod-usb-net-hso \
kmod-usb-net-kaweth kmod-usb-net-pegasus kmod-usb-net-mcs7830 \ kmod-usb-net-kaweth kmod-usb-net-pegasus kmod-usb-net-mcs7830 \
kmod-usb-net-smsc95xx kmod-usb-net-dm9601-ether kmod-usb-net-smsc95xx kmod-usb-net-dm9601-ether

1
target/linux/omap/profiles/00-default.mk
View File

@ -8,7 +8,6 @@
define Profile/Default define Profile/Default
NAME:=Default Profile NAME:=Default Profile
PACKAGES:= \ PACKAGES:= \
kmod-usb-net \
kmod-usb-net-asix kmod-usb-net-asix-ax88179 kmod-usb-net-hso \ kmod-usb-net-asix kmod-usb-net-asix-ax88179 kmod-usb-net-hso \
kmod-usb-net-kaweth kmod-usb-net-pegasus kmod-usb-net-mcs7830 \ kmod-usb-net-kaweth kmod-usb-net-pegasus kmod-usb-net-mcs7830 \
kmod-usb-net-smsc95xx kmod-usb-net-dm9601-ether \ kmod-usb-net-smsc95xx kmod-usb-net-dm9601-ether \

2
target/linux/ramips/image/mt7620.mk
View File

@ -1003,7 +1003,7 @@ define Device/tplink_archer-mr200
TPLINK_HWID := 0xd7500001 TPLINK_HWID := 0xd7500001
TPLINK_HWREV := 0x4a TPLINK_HWREV := 0x4a
IMAGES := sysupgrade.bin IMAGES := sysupgrade.bin
DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-net kmod-usb-net-rndis \ DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-net-rndis \
kmod-usb-serial kmod-usb-serial-option adb-enablemodem kmod-usb-serial kmod-usb-serial-option adb-enablemodem
DEVICE_MODEL := Archer MR200 DEVICE_MODEL := Archer MR200
SUPPORTED_DEVICES += mr200 SUPPORTED_DEVICES += mr200

2
target/linux/ramips/image/rt305x.mk
View File

@ -474,7 +474,7 @@ define Device/dlink_dwr-512-b
DEVICE_MODEL := DWR-512 DEVICE_MODEL := DWR-512
DEVICE_VARIANT := B DEVICE_VARIANT := B
DEVICE_PACKAGES := jboot-tools kmod-usb2 kmod-spi-dev kmod-usb-serial \ DEVICE_PACKAGES := jboot-tools kmod-usb2 kmod-spi-dev kmod-usb-serial \
kmod-usb-serial-option kmod-usb-net kmod-usb-net-cdc-ether comgt-ncm kmod-usb-serial-option kmod-usb-net-cdc-ether comgt-ncm
DLINK_ROM_ID := DLK6E2412001 DLINK_ROM_ID := DLK6E2412001
DLINK_FAMILY_MEMBER := 0x6E24 DLINK_FAMILY_MEMBER := 0x6E24
DLINK_FIRMWARE_SIZE := 0x7E0000 DLINK_FIRMWARE_SIZE := 0x7E0000

2
target/linux/rockchip/image/armv8.mk
View File

@ -11,7 +11,7 @@ define Device/friendlyarm_nanopi-r2s
SOC := rk3328 SOC := rk3328
UBOOT_DEVICE_NAME := nanopi-r2s-rk3328 UBOOT_DEVICE_NAME := nanopi-r2s-rk3328
IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r2s | pine64-img | gzip | append-metadata IMAGE/sysupgrade.img.gz := boot-common | boot-script nanopi-r2s | pine64-img | gzip | append-metadata
DEVICE_PACKAGES := kmod-usb-net kmod-usb-net-rtl8152 DEVICE_PACKAGES := kmod-usb-net-rtl8152
endef endef
TARGET_DEVICES += friendlyarm_nanopi-r2s TARGET_DEVICES += friendlyarm_nanopi-r2s

2
target/linux/sunxi/image/cortexa7.mk
View File

@ -173,7 +173,7 @@ TARGET_DEVICES += xunlong_orangepi-plus
define Device/xunlong_orangepi-r1 define Device/xunlong_orangepi-r1
DEVICE_VENDOR := Xunlong DEVICE_VENDOR := Xunlong
DEVICE_MODEL := Orange Pi R1 DEVICE_MODEL := Orange Pi R1
DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-usb-net kmod-usb-net-rtl8152 DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-usb-net-rtl8152
SOC := sun8i-h2-plus SOC := sun8i-h2-plus
endef endef
TARGET_DEVICES += xunlong_orangepi-r1 TARGET_DEVICES += xunlong_orangepi-r1