From patchwork Thu Feb 25 10:56:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1444281 X-Patchwork-Delegate: freifunk@adrianschmutzler.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=FP3BfSvS; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DmVCj1X6Kz9sBy for ; Thu, 25 Feb 2021 21:59:12 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:MIME-Version:Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Owner; bh=RjiaIDcVwgOiAr73q/6JJmpMU5Cv0BkWYPaTZnCF45I=; b=FP3BfSvS3kTJGFxF1gZ+TNVvD8 D9egkp8lifA/9jZDOw4vXQy0Nd5KxcbNYKlpL4IKrp64bXuk984OFKYHLOoMZsCyF9kbpv4IazBIU szjPSydepWc8yGVTDwSqxTnn16gKzOxPBdk/kGlsdIv/CQAA6H92h90e+URvsezz5fOidD5Z1yqj1 5HCxox86VRAn8qryD0Lb/ZUQGlXOu4yUkQ3erf6JpZFz8HITdwGaacaQD03ZQqAktF8+gXpmPkoFF kO1ajMa4nBmvyWxIZBRUHRZ5qsBQkHZejBSpGgdNPSNVGwbf3bo8DpnAVBiQE/X/28DtuueLuC3Xs EGr/d7Lg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lFEKS-0005fZ-DD; Thu, 25 Feb 2021 10:57:08 +0000 Received: from mout.kundenserver.de ([212.227.126.133]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1lFEKP-0005eV-45 for openwrt-devel@lists.openwrt.org; Thu, 25 Feb 2021 10:57:06 +0000 Received: from buildfff.adridolf.com ([178.26.242.49]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1N1fzM-1lzOx02to0-0123Qz for ; Thu, 25 Feb 2021 11:56:58 +0100 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH] treewide: make AddDepends/usb-serial selective Date: Thu, 25 Feb 2021 11:56:13 +0100 Message-Id: <20210225105613.1471-1-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:o+QUxDWbSXBPgDWDgr1XMK6Pq+7XU35lDGOxFXfuLn19/Vu09Cq of3vOcuvSw5nyI8KwhtiQh2Ry+BfDfD5BlBfP/ir1AWuUsewHlr9MsOe+hNbk3dF2COzxrp lMFg9pqgaLi2wD3nV+gpgadmxLL3Y+ajv9/vTykj0WbO6G/9v/cKMTerKbpiMV3AZH9TQEy OdiVH5mGp/7tFeTT4zatw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:97iW2KRC/64=:uI2/TnPFF8l6uYRRMctjVi gySO7bVLOmmDMZj+b5xsj2TV9K/TEIjFL29iQu8/NcvDJxuLAj1gFCbRzZ2GI/Jg2CFcePGWe Rs04C6QoxoGqZmFl209LbrCQkZYxAyRvWfvlQundKEOFNXTx4J9twBWFj/t7lvJK4ogRCqbYG ao0epT9NK77slr3PEWgtP4/mbzDkdA9PlKrqR1etQF4z099hQz9NYAddI6pxgewl0MQz3XX4q mb8eTF7+kTJiTSUEG/LNE0dPL22RL6TUy0uDoZzIZ+CfKGDOnfv2v5pOCRsIZe+Vgn25hSACH Ayb3oNXIGCLTYDxQj7tunb6+uZsaDj+wKpv0GmcGiXsT57FDZCxMCZI5sLZ4+85/sF0J6csZ9 wLagrmzvdho2dM8VS+oX+daUCp3rqcILq7oTJaYX9GfltPTtVcHHANxotmsSOJedQ/94pCngk bEV9JzIvzA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210225_055705_391731_7A9891B8 X-CRM114-Status: GOOD ( 10.45 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.126.133 listed in wl.mailspike.net] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [212.227.126.133 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org 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 --- package/kernel/linux/modules/usb.mk | 2 +- target/linux/at91/image/sam9x.mk | 4 ++-- target/linux/ath79/image/generic-tp-link.mk | 2 +- target/linux/ath79/image/generic.mk | 4 ++-- target/linux/ramips/image/mt7620.mk | 6 +++--- target/linux/ramips/image/mt76x8.mk | 4 ++-- target/linux/ramips/image/rt305x.mk | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk index e7498af31c..a782e81a8a 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 759f94e5d3..a746bcfb8e 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -1099,7 +1099,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 @@ -2202,7 +2202,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 f8905ad2b7..327df51e58 100644 --- a/target/linux/ramips/image/mt7620.mk +++ b/target/linux/ramips/image/mt7620.mk @@ -442,7 +442,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 @@ -1031,7 +1031,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 @@ -1218,7 +1218,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 7ba2acacb8..d5a9684dba 100644 --- a/target/linux/ramips/image/mt76x8.mk +++ b/target/linux/ramips/image/mt76x8.mk @@ -527,7 +527,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 @@ -543,7 +543,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 429afc7833..95b6ea7389 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