From d4ac0ad543027b6ac862fcd84f2aeae05f2b669e Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Wed, 5 Aug 2020 12:03:13 +0200 Subject: [PATCH] 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 --- package/kernel/linux/modules/usb.mk | 2 +- target/linux/ath79/image/generic-tp-link.mk | 2 +- target/linux/ath79/image/generic.mk | 4 ++-- target/linux/mxs/profiles/02-olinuxino-maxi.mk | 2 +- target/linux/omap/image/Makefile | 2 +- target/linux/omap/profiles/00-default.mk | 1 - target/linux/ramips/image/mt7620.mk | 2 +- target/linux/ramips/image/rt305x.mk | 2 +- target/linux/rockchip/image/armv8.mk | 2 +- target/linux/sunxi/image/cortexa7.mk | 2 +- 10 files changed, 10 insertions(+), 11 deletions(-) diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk index e833c139a0e9..e4f6a226fdfc 100644 --- a/package/kernel/linux/modules/usb.mk +++ b/package/kernel/linux/modules/usb.mk @@ -1136,7 +1136,7 @@ $(eval $(call KernelPackage,usb-net)) define AddDepends/usb-net SUBMENU:=$(USB_MENU) - DEPENDS+=kmod-usb-net $(1) + DEPENDS+=+kmod-usb-net $(1) endef diff --git a/target/linux/ath79/image/generic-tp-link.mk b/target/linux/ath79/image/generic-tp-link.mk index 346944ab6f30..c2cda6b3df36 100644 --- a/target/linux/ath79/image/generic-tp-link.mk +++ b/target/linux/ath79/image/generic-tp-link.mk @@ -428,7 +428,7 @@ define Device/tplink_tl-mr6400-v1 DEVICE_MODEL := TL-MR6400 DEVICE_VARIANT := v1 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 SUPPORTED_DEVICES += tl-mr6400 endef diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index ee798bf321ff..81117f0827e4 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -416,8 +416,8 @@ define Device/comfast_cf-e5 SOC := qca9531 DEVICE_VENDOR := COMFAST DEVICE_MODEL := CF-E5/E7 - DEVICE_PACKAGES := rssileds kmod-usb2 kmod-usb-net \ - kmod-usb-net-qmi-wwan -swconfig -uboot-envtools + DEVICE_PACKAGES := rssileds kmod-usb2 kmod-usb-net-qmi-wwan -swconfig \ + -uboot-envtools IMAGE_SIZE := 16192k endef TARGET_DEVICES += comfast_cf-e5 diff --git a/target/linux/mxs/profiles/02-olinuxino-maxi.mk b/target/linux/mxs/profiles/02-olinuxino-maxi.mk index 59d037668936..e3d1c3b3c094 100644 --- a/target/linux/mxs/profiles/02-olinuxino-maxi.mk +++ b/target/linux/mxs/profiles/02-olinuxino-maxi.mk @@ -8,7 +8,7 @@ define Profile/olinuxino-maxi NAME:=Olimex OLinuXino Maxi/Mini boards 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 endef diff --git a/target/linux/omap/image/Makefile b/target/linux/omap/image/Makefile index 3700788804d3..ce6377f29b48 100644 --- a/target/linux/omap/image/Makefile +++ b/target/linux/omap/image/Makefile @@ -70,7 +70,7 @@ define Device/ti_omap3-beagle DEVICE_VENDOR := BeagleBoard.org DEVICE_MODEL := OMAP3 TI beagleboard # 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-kaweth kmod-usb-net-pegasus kmod-usb-net-mcs7830 \ kmod-usb-net-smsc95xx kmod-usb-net-dm9601-ether diff --git a/target/linux/omap/profiles/00-default.mk b/target/linux/omap/profiles/00-default.mk index 37c0761029f1..e33886d890d4 100644 --- a/target/linux/omap/profiles/00-default.mk +++ b/target/linux/omap/profiles/00-default.mk @@ -8,7 +8,6 @@ define Profile/Default NAME:=Default Profile PACKAGES:= \ - kmod-usb-net \ 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-smsc95xx kmod-usb-net-dm9601-ether \ diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk index 7ebab8d757b5..20aafc95d6f0 100644 --- a/target/linux/ramips/image/mt7620.mk +++ b/target/linux/ramips/image/mt7620.mk @@ -1003,7 +1003,7 @@ define Device/tplink_archer-mr200 TPLINK_HWID := 0xd7500001 TPLINK_HWREV := 0x4a 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 DEVICE_MODEL := Archer MR200 SUPPORTED_DEVICES += mr200 diff --git a/target/linux/ramips/image/rt305x.mk b/target/linux/ramips/image/rt305x.mk index 2cda2fa51b98..7d145c39927f 100644 --- a/target/linux/ramips/image/rt305x.mk +++ b/target/linux/ramips/image/rt305x.mk @@ -474,7 +474,7 @@ define Device/dlink_dwr-512-b DEVICE_MODEL := DWR-512 DEVICE_VARIANT := B 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_FAMILY_MEMBER := 0x6E24 DLINK_FIRMWARE_SIZE := 0x7E0000 diff --git a/target/linux/rockchip/image/armv8.mk b/target/linux/rockchip/image/armv8.mk index 8e4ba07e0b9b..6ba9874abf79 100644 --- a/target/linux/rockchip/image/armv8.mk +++ b/target/linux/rockchip/image/armv8.mk @@ -11,7 +11,7 @@ define Device/friendlyarm_nanopi-r2s SOC := rk3328 UBOOT_DEVICE_NAME := nanopi-r2s-rk3328 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 TARGET_DEVICES += friendlyarm_nanopi-r2s diff --git a/target/linux/sunxi/image/cortexa7.mk b/target/linux/sunxi/image/cortexa7.mk index 8fa648176fb8..69eb321c7f40 100644 --- a/target/linux/sunxi/image/cortexa7.mk +++ b/target/linux/sunxi/image/cortexa7.mk @@ -173,7 +173,7 @@ TARGET_DEVICES += xunlong_orangepi-plus define Device/xunlong_orangepi-r1 DEVICE_VENDOR := Xunlong 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 endef TARGET_DEVICES += xunlong_orangepi-r1 -- 2.30.2