commit: 50a1101f3c952f5086171aaf188ce09033f38f7f Author: Ben Kohler <bkohler <AT> gentoo <DOT> org> AuthorDate: Fri Jan 24 15:05:03 2020 +0000 Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> CommitDate: Fri Jan 24 15:05:17 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50a1101f
net-wireless/iwd: revise init script to fix NM startup Closes: https://bugs.gentoo.org/669632 Package-Manager: Portage-2.3.85, Repoman-2.3.20 Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org> net-wireless/iwd/files/iwd.initd-r1 | 14 ++++++++++++++ net-wireless/iwd/{iwd-9999.ebuild => iwd-1.4-r1.ebuild} | 8 ++++---- net-wireless/iwd/iwd-9999.ebuild | 4 ++-- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/net-wireless/iwd/files/iwd.initd-r1 b/net-wireless/iwd/files/iwd.initd-r1 new file mode 100644 index 00000000000..873d569b655 --- /dev/null +++ b/net-wireless/iwd/files/iwd.initd-r1 @@ -0,0 +1,14 @@ +#!/sbin/openrc-run +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +pidfile="/run/iwd.pid" +command="/usr/libexec/iwd" +command_background="yes" + +depend() { + need dbus + after bootmisc modules + before dns dhcpcd net + keyword -shutdown +} diff --git a/net-wireless/iwd/iwd-9999.ebuild b/net-wireless/iwd/iwd-1.4-r1.ebuild similarity index 96% copy from net-wireless/iwd/iwd-9999.ebuild copy to net-wireless/iwd/iwd-1.4-r1.ebuild index de16c9f1b93..74fdff31c59 100644 --- a/net-wireless/iwd/iwd-9999.ebuild +++ b/net-wireless/iwd/iwd-1.4-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 inherit flag-o-matic linux-info systemd #Set this variable to the required external ell version -ELL_REQ="" +ELL_REQ="0.27" if [[ ${PV} == *9999* ]]; then inherit autotools git-r3 @@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then 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"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" fi DESCRIPTION="Wireless daemon for linux" @@ -140,7 +140,7 @@ src_install() { default keepdir /var/lib/${PN} - newinitd "${FILESDIR}/iwd.initd" iwd + newinitd "${FILESDIR}/iwd.initd-r1" iwd if use wired;then newinitd "${FILESDIR}/ead.initd" ead diff --git a/net-wireless/iwd/iwd-9999.ebuild b/net-wireless/iwd/iwd-9999.ebuild index de16c9f1b93..d27e39a56fe 100644 --- a/net-wireless/iwd/iwd-9999.ebuild +++ b/net-wireless/iwd/iwd-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -140,7 +140,7 @@ src_install() { default keepdir /var/lib/${PN} - newinitd "${FILESDIR}/iwd.initd" iwd + newinitd "${FILESDIR}/iwd.initd-r1" iwd if use wired;then newinitd "${FILESDIR}/ead.initd" ead
