From patchwork Wed Aug 5 10:03:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1341185 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; dmarc=fail (p=none dis=none) header.from=adrianschmutzler.de 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=C6TxQz/8; 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 4BM6h20qytz9sRN for ; Wed, 5 Aug 2020 20:05:38 +1000 (AEST) 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=qCfOG1W0owW8x3bZ8JwjdlkHpT08Mon2RyEoi0BzJCs=; b=C6TxQz/8Nr8dq4NDDONIKPEmum cdw6Zy2OlrgJZRTr3zTlrJlRX6S0C1tniNe78Rnme2RO6LdqXG5LJhV9Drr2/NsesF0bpOjTYekQV l+Fjj+1ytLB58X0ufCoqqEeziu5xwfxELnM9oqvMpJU7Oj49ypu2VZ0yLMsZfADknJQ4q4WitlP2z oXyK/CUKjJvpAzW1ESy0yFShSXy5aURvi9NAomBJRJcd+VIYHv7ei3KdXdfajzyyw00Op6tvoOg+t bOAUKBu4x8EVigKABCfIaajqmbyyBb1/GCs1N6XiUcn0CYnxPLKQEgJMQhMlY/PFv+oSP2ZFntMEF wDnzAUbA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k3GHS-000423-HJ; Wed, 05 Aug 2020 10:04:18 +0000 Received: from mout.kundenserver.de ([217.72.192.73]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k3GHP-00041W-JB for openwrt-devel@lists.openwrt.org; Wed, 05 Aug 2020 10:04:17 +0000 Received: from buildfff.adridolf.com ([188.192.134.246]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1M894P-1k7PH548jj-005Dzy for ; Wed, 05 Aug 2020 12:04:13 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH v2] treewide: make dependency on kmod-usb-net selective Date: Wed, 5 Aug 2020 12:03:13 +0200 Message-Id: <20200805100313.2047-1-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:SDPbbiIya8WPqyrFBVktiQps1YiGAFjAYenvQEmvb4tztGEfyQa JLo5cGIIMiR1wJ7JGHw3bn1NjJLYxkaw2ZUsNn2NcBmsEN2kXG4QDmg7DCwBQCkl6malr7u 2gttCTdeCRnN0HgoY7yU9z6fE/F/ZzCw69P/914GqvZRtDCEb5yQfR8ZRfmKozNh1TVWZ2Q oh3ZM7p4G2shkXE9SXeuQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:0vaySYKI0SA=:n3Bl2ALgM2VMs5dmFB93y/ REWW10t+ECctuNTuRZklqN0FOp7wMnVghr7cjuxwqbta4q2p9VIp0sbcJR6LDxEWZwbn/UxK1 A5+UlslAx7dCKOb6cloaAk7V2aRnH36S+taSspMSXW8KJB5xVfFDZjFtdBUGevNyu0GAicnFh DUkopbd0YbyMIWdJp4f+XT4bG6TAZ/wJkLYmohfS7kk9kdSYaw/wl/OcZmqlmSXAE4Xfk9W8X Zt0JJjVgnmxp5W6qs1ZghRqevjpwWIvK4Vj0FtrYnoAANmKBDndkBTcz+mQtsPkUlfZTNU2SQ Lssui+cv5xYTmDHzTQ3Rx2vk0yDBBFWznc7eXw4QHfNrSJu5Xr8CKUWZBKdwutZoKlq1TrVik RAvZ5xr6RZA9/4ZnyC8J7+am3maBflRGzSJZoem8stWLeRgqW1OtT7OkrUv5oUAZHxQfOtypG oB/QKNrB8v9PamYW94bNDk1DJ5dYFkGjyvz10V3ahck788c5mmQ7GJ7egNcKGEu/xwrIR6a2c eHQx3HzOsBBjns8Y6A/ct0H11jXreSB1Nx/jUI+UE5ReicBeRMIhN7jgjX4/JGOoRvpBUjNDF MIdtoiT4TszSTisLDLlsLblb3H5/iSwDqgOSHfy6bM1fkEN8UXbqaH8oMNqwUB/jWylqBdmXu 908mcp+ox5Bd2HF3zRimWKfZkYNm7qRTA3I6dDfcxLDmacsGea+OzPEbKKvngkYYPFU7KrBf1 2Wdiq5SHDVG0d8iRYREFdcKFqUyuEdyB5z5ubMZ/JelMhhY4dut2QO6j1ODveJabel6J27Oyx d/Tk6saeqc57+LVR/OCH9ac97WO04Euc6SOSf+cvmTGBkXP+NYRW7ppGxHX+xeRwNkVPLDVnE 49IhQRGjx4hMaiqv8cjg== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200805_060415_859403_EE7C025F X-CRM114-Status: GOOD ( 12.73 ) 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_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [217.72.192.73 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [217.72.192.73 listed in wl.mailspike.net] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -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 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 --- Changes in v2: - actually include the package change this time --- 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 e833c139a0..e4f6a226fd 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 967eb2a7c3..d884d6f9c8 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 6b7bfb4639..7eaaa28ae9 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 59d0376689..e3d1c3b3c0 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 3700788804..ce6377f29b 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 37c0761029..e33886d890 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 7ebab8d757..20aafc95d6 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 b75d9078e5..853c145cb4 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 8e4ba07e0b..6ba9874abf 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 8fa648176f..69eb321c7f 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