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 8150315838C for ; Sun, 21 Jan 2024 09:42:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 58025E29B2; Sun, 21 Jan 2024 09:42:19 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 30E87E29B3 for ; Sun, 21 Jan 2024 09:42:19 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 13FA234328E for ; Sun, 21 Jan 2024 09:42:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 54DA414B5 for ; Sun, 21 Jan 2024 09:42:16 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1705830127.4d4f2384118ceb291cf227fdc3fbbdcf8632711b.soap@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/metadata.xml net-wireless/wireless-regdb/wireless-regdb-20230503-r2.ebuild X-VCS-Directories: net-wireless/wireless-regdb/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 4d4f2384118ceb291cf227fdc3fbbdcf8632711b X-VCS-Branch: master Date: Sun, 21 Jan 2024 09:42:16 +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: 11575866-2368-4732-9455-a80d15240d0a X-Archives-Hash: fdc5664b60ecd42c84ebe89d1a904ee1 commit: 4d4f2384118ceb291cf227fdc3fbbdcf8632711b Author: David Seifert gentoo org> AuthorDate: Sun Jan 21 09:42:07 2024 +0000 Commit: David Seifert gentoo org> CommitDate: Sun Jan 21 09:42:07 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d4f2384 net-wireless/wireless-regdb: remove USE=crda Signed-off-by: David Seifert gentoo.org> net-wireless/wireless-regdb/metadata.xml | 3 --- .../wireless-regdb-20230503-r2.ebuild | 22 +--------------------- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/net-wireless/wireless-regdb/metadata.xml b/net-wireless/wireless-regdb/metadata.xml index 101c017e6f75..a61f7bfb3196 100644 --- a/net-wireless/wireless-regdb/metadata.xml +++ b/net-wireless/wireless-regdb/metadata.xml @@ -6,7 +6,4 @@ Rick Farina - - Use obsolete net-wireless/crda for regulatory domain loading instead of in-kernel (4.15+) support - diff --git a/net-wireless/wireless-regdb/wireless-regdb-20230503-r2.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20230503-r2.ebuild index 4bf9984598e8..8860373ea93f 100644 --- a/net-wireless/wireless-regdb/wireless-regdb-20230503-r2.ebuild +++ b/net-wireless/wireless-regdb/wireless-regdb-20230503-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,11 +14,6 @@ S="${WORKDIR}/${MY_P}" LICENSE="ISC" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" -IUSE="crda" - -#PDEPEND is required here or crda test dep causes circular deps -PDEPEND="crda? ( net-wireless/crda )" - REQUIRED_USE="kernel_linux" pkg_pretend() { @@ -40,12 +35,6 @@ pkg_pretend() { ewarn "You can safely disable CFG80211_CRDA_SUPPORT" fi fi - - 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 - else CONFIG_CHECK="~CFG80211_CRDA_SUPPORT" WARNING_CFG80211_CRDA_SUPPORT="REGULATORY DOMAIN PROBLEM: \ @@ -61,15 +50,6 @@ src_compile() { } src_install() { - if use crda; then - # This file is not ABI-specific, and crda itself always hardcodes - # this path. So install into a common location for all ABIs to use. - insinto /usr/lib/crda - doins regulatory.bin - - insinto /etc/wireless-regdb/pubkeys - doins sforshee.key.pub.pem - fi # install the files the kernel needs unconditionally, # they are small and kernels get upgraded insinto /lib/firmware