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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DB9FA138359 for ; Tue, 8 Sep 2020 20:55:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 255C5E082B; Tue, 8 Sep 2020 20:55:10 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0D991E082B for ; Tue, 8 Sep 2020 20:55:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 047C8335D42 for ; Tue, 8 Sep 2020 20:55:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6A6982EC for ; Tue, 8 Sep 2020 20:55:07 +0000 (UTC) From: "Ben Kohler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ben Kohler" Message-ID: <1599598493.4d46c2c6ded34dc86725c3350376de2038f63e69.bkohler@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/iwd/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-wireless/iwd/iwd-9999.ebuild X-VCS-Directories: net-wireless/iwd/ X-VCS-Committer: bkohler X-VCS-Committer-Name: Ben Kohler X-VCS-Revision: 4d46c2c6ded34dc86725c3350376de2038f63e69 X-VCS-Branch: master Date: Tue, 8 Sep 2020 20:55:07 +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: 55bba884-23dd-4c7d-9075-7f5ec6a174be X-Archives-Hash: 9b9790a19db3cb76fc44cc1c7e192ea0 commit: 4d46c2c6ded34dc86725c3350376de2038f63e69 Author: Ben Kohler gentoo org> AuthorDate: Tue Sep 8 20:54:34 2020 +0000 Commit: Ben Kohler gentoo org> CommitDate: Tue Sep 8 20:54:53 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d46c2c6 net-wireless/iwd: copy all recent changes to 9999 Package-Manager: Portage-3.0.6, Repoman-3.0.1 Signed-off-by: Ben Kohler gentoo.org> net-wireless/iwd/iwd-9999.ebuild | 39 +++++++++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 8 deletions(-) diff --git a/net-wireless/iwd/iwd-9999.ebuild b/net-wireless/iwd/iwd-9999.ebuild index 55d9df110e1..604e376346d 100644 --- a/net-wireless/iwd/iwd-9999.ebuild +++ b/net-wireless/iwd/iwd-9999.ebuild @@ -21,19 +21,30 @@ HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/" LICENSE="GPL-2" SLOT="0" -IUSE="+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3" +IUSE="+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3 +standalone systemd" -COMMON_DEPEND="sys-apps/dbus - client? ( sys-libs/readline:0= )" +COMMON_DEPEND=" + sys-apps/dbus + client? ( sys-libs/readline:0= ) +" -[[ -z "${ELL_REQ}" ]] || COMMON_DEPEND+=" >=dev-libs/ell-${ELL_REQ}" +[[ -z "${ELL_REQ}" ]] || COMMON_DEPEND+=" ~dev-libs/ell-${ELL_REQ}" -RDEPEND="${COMMON_DEPEND} +RDEPEND=" + ${COMMON_DEPEND} net-wireless/wireless-regdb - crda? ( net-wireless/crda )" + crda? ( net-wireless/crda ) + standalone? ( + systemd? ( sys-apps/systemd ) + !systemd? ( virtual/resolvconf ) + ) +" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig" +DEPEND=" + ${COMMON_DEPEND} + virtual/pkgconfig +" [[ ${PV} == *9999* ]] && DEPEND+=" dev-python/docutils" @@ -91,6 +102,10 @@ pkg_setup() { check_extra_config if ! use crda; then + if use kernel_linux && kernel_is -lt 4 15; then + ewarn "POSSIBLE REGULATORY DOMAIN PROBLEM:" + ewarn "Regulatory domain support for kernels older than 4.15 requires crda." + fi if linux_config_exists && linux_chkconfig_builtin CFG80211 && [[ $(linux_chkconfig_string EXTRA_FIRMWARE) != *regulatory.db* ]] then @@ -151,4 +166,12 @@ src_install() { exeinto /usr/share/iwd/scripts/ doexe test/* fi + + if use standalone ; then + dodir /etc/iwd + echo "[General]" > ${ED}/etc/iwd/main.conf + echo "EnableNetworkConfiguration=true" >> "${ED}"/etc/iwd/main.conf + echo "NameResolvingService=$(usex systemd systemd resolvconf)" >> "${ED}"/etc/iwd/main.conf + echo "rc_provide=\"net\"" > ${ED}/etc/conf.d/iwd + fi }