aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2021-02-25 11:54:43 +0100
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2021-06-08 22:50:32 +0200
commitec8fe0a189bc6af9ebf51017512d4e5536421675 (patch)
treede49290e651df4c79efda8e1fa63085f29f328dc
parent4aae7eb3c005b0a7548984fcf4c7e228244af163 (diff)
downloadupstream-ec8fe0a189bc6af9ebf51017512d4e5536421675.tar.gz
upstream-ec8fe0a189bc6af9ebf51017512d4e5536421675.tar.bz2
upstream-ec8fe0a189bc6af9ebf51017512d4e5536421675.zip
treewide: make AddDepends/usb-serial selective
Make packages depending on usb-serial selective, so we do not have to add kmod-usb-serial manually for every device. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> (cherry picked from commit 9397b22df1473f315552578b58322db7f7750361)
-rw-r--r--package/kernel/linux/modules/usb.mk2
-rw-r--r--target/linux/at91/image/sam9x.mk4
-rw-r--r--target/linux/ath79/image/generic-tp-link.mk2
-rw-r--r--target/linux/ath79/image/generic.mk4
-rw-r--r--target/linux/ramips/image/mt7620.mk6
-rw-r--r--target/linux/ramips/image/mt76x8.mk4
-rw-r--r--target/linux/ramips/image/rt305x.mk2
7 files changed, 12 insertions, 12 deletions
diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
index d050165df3..93f99f7cbe 100644
--- a/package/kernel/linux/modules/usb.mk
+++ b/package/kernel/linux/modules/usb.mk
@@ -561,7 +561,7 @@ $(eval $(call KernelPackage,usb-serial))
define AddDepends/usb-serial
SUBMENU:=$(USB_MENU)
- DEPENDS+=kmod-usb-serial $(1)
+ DEPENDS+=+kmod-usb-serial $(1)
endef
diff --git a/target/linux/at91/image/sam9x.mk b/target/linux/at91/image/sam9x.mk
index bbe410fbfb..1a036e493f 100644
--- a/target/linux/at91/image/sam9x.mk
+++ b/target/linux/at91/image/sam9x.mk
@@ -116,8 +116,8 @@ define Device/calamp_lmu5000
$(Device/production)
DEVICE_VENDOR := CalAmp
DEVICE_MODEL := LMU5000
- DEVICE_PACKAGES := kmod-rtc-pcf2123 kmod-usb-acm kmod-usb-serial \
- kmod-usb-serial-option kmod-usb-serial-sierrawireless kmod-gpio-mcp23s08
+ DEVICE_PACKAGES := kmod-rtc-pcf2123 kmod-usb-acm \
+ kmod-usb-serial-option kmod-usb-serial-sierrawireless kmod-gpio-mcp23s08
endef
TARGET_DEVICES += calamp_lmu5000
diff --git a/target/linux/ath79/image/generic-tp-link.mk b/target/linux/ath79/image/generic-tp-link.mk
index 0058d74f77..be6aa06b55 100644
--- a/target/linux/ath79/image/generic-tp-link.mk
+++ b/target/linux/ath79/image/generic-tp-link.mk
@@ -492,7 +492,7 @@ define Device/tplink_tl-mr6400-v1
DEVICE_MODEL := TL-MR6400
DEVICE_VARIANT := v1
TPLINK_HWID := 0x64000001
- DEVICE_PACKAGES := kmod-usb2 kmod-usb-net-rndis kmod-usb-serial \
+ DEVICE_PACKAGES := kmod-usb2 kmod-usb-net-rndis \
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 d93ebbaeba..872e797a31 100644
--- a/target/linux/ath79/image/generic.mk
+++ b/target/linux/ath79/image/generic.mk
@@ -1116,7 +1116,7 @@ define Device/etactica_eg200
DEVICE_VENDOR := eTactica
DEVICE_MODEL := EG200
DEVICE_PACKAGES := kmod-usb-chipidea2 kmod-ledtrig-oneshot \
- kmod-usb-serial kmod-usb-serial-ftdi kmod-usb-storage kmod-fs-ext4
+ kmod-usb-serial-ftdi kmod-usb-storage kmod-fs-ext4
IMAGE_SIZE := 16000k
SUPPORTED_DEVICES += rme-eg200
endef
@@ -2219,7 +2219,7 @@ define Device/zbtlink_zbt-wd323
DEVICE_MODEL := WD323
IMAGE_SIZE := 16000k
DEVICE_PACKAGES := kmod-usb2 kmod-i2c-gpio kmod-rtc-pcf8563 \
- kmod-usb-serial kmod-usb-serial-cp210x uqmi
+ kmod-usb-serial-cp210x uqmi
endef
TARGET_DEVICES += zbtlink_zbt-wd323
diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk
index 949c09662f..fd7e42bf22 100644
--- a/target/linux/ramips/image/mt7620.mk
+++ b/target/linux/ramips/image/mt7620.mk
@@ -445,7 +445,7 @@ define Device/head-weblink_hdrm200
DEVICE_VENDOR := Head Weblink
DEVICE_MODEL := HDRM2000
DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 \
- uqmi kmod-usb-serial kmod-usb-serial-option
+ uqmi kmod-usb-serial-option
endef
TARGET_DEVICES += head-weblink_hdrm200
@@ -1034,7 +1034,7 @@ define Device/tplink_archer-mr200
TPLINK_HWREV := 0x4a
IMAGES := sysupgrade.bin
DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-net-rndis \
- kmod-usb-serial kmod-usb-serial-option adb-enablemodem
+ kmod-usb-serial-option adb-enablemodem
DEVICE_MODEL := Archer MR200
SUPPORTED_DEVICES += mr200
endef
@@ -1221,7 +1221,7 @@ define Device/zbtlink_zbt-we826-e
DEVICE_VENDOR := Zbtlink
DEVICE_MODEL := ZBT-WE826-E
DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 uqmi \
- kmod-usb-serial kmod-usb-serial-option
+ kmod-usb-serial-option
endef
TARGET_DEVICES += zbtlink_zbt-we826-e
diff --git a/target/linux/ramips/image/mt76x8.mk b/target/linux/ramips/image/mt76x8.mk
index 315d4f8d74..c5a0baa1cb 100644
--- a/target/linux/ramips/image/mt76x8.mk
+++ b/target/linux/ramips/image/mt76x8.mk
@@ -528,7 +528,7 @@ define Device/tplink_tl-mr6400-v4
TPLINK_HWREV := 0x4
TPLINK_HWREVADD := 0x4
DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport \
- kmod-usb-serial kmod-usb-serial-option kmod-usb-net-qmi-wwan uqmi
+ kmod-usb-serial-option kmod-usb-net-qmi-wwan uqmi
IMAGES := sysupgrade.bin tftp-recovery.bin
IMAGE/tftp-recovery.bin := pad-extra 128k | $$(IMAGE/factory.bin)
endef
@@ -544,7 +544,7 @@ define Device/tplink_tl-mr6400-v5
TPLINK_HWREV := 0x5
TPLINK_HWREVADD := 0x5
DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport \
- kmod-usb-serial kmod-usb-serial-option kmod-usb-net-qmi-wwan uqmi
+ kmod-usb-serial-option kmod-usb-net-qmi-wwan uqmi
IMAGES := sysupgrade.bin tftp-recovery.bin
IMAGE/tftp-recovery.bin := pad-extra 128k | $$(IMAGE/factory.bin)
endef
diff --git a/target/linux/ramips/image/rt305x.mk b/target/linux/ramips/image/rt305x.mk
index 5483b8a369..4edc2eb3c4 100644
--- a/target/linux/ramips/image/rt305x.mk
+++ b/target/linux/ramips/image/rt305x.mk
@@ -472,7 +472,7 @@ define Device/dlink_dwr-512-b
DEVICE_VENDOR := D-Link
DEVICE_MODEL := DWR-512
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-option kmod-usb-net-cdc-ether comgt-ncm
DLINK_ROM_ID := DLK6E2412001
DLINK_FAMILY_MEMBER := 0x6E24