gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 17:09:10 -07:00
Code Issues Projects Releases Wiki Activity

net-wireless/wpa_supplicant: always install OpenRC init script, cleanup cruft

Browse Source 
I haven't dug into the historical reasons for the has_version here, my guess
is it relied on some newer OpenRC feature rather than intentionally omitting
for systemd machines (where the small file policy applies in both directions).

Always install them accordingly.

Also, cleanup an ancient <baselayout-2 hack.

Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2024-03-09 21:23:08 +00:00
parent 804d4d18a8
commit 4c8375e12d
2 changed files with 8 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
net-wireless/wpa_supplicant/wpa_supplicant-2.10-r3.ebuild → net-wireless/wpa_supplicant/wpa_supplicant-2.10-r4.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2023 Gentoo Authors
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -389,18 +389,8 @@ src_install() {
use privsep && dosbin wpa_priv
dobin wpa_cli wpa_passphrase
# baselayout-1 compat
if has_version "<sys-apps/baselayout-2.0.0"; then
dodir /sbin
dosym ../usr/sbin/wpa_supplicant /sbin/wpa_supplicant
dodir /bin
dosym ../usr/bin/wpa_cli /bin/wpa_cli
fi
if has_version ">=sys-apps/openrc-0.5.0"; then
newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant
newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant
fi
newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant
newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant
exeinto /etc/wpa_supplicant/
newexe "${FILESDIR}/wpa_cli.sh" wpa_cli.sh

19
net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2023 Gentoo Authors
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -13,7 +13,7 @@ if [ "${PV}" = "9999" ]; then
inherit git-r3
EGIT_REPO_URI="https://w1.fi/hostap.git"
else
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
SRC_URI="https://w1.fi/releases/${P}.tar.gz"
fi
@@ -124,6 +124,7 @@ src_prepare() {
# bug (912315)
eapply "${FILESDIR}/${PN}-2.10-allow-legacy-renegotiation.patch"
eapply "${FILESDIR}/${P}-Drop-security-level-to-0-with-OpenSSL-3.0-wh.patch"
# bug (640492)
sed -i 's#-Werror ##' wpa_supplicant/Makefile || die
@@ -388,18 +389,8 @@ src_install() {
use privsep && dosbin wpa_priv
dobin wpa_cli wpa_passphrase
# baselayout-1 compat
if has_version "<sys-apps/baselayout-2.0.0"; then
dodir /sbin
dosym ../usr/sbin/wpa_supplicant /sbin/wpa_supplicant
dodir /bin
dosym ../usr/bin/wpa_cli /bin/wpa_cli
fi
if has_version ">=sys-apps/openrc-0.5.0"; then
newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant
newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant
fi
newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant
newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant
exeinto /etc/wpa_supplicant/
newexe "${FILESDIR}/wpa_cli.sh" wpa_cli.sh