From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C7FC215800A for ; Sat, 19 Aug 2023 16:52:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B9CF32BC02E; Sat, 19 Aug 2023 16:52:34 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A04322BC02E for ; Sat, 19 Aug 2023 16:52:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C9086340F87 for ; Sat, 19 Aug 2023 16:52:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 659AE1033 for ; Sat, 19 Aug 2023 16:52:32 +0000 (UTC) From: "Rick Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Rick Farina" Message-ID: <1692463942.2e25da30bafda0031bea4e6ea884e8f50ac9ff67.zerochaos@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/wireless-regdb/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-wireless/wireless-regdb/wireless-regdb-20230503-r1.ebuild X-VCS-Directories: net-wireless/wireless-regdb/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Rick Farina X-VCS-Revision: 2e25da30bafda0031bea4e6ea884e8f50ac9ff67 X-VCS-Branch: master Date: Sat, 19 Aug 2023 16:52:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a2d672f2-4601-466f-a0cd-2d5bff35a315 X-Archives-Hash: 8be49ed91ff5ce67f2662f4fb2f35e3c commit: 2e25da30bafda0031bea4e6ea884e8f50ac9ff67 Author: Rick Farina gentoo org> AuthorDate: Sat Aug 19 16:38:42 2023 +0000 Commit: Rick Farina gentoo org> CommitDate: Sat Aug 19 16:52:22 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e25da30 net-wireless/wireless-regdb: make crda optional Linux has now supported loading regulatory information without CRDA since kernel 4.15. After significant discussion negril, sam, and I have agreed upon a set of checks to ensure users are getting working regulatory information with or without crda, and have made crda optional. All packages that can cause radio emission must depend directly on wireless-regdb. Primary discussion location https://github.com/gentoo/gentoo/pull/31514 Signed-off-by: Rick Farina gentoo.org> .../wireless-regdb-20230503-r1.ebuild | 36 ++++++++++++---------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/net-wireless/wireless-regdb/wireless-regdb-20230503-r1.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20230503-r1.ebuild index 48c69e75e76d..cf490e5d7dd3 100644 --- a/net-wireless/wireless-regdb/wireless-regdb-20230503-r1.ebuild +++ b/net-wireless/wireless-regdb/wireless-regdb-20230503-r1.ebuild @@ -22,22 +22,25 @@ REQUIRED_USE="kernel_linux" pkg_pretend() { if kernel_is -ge 4 15; then - if linux_config_exists && linux_chkconfig_builtin CFG80211 && - [[ $(linux_chkconfig_string EXTRA_FIRMWARE) != *regulatory.db* ]] - then - ewarn "REGULATORY DOMAIN PROBLEM:" - ewarn " With CONFIG_CFG80211=y (built-in), the driver won't be able to load regulatory.db from" - ewarn " /lib/firmware, resulting in broken regulatory domain support. Please set CONFIG_CFG80211=m" - ewarn " or add regulatory.db and regulatory.db.p7s to CONFIG_EXTRA_FIRMWARE." - fi - if linux_config_exists && ! linux_chkconfig_present CFG80211; then - ewarn "REGULARTORY DOMAIN PROBLEM:" - ewarn " With CONFIG_CFG80211 unset the wireless dirvers won't be able to load the regulatory.db" - ewarn " which this ebuild installs. Please set CONFIG_CFG80211=m." + if linux_config_exists; then + if linux_chkconfig_builtin CFG80211 && + [[ $(linux_chkconfig_string EXTRA_FIRMWARE) != *regulatory.db* ]]; then + ewarn "REGULATORY DOMAIN PROBLEM:" + ewarn " With CONFIG_CFG80211=y (built-in), the driver(s) won't be able to load regulatory.db from" + ewarn " /lib/firmware, resulting in broken regulatory domain support. Please set CONFIG_CFG80211=m" + ewarn " or add regulatory.db and regulatory.db.p7s to CONFIG_EXTRA_FIRMWARE." + fi + if ! linux_chkconfig_present CFG80211; then + ewarn "REGULARTORY DOMAIN PROBLEM:" + ewarn " With CONFIG_CFG80211 unset, the driver(s) won't be able to load the regulatory.db from" + ewarn " /lib/firmware, resulting in broken regulatory domain support. Please set CONFIG_CFG80211=m." + fi fi - has_version net-wireless/crda && \ + if has_version net-wireless/crda || use crda; then ewarn "Starting from kernel version 4.15 net-wireless/crda is no longer needed." + ewarn "The crda USE flag will be removed on or after Feb 01, 2024" + fi CONFIG_CHECK="EXPERT ~!CFG80211_CRDA_SUPPORT" WARNING_CFG80211_CRDA_SUPPORT="You can safely disable CFG80211_CRDA_SUPPORT" @@ -51,7 +54,8 @@ please enable CFG80211_CRDA_SUPPORT for proper regulatory domain support" } src_compile() { - einfo "Recompiling regulatory.bin from db.txt would break CRDA verify. Installing unmodified binary version." + einfo "Recompiling regulatory database(s) from db.txt would break signature verification." + einfo "Installing unmodified binary version." } src_install() { @@ -63,13 +67,13 @@ src_install() { insinto /etc/wireless-regdb/pubkeys doins sforshee.key.pub.pem - doman -i18n= regulatory.bin.5 fi # install the files the kernel needs unconditionally, # they are small and kernels get upgraded insinto /lib/firmware doins regulatory.db regulatory.db.p7s - doman -i18n= regulatory.db.5 + # regulatory.db.5 is a reference to regulatory.bin.5 so you need both unconditionally + doman -i18n= regulatory.db.5 regulatory.bin.5 dodoc README db.txt }