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 034BE15800A for ; Sat, 2 Sep 2023 13:21:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 41CE42BC01A; Sat, 2 Sep 2023 13:21:03 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 1F98E2BC01A for ; Sat, 2 Sep 2023 13:21:03 +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 F1334340D85 for ; Sat, 2 Sep 2023 13:21:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3951210DF for ; Sat, 2 Sep 2023 13:21:00 +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: <1693660854.7f6fbe73a60990a9e1133780dae08ae87c058d60.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-2.8-r1.ebuild 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: 7f6fbe73a60990a9e1133780dae08ae87c058d60 X-VCS-Branch: master Date: Sat, 2 Sep 2023 13:21:00 +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: 53f2ca3f-e68a-4fda-b086-446b6544345b X-Archives-Hash: d06011e8e83ccec075e3161f805639cb commit: 7f6fbe73a60990a9e1133780dae08ae87c058d60 Author: Paul Zander gmail com> AuthorDate: Sat Sep 2 12:00:21 2023 +0000 Commit: Ben Kohler gentoo org> CommitDate: Sat Sep 2 13:20:54 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f6fbe73 net-wireless/iwd: remove crda checks now done in wireless-regdb crda checks are now solely done in net-wireless/wireless-regdom which makes the checks here redundant. Add quotes around variable expansion. Replaced the multiple redirects with heredoc so the file gets opened only once. Copy the dbus<->Networkmanager fix from 2.8 to 9999. Signed-off-by: Paul Zander gmail.com> Closes: https://github.com/gentoo/gentoo/pull/32563 Signed-off-by: Ben Kohler gentoo.org> net-wireless/iwd/iwd-2.8-r1.ebuild | 50 +++++++++++------------------------ net-wireless/iwd/iwd-9999.ebuild | 54 +++++++++++++------------------------- 2 files changed, 33 insertions(+), 71 deletions(-) diff --git a/net-wireless/iwd/iwd-2.8-r1.ebuild b/net-wireless/iwd/iwd-2.8-r1.ebuild index d2f6f19fe2e4..6aaa8fdfe377 100644 --- a/net-wireless/iwd/iwd-2.8-r1.ebuild +++ b/net-wireless/iwd/iwd-2.8-r1.ebuild @@ -22,7 +22,7 @@ HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/" LICENSE="GPL-2" SLOT="0" -IUSE="+client cpu_flags_x86_aes cpu_flags_x86_ssse3 crda +monitor ofono standalone systemd wired" +IUSE="+client cpu_flags_x86_aes cpu_flags_x86_ssse3 +monitor ofono standalone systemd wired" DEPEND=" sys-apps/dbus @@ -35,7 +35,6 @@ RDEPEND=" ${DEPEND} acct-group/netdev net-wireless/wireless-regdb - crda? ( net-wireless/crda ) standalone? ( systemd? ( sys-apps/systemd ) !systemd? ( virtual/resolvconf ) @@ -72,11 +71,6 @@ pkg_setup() { ~RFKILL ~X509_CERTIFICATE_PARSER " - if use crda;then - CONFIG_CHECK="${CONFIG_CHECK} ~CFG80211_CRDA_SUPPORT" - WARNING_CFG80211_CRDA_SUPPORT="REGULATORY DOMAIN PROBLEM: please enable CFG80211_CRDA_SUPPORT for proper - regulatory domain support" - fi if use amd64;then CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_DES3_EDE_X86_64" @@ -100,23 +94,6 @@ pkg_setup() { fi 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 - ewarn "" - 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." - ewarn "" - fi - fi } src_unpack() { @@ -141,10 +118,10 @@ src_configure() { append-cflags "-fsigned-char" local myeconfargs=( --sysconfdir="${EPREFIX}"/etc/iwd --localstatedir="${EPREFIX}"/var - $(use_enable client) - $(use_enable monitor) - $(use_enable ofono) - $(use_enable wired) + "$(use_enable client)" + "$(use_enable monitor)" + "$(use_enable ofono)" + "$(use_enable wired)" --enable-systemd-service --with-systemd-unitdir="$(systemd_get_systemunitdir)" --with-systemd-modloaddir="${EPREFIX}/usr/lib/modules-load.d" @@ -155,12 +132,12 @@ src_configure() { } src_compile() { - emake ${MYRST2MAN} + emake "${MYRST2MAN}" } src_install() { - emake DESTDIR="${D}" ${MYRST2MAN} install - keepdir /var/lib/${PN} + emake DESTDIR="${D}" "${MYRST2MAN}" install + keepdir "/var/lib/${PN}" newinitd "${FILESDIR}/iwd.initd-r1" iwd @@ -176,10 +153,13 @@ src_install() { if use standalone ; then local iwdconf="${ED}/etc/iwd/main.conf" dodir /etc/iwd - echo "[General]" > "${iwdconf}" - echo "EnableNetworkConfiguration=true" >> "${iwdconf}" - echo "[Network]" >> "${iwdconf}" - echo "NameResolvingService=$(usex systemd systemd resolvconf)" >> "${iwdconf}" + cat << EOF > "${iwdconf}" +[General] +EnableNetworkConfiguration=true + +[Network] +NameResolvingService=$(usex systemd systemd resolvconf) +EOF dodir /etc/conf.d echo "rc_provide=\"net\"" > "${ED}"/etc/conf.d/iwd fi diff --git a/net-wireless/iwd/iwd-9999.ebuild b/net-wireless/iwd/iwd-9999.ebuild index 2b56e4c17699..44945f55296a 100644 --- a/net-wireless/iwd/iwd-9999.ebuild +++ b/net-wireless/iwd/iwd-9999.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then IWD_EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git" ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git" else - SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz" + SRC_URI="https://mirrors.edge.kernel.org/pub/linux/network/wireless/${P}.tar.xz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" MYRST2MAN="RST2MAN=:" fi @@ -22,7 +22,7 @@ HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/" LICENSE="GPL-2" SLOT="0" -IUSE="+client cpu_flags_x86_aes cpu_flags_x86_ssse3 crda +monitor ofono standalone systemd wired" +IUSE="+client cpu_flags_x86_aes cpu_flags_x86_ssse3 +monitor ofono standalone systemd wired" DEPEND=" sys-apps/dbus @@ -35,7 +35,6 @@ RDEPEND=" ${DEPEND} acct-group/netdev net-wireless/wireless-regdb - crda? ( net-wireless/crda ) standalone? ( systemd? ( sys-apps/systemd ) !systemd? ( virtual/resolvconf ) @@ -72,11 +71,6 @@ pkg_setup() { ~RFKILL ~X509_CERTIFICATE_PARSER " - if use crda;then - CONFIG_CHECK="${CONFIG_CHECK} ~CFG80211_CRDA_SUPPORT" - WARNING_CFG80211_CRDA_SUPPORT="REGULATORY DOMAIN PROBLEM: please enable CFG80211_CRDA_SUPPORT for proper - regulatory domain support" - fi if use amd64;then CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_DES3_EDE_X86_64" @@ -100,23 +94,6 @@ pkg_setup() { fi 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 - ewarn "" - 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." - ewarn "" - fi - fi } src_unpack() { @@ -133,16 +110,18 @@ src_prepare() { if [[ ${PV} == *9999* ]] ; then eautoreconf fi + + sed -e "s:Exec=/bin/false:Exec=${EPREFIX}/usr/libexec/iwd:g" -i src/net.connman.iwd.service || die } src_configure() { append-cflags "-fsigned-char" local myeconfargs=( --sysconfdir="${EPREFIX}"/etc/iwd --localstatedir="${EPREFIX}"/var - $(use_enable client) - $(use_enable monitor) - $(use_enable ofono) - $(use_enable wired) + "$(use_enable client)" + "$(use_enable monitor)" + "$(use_enable ofono)" + "$(use_enable wired)" --enable-systemd-service --with-systemd-unitdir="$(systemd_get_systemunitdir)" --with-systemd-modloaddir="${EPREFIX}/usr/lib/modules-load.d" @@ -153,12 +132,12 @@ src_configure() { } src_compile() { - emake ${MYRST2MAN} + emake "${MYRST2MAN}" } src_install() { - emake DESTDIR="${D}" ${MYRST2MAN} install - keepdir /var/lib/${PN} + emake DESTDIR="${D}" "${MYRST2MAN}" install + keepdir "/var/lib/${PN}" newinitd "${FILESDIR}/iwd.initd-r1" iwd @@ -174,10 +153,13 @@ src_install() { if use standalone ; then local iwdconf="${ED}/etc/iwd/main.conf" dodir /etc/iwd - echo "[General]" > "${iwdconf}" - echo "EnableNetworkConfiguration=true" >> "${iwdconf}" - echo "[Network]" >> "${iwdconf}" - echo "NameResolvingService=$(usex systemd systemd resolvconf)" >> "${iwdconf}" + cat << EOF > "${iwdconf}" +[General] +EnableNetworkConfiguration=true + +[Network] +NameResolvingService=$(usex systemd systemd resolvconf) +EOF dodir /etc/conf.d echo "rc_provide=\"net\"" > "${ED}"/etc/conf.d/iwd fi