summaryrefslogtreecommitdiff
path: root/net-wireless/iwd
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-09-02 16:16:36 +0100
committerV3n3RiX <venerix@koprulu.sector>2023-09-02 16:16:36 +0100
commite5206efa6e88d32e3819685adee35c49124ccf0e (patch)
treeeb8101c8b97f1aa253537d4ea141dc5bf9c9902b /net-wireless/iwd
parent15bd3dfb22c7ba23dad0823e326dbcb8bb31b892 (diff)
gentoo auto-resync : 02:09:2023 - 16:16:36
Diffstat (limited to 'net-wireless/iwd')
-rw-r--r--net-wireless/iwd/Manifest4
-rw-r--r--net-wireless/iwd/iwd-2.8-r1.ebuild50
-rw-r--r--net-wireless/iwd/iwd-9999.ebuild54
3 files changed, 35 insertions, 73 deletions
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index 176eb8135265..f35890bb8bc0 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -12,7 +12,7 @@ EBUILD iwd-2.4.ebuild 4967 BLAKE2B 826505ee17092f2114826b7db3755da971e9ebb2c7708
EBUILD iwd-2.5.ebuild 4969 BLAKE2B 7c9b9a82d6370ae137a17df3da3dc08a4354057072f70e4cddc7d52d9db72c639ab153e420adc4fb5ccb5d13f82c6b2f8af34674ff49aacda307015447ef56ee SHA512 8d5a2bfd3318acf42ffa1111f6d037bf7cd20c54369db08de290c20eb494f3578f58a017a4640ca8e00383afd0fab869d651dbd8b2718e8db17dd4146d7022f0
EBUILD iwd-2.6.ebuild 4969 BLAKE2B 7c9b9a82d6370ae137a17df3da3dc08a4354057072f70e4cddc7d52d9db72c639ab153e420adc4fb5ccb5d13f82c6b2f8af34674ff49aacda307015447ef56ee SHA512 8d5a2bfd3318acf42ffa1111f6d037bf7cd20c54369db08de290c20eb494f3578f58a017a4640ca8e00383afd0fab869d651dbd8b2718e8db17dd4146d7022f0
EBUILD iwd-2.7.ebuild 4969 BLAKE2B 7c9b9a82d6370ae137a17df3da3dc08a4354057072f70e4cddc7d52d9db72c639ab153e420adc4fb5ccb5d13f82c6b2f8af34674ff49aacda307015447ef56ee SHA512 8d5a2bfd3318acf42ffa1111f6d037bf7cd20c54369db08de290c20eb494f3578f58a017a4640ca8e00383afd0fab869d651dbd8b2718e8db17dd4146d7022f0
-EBUILD iwd-2.8-r1.ebuild 5079 BLAKE2B 7b9fa243a0167621d377fa35d32e62e4b59fe3185c1e52b3deb070f77862b6ee1cc2fe1980ff33181de4a55b62f303d312fcb13afebcccb60d8d8f1743af29e2 SHA512 69c7e8d378c8f752b236ba07b39e31b5dc2cae4620441a4a2e99a3d0e4fb6e141c3f6873b270b070d4148f9e3b8bfd14cb4c929908a89ee712f37f103098ada8
+EBUILD iwd-2.8-r1.ebuild 4082 BLAKE2B 20533dfcfa70657fb5c09b77a28d7814db2895eb57a75f80c15788e18244c7053b295b4627d1893089fb61210301cd9a98e5e53f27f92029181a8e028b1ec11f SHA512 95a0e5a54f1105bb5a80bc8c7fe16c03c55d354f011db92940680d8b9a7df208e4b921a8a774d97e0b6276fcb12e8de67c2942a6038b3cce348f6203b5575eda
EBUILD iwd-2.8.ebuild 4969 BLAKE2B 46a04585975c13522deb2c87c1cafd2af50d00358438e7d87c8fe81ee28a89f8fd8cdb94ce45a717816a7f06e1e42063804f081d24df2adc66cd0c9dd24b4732 SHA512 e2bd44e161a142ee9af275a8f60b63e470bd885e2a276666df05938f00bc8384dffe1e302c1ea10b68d58ee17fdb85f1dd3c6d090f87ce000cd7b65ade87e11b
-EBUILD iwd-9999.ebuild 4965 BLAKE2B d160cf783e7c66f3957d7b8814caec00474dc04e5018009a4ae600d07807e1a142fc8c17e912be43d26ead8f0af97ffed873d870656ccf2dcfd60fc51744e9fd SHA512 f1d5a1c2adc148dad670e326a173c4a2d4559a70950c9bde11daac8d27b78a0d90c5a22b3e36decc5566578bdc6e55ee0492e434b4ca8486e7c75ec2d42edf90
+EBUILD iwd-9999.ebuild 4078 BLAKE2B 14a5aca28d32e91f76308b4916072c13c4e732f99f43edcd563c13c80ef1034d2212a06379cd2b83566e2e79350d35cd5754472d0af33fc035013f07f46d7b97 SHA512 c3bf12a8c7431127b11dd9ca06e7cda185e504f1b62d5ca872e7d3e28f525aafcfaffe39787b01fa826df8af5b308c228ae9055bc8136ebd0c73f1c11ab74d0b
MISC metadata.xml 844 BLAKE2B a0745226f5314cee29c405d53b5f03c1e2706518272a69443174123601c4b79ad5902e2f22575b46bed37c5d6ebebd1ad4cdcccbb7c40405c4d04f2b92bef17d SHA512 9997101871ad37981492b0a70150d091926ec2321f13d70d5f85f2ff5d360cc87970beb9575c2f78a909e6f3a91ef022fd7115db9ec0ec77d5d94363ed30d793
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