From patchwork Sat Aug 22 11:50:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1349657 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=0j/FhUqL; 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 4BYcGk032Dz9sPf for ; Sat, 22 Aug 2020 21:53:33 +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=sKwKSorVnQmnT1qrevr3CAV2Vk6t5ge3FF2oFOVoGfs=; b=0j/FhUqL2MJq2sxH9x9k+leU3E t6jBNhy1nz7KyLIP/0ejC2D43hmdN3ma341TWf+MzWc7ggQWD8uleTAkolVbAuUgEzgxNhX1wLJyP 4Hil+09579m8qEgj5cyYZpdtblPF0F32q8f6l+izDHWAh8jL6WHv5RyaXcH/Lg0l9txuzxe7akD0r /LiZMqBCFualiCvKZDQa+gZZn+CieJ7qhTxeCRaqAy4+jIBIevLmUXEel43MHSsZ/74Mb8KIQS57l hoDDAtOkZIXjQKER/gn/QsVO51yAunWvs+Q/wDpB2qWhYxQ4G+i4hz06QrS+Th8KEXq0P/cF3BXDZ 2hzb1zWg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k9S3q-0007bE-Hg; Sat, 22 Aug 2020 11:51:50 +0000 Received: from mout.kundenserver.de ([212.227.126.130]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k9S3m-0007am-Ez for openwrt-devel@lists.openwrt.org; Sat, 22 Aug 2020 11:51:48 +0000 Received: from buildfff.adridolf.com ([188.192.134.246]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1M5wgF-1kGLod3OBf-007VKr for ; Sat, 22 Aug 2020 13:51:40 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH] kernel: set WATCHDOG_CORE dependency in kmod-hwmon-sch5627 Date: Sat, 22 Aug 2020 13:50:51 +0200 Message-Id: <20200822115051.20655-1-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:1r/iqziQCV5kF/WJDEIlzSH/Ey/lGdsiWKXbUZFiMiAjX9EKUYF LmugF6/ugM+l9g4DzX1ALjRTztdkkld1osRNLuo01ELluuVJxcpk0oQGMXr4a5c9mhgVLL1 C6U1JJC6TSTf4ugTkYRJhMPVYHlA7Ua1qEBDd+J+Ui6bXKmSjjDZbiiU6cRrkjMcrGibN4o iryKLYVCJmWOLlfUHKtWA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:nJrLL1kwd9Q=:jh8AstG6FOoWx6SZRY2s5m uYAH6N2FxNUNXsHKYGSG5sBxgdHG9iQnMTWpH3VzRggJqg/9rGlyxCxoHthhosHmIwYzs5wPj P0MDjvBdd9c2UceUKCMa25cdG6lIcLCSHkk6Z8bosgXmdw/BzLgjH5B47Y08w+fNW8E1PNP4Y rE6mLwor7BXSSACnaFUyfbhorpN92Env7pCGzhPaQAjMp4X0sRIsqtoEZhVrNOT//YyUhaiUU TQJKyBhHt2mZ4q5v0tGTkKe4HI6pneFVqSaRcBDRj+m+jSn+Ld/OeqUcEV1wr4sH1+kM0sxIB dweRuB4Sc5dbeCMwcUBBKJdj7sR2MUp1O0IMijNZGwfS2/3V3JSOLX1G8ijqbTNgdD59htEOt J0gGGkqeFeuJ9AtgF63AkEbAfIcAkFKOxLc6QcgGGWy/Ua6GbwEepPjCoWkv/4oeoh6je7uUD ufG3Ls4GKBmlwwf1uAjoMJ0ypj9o5Twt+Tq9TbGFvU541GEn7uJh9S/bTTwlw7roDpK8x+Q4a WnhgAkmD/YHgxXkIr7ptcq8xD0VQctNbp9XCfwmPAkusd6ZRh2/tyHpwvylal2J7u71/9Vk/W 7M2Ikoo2kB3roJh/txa+urNzvmUVsVH/ddyFbp09JGPp8f8xk5MJ7iiq0S7QIrMl5Cp/0wTr1 xDjjDcfqRBbAnnuRo7tXQ4snm1/69RbPGDHGU4yVGbMLpaRD0NhsBuSgL3LT7wbA93XhFTYwP nvghbB6VilozmFeHjOLAFNQXEcJwGysLN9R/DuyUhYHT3q37X2MEtpr1643mGMKWTQobzcEYx 8w5J1yhb7KLpyj1DN4CKjsv1Czr0goUWkMcA2NbyennaJQuLuXYzAMcTdewz2iBuLtz9rbAw4 SF3PFus/YtWtuGDFRV4w== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200822_075147_613234_25D4FB50 X-CRM114-Status: GOOD ( 12.11 ) 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 [212.227.126.130 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.126.130 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an 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 For many target we have added CONFIG_WATCHDOG_CORE=y to the target config due to the following error: Package kmod-hwmon-sch5627 is missing dependencies for the following libraries: watchdog.ko However, actually the proper way appears to be setting the dependency for the kmod-hwmon-sch5627 package, as the error message demands. Do this in this patch and remove the target config entries added due to this issue. Signed-off-by: Adrian Schmutzler --- package/kernel/linux/modules/hwmon.mk | 4 +++- target/linux/arc770/config-5.4 | 1 - target/linux/armvirt/config-5.4 | 1 - target/linux/ath79/config-5.4 | 1 - target/linux/bcm63xx/config-5.4 | 1 - target/linux/malta/config-5.4 | 1 - target/linux/x86/geode/config-4.19 | 1 - target/linux/x86/geode/config-5.4 | 1 - target/linux/x86/legacy/config-4.19 | 1 - target/linux/x86/legacy/config-5.4 | 1 - 10 files changed, 3 insertions(+), 10 deletions(-) diff --git a/package/kernel/linux/modules/hwmon.mk b/package/kernel/linux/modules/hwmon.mk index 0b9e9d8b13..a39a8910f0 100644 --- a/package/kernel/linux/modules/hwmon.mk +++ b/package/kernel/linux/modules/hwmon.mk @@ -409,7 +409,9 @@ $(eval $(call KernelPackage,hwmon-pwmfan)) define KernelPackage/hwmon-sch5627 TITLE:=SMSC SCH5627 monitoring support - KCONFIG:=CONFIG_SENSORS_SCH5627 + KCONFIG:= \ + CONFIG_SENSORS_SCH5627 \ + CONFIG_WATCHDOG_CORE=y FILES:= \ $(LINUX_DIR)/drivers/hwmon/sch5627.ko \ $(LINUX_DIR)/drivers/hwmon/sch56xx-common.ko diff --git a/target/linux/arc770/config-5.4 b/target/linux/arc770/config-5.4 index fcbad961fd..ce712b4c34 100644 --- a/target/linux/arc770/config-5.4 +++ b/target/linux/arc770/config-5.4 @@ -196,4 +196,3 @@ CONFIG_TIMER_PROBE=y CONFIG_TREE_SRCU=y CONFIG_UNINLINE_SPIN_UNLOCK=y CONFIG_USB_SUPPORT=y -CONFIG_WATCHDOG_CORE=y diff --git a/target/linux/armvirt/config-5.4 b/target/linux/armvirt/config-5.4 index 0754831fe4..4842825a1e 100644 --- a/target/linux/armvirt/config-5.4 +++ b/target/linux/armvirt/config-5.4 @@ -237,5 +237,4 @@ CONFIG_VIRTIO_MMIO=y CONFIG_VIRTIO_NET=y CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_PCI_LEGACY=y -CONFIG_WATCHDOG_CORE=y CONFIG_XPS=y diff --git a/target/linux/ath79/config-5.4 b/target/linux/ath79/config-5.4 index 6ef32cfefa..0f5352a921 100644 --- a/target/linux/ath79/config-5.4 +++ b/target/linux/ath79/config-5.4 @@ -245,4 +245,3 @@ CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_TINY_SRCU=y CONFIG_USB_SUPPORT=y CONFIG_USE_OF=y -CONFIG_WATCHDOG_CORE=y diff --git a/target/linux/bcm63xx/config-5.4 b/target/linux/bcm63xx/config-5.4 index 6c2cbb4cc3..dd4d67224c 100644 --- a/target/linux/bcm63xx/config-5.4 +++ b/target/linux/bcm63xx/config-5.4 @@ -277,6 +277,5 @@ CONFIG_TINY_SRCU=y CONFIG_USB_SUPPORT=y CONFIG_USE_OF=y CONFIG_VM_EVENT_COUNTERS=y -CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_NOWAYOUT=y CONFIG_WEAK_ORDERING=y diff --git a/target/linux/malta/config-5.4 b/target/linux/malta/config-5.4 index 2b678cead6..29566ee171 100644 --- a/target/linux/malta/config-5.4 +++ b/target/linux/malta/config-5.4 @@ -340,5 +340,4 @@ CONFIG_VT=y CONFIG_VT_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_VXFS_FS=y -CONFIG_WATCHDOG_CORE=y CONFIG_XPS=y diff --git a/target/linux/x86/geode/config-4.19 b/target/linux/x86/geode/config-4.19 index 316111aa0e..651c369178 100644 --- a/target/linux/x86/geode/config-4.19 +++ b/target/linux/x86/geode/config-4.19 @@ -121,7 +121,6 @@ CONFIG_VGACON_SOFT_SCROLLBACK=y CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 CONFIG_VIA_RHINE=y CONFIG_VIA_RHINE_MMIO=y -CONFIG_WATCHDOG_CORE=y # CONFIG_WDT is not set # CONFIG_X86_ACPI_CPUFREQ is not set # CONFIG_X86_AMD_PLATFORM_DEVICE is not set diff --git a/target/linux/x86/geode/config-5.4 b/target/linux/x86/geode/config-5.4 index 316111aa0e..651c369178 100644 --- a/target/linux/x86/geode/config-5.4 +++ b/target/linux/x86/geode/config-5.4 @@ -121,7 +121,6 @@ CONFIG_VGACON_SOFT_SCROLLBACK=y CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 CONFIG_VIA_RHINE=y CONFIG_VIA_RHINE_MMIO=y -CONFIG_WATCHDOG_CORE=y # CONFIG_WDT is not set # CONFIG_X86_ACPI_CPUFREQ is not set # CONFIG_X86_AMD_PLATFORM_DEVICE is not set diff --git a/target/linux/x86/legacy/config-4.19 b/target/linux/x86/legacy/config-4.19 index c1cd353114..2e5199185a 100644 --- a/target/linux/x86/legacy/config-4.19 +++ b/target/linux/x86/legacy/config-4.19 @@ -206,7 +206,6 @@ CONFIG_USB_STORAGE=y CONFIG_VGACON_SOFT_SCROLLBACK=y # CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT_ENABLE_BY_DEFAULT is not set CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 -CONFIG_WATCHDOG_CORE=y # CONFIG_WDT is not set CONFIG_X86_ACPI_CPUFREQ=y # CONFIG_X86_ACPI_CPUFREQ_CPB is not set diff --git a/target/linux/x86/legacy/config-5.4 b/target/linux/x86/legacy/config-5.4 index c1cd353114..2e5199185a 100644 --- a/target/linux/x86/legacy/config-5.4 +++ b/target/linux/x86/legacy/config-5.4 @@ -206,7 +206,6 @@ CONFIG_USB_STORAGE=y CONFIG_VGACON_SOFT_SCROLLBACK=y # CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT_ENABLE_BY_DEFAULT is not set CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 -CONFIG_WATCHDOG_CORE=y # CONFIG_WDT is not set CONFIG_X86_ACPI_CPUFREQ=y # CONFIG_X86_ACPI_CPUFREQ_CPB is not set