| 1 |
commit: 50a1101f3c952f5086171aaf188ce09033f38f7f |
| 2 |
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 24 15:05:03 2020 +0000 |
| 4 |
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 24 15:05:17 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50a1101f |
| 7 |
|
| 8 |
net-wireless/iwd: revise init script to fix NM startup |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/669632 |
| 11 |
Package-Manager: Portage-2.3.85, Repoman-2.3.20 |
| 12 |
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org> |
| 13 |
|
| 14 |
net-wireless/iwd/files/iwd.initd-r1 | 14 ++++++++++++++ |
| 15 |
net-wireless/iwd/{iwd-9999.ebuild => iwd-1.4-r1.ebuild} | 8 ++++---- |
| 16 |
net-wireless/iwd/iwd-9999.ebuild | 4 ++-- |
| 17 |
3 files changed, 20 insertions(+), 6 deletions(-) |
| 18 |
|
| 19 |
diff --git a/net-wireless/iwd/files/iwd.initd-r1 b/net-wireless/iwd/files/iwd.initd-r1 |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..873d569b655 |
| 22 |
--- /dev/null |
| 23 |
+++ b/net-wireless/iwd/files/iwd.initd-r1 |
| 24 |
@@ -0,0 +1,14 @@ |
| 25 |
+#!/sbin/openrc-run |
| 26 |
+# Copyright 1999-2020 Gentoo Authors |
| 27 |
+# Distributed under the terms of the GNU General Public License v2 |
| 28 |
+ |
| 29 |
+pidfile="/run/iwd.pid" |
| 30 |
+command="/usr/libexec/iwd" |
| 31 |
+command_background="yes" |
| 32 |
+ |
| 33 |
+depend() { |
| 34 |
+ need dbus |
| 35 |
+ after bootmisc modules |
| 36 |
+ before dns dhcpcd net |
| 37 |
+ keyword -shutdown |
| 38 |
+} |
| 39 |
|
| 40 |
diff --git a/net-wireless/iwd/iwd-9999.ebuild b/net-wireless/iwd/iwd-1.4-r1.ebuild |
| 41 |
similarity index 96% |
| 42 |
copy from net-wireless/iwd/iwd-9999.ebuild |
| 43 |
copy to net-wireless/iwd/iwd-1.4-r1.ebuild |
| 44 |
index de16c9f1b93..74fdff31c59 100644 |
| 45 |
--- a/net-wireless/iwd/iwd-9999.ebuild |
| 46 |
+++ b/net-wireless/iwd/iwd-1.4-r1.ebuild |
| 47 |
@@ -1,11 +1,11 @@ |
| 48 |
-# Copyright 1999-2019 Gentoo Authors |
| 49 |
+# Copyright 1999-2020 Gentoo Authors |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
|
| 52 |
EAPI=6 |
| 53 |
inherit flag-o-matic linux-info systemd |
| 54 |
|
| 55 |
#Set this variable to the required external ell version |
| 56 |
-ELL_REQ="" |
| 57 |
+ELL_REQ="0.27" |
| 58 |
|
| 59 |
if [[ ${PV} == *9999* ]]; then |
| 60 |
inherit autotools git-r3 |
| 61 |
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then |
| 62 |
ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git" |
| 63 |
else |
| 64 |
SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz" |
| 65 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~sparc ~x86" |
| 66 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
| 67 |
fi |
| 68 |
|
| 69 |
DESCRIPTION="Wireless daemon for linux" |
| 70 |
@@ -140,7 +140,7 @@ src_install() { |
| 71 |
default |
| 72 |
keepdir /var/lib/${PN} |
| 73 |
|
| 74 |
- newinitd "${FILESDIR}/iwd.initd" iwd |
| 75 |
+ newinitd "${FILESDIR}/iwd.initd-r1" iwd |
| 76 |
|
| 77 |
if use wired;then |
| 78 |
newinitd "${FILESDIR}/ead.initd" ead |
| 79 |
|
| 80 |
diff --git a/net-wireless/iwd/iwd-9999.ebuild b/net-wireless/iwd/iwd-9999.ebuild |
| 81 |
index de16c9f1b93..d27e39a56fe 100644 |
| 82 |
--- a/net-wireless/iwd/iwd-9999.ebuild |
| 83 |
+++ b/net-wireless/iwd/iwd-9999.ebuild |
| 84 |
@@ -1,4 +1,4 @@ |
| 85 |
-# Copyright 1999-2019 Gentoo Authors |
| 86 |
+# Copyright 1999-2020 Gentoo Authors |
| 87 |
# Distributed under the terms of the GNU General Public License v2 |
| 88 |
|
| 89 |
EAPI=6 |
| 90 |
@@ -140,7 +140,7 @@ src_install() { |
| 91 |
default |
| 92 |
keepdir /var/lib/${PN} |
| 93 |
|
| 94 |
- newinitd "${FILESDIR}/iwd.initd" iwd |
| 95 |
+ newinitd "${FILESDIR}/iwd.initd-r1" iwd |
| 96 |
|
| 97 |
if use wired;then |
| 98 |
newinitd "${FILESDIR}/ead.initd" ead |
Archives