Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 554962 Details for
Bug 671004
net-wireless/wpa_supplicant-2.6 default prepare prevents git patches being applied
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch to alter the src_prepare phase to work in a more appropriate directory
wpa-supplicant-2.6-r8-prepare-directory.patch (text/plain), 2.57 KB, created by
Mike Auty (RETIRED)
on 2018-11-12 14:23:52 UTC
(
hide
)
Description:
Patch to alter the src_prepare phase to work in a more appropriate directory
Filename:
MIME Type:
Creator:
Mike Auty (RETIRED)
Created:
2018-11-12 14:23:52 UTC
Size:
2.57 KB
patch
obsolete
>--- /usr/portage/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r8.ebuild 2018-05-19 16:20:18.142191579 +0100 >+++ wpa_supplicant-2.6-r8.ebuild 2018-11-12 12:48:25.157557320 +0000 >@@ -59,8 +59,6 @@ > ${EROOT%/}/usr/share/doc/${PF}/ > " > >-S="${WORKDIR}/${P}/${PN}" >- > Kconfig_style_config() { > #param 1 is CONFIG_* item > #param 2 is what to set it = to, defaulting in y >@@ -92,31 +90,27 @@ > } > > src_prepare() { >- default >- > # net/bpf.h needed for net-libs/libpcap on Gentoo/FreeBSD > sed -i \ > -e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \ >- ../src/l2_packet/l2_packet_freebsd.c || die >+ src/l2_packet/l2_packet_freebsd.c || die > > # People seem to take the example configuration file too literally (bug #102361) > sed -i \ > -e "s:^\(opensc_engine_path\):#\1:" \ > -e "s:^\(pkcs11_engine_path\):#\1:" \ > -e "s:^\(pkcs11_module_path\):#\1:" \ >- wpa_supplicant.conf || die >+ "${PN}/wpa_supplicant.conf" || die > > # Change configuration to match Gentoo locations (bug #143750) > sed -i \ > -e "s:/usr/lib/opensc:/usr/$(get_libdir):" \ > -e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \ >- wpa_supplicant.conf || die >+ "${PN}/wpa_supplicant.conf" || die > > # systemd entries to D-Bus service files (bug #372877) > echo 'SystemdService=wpa_supplicant.service' \ >- | tee -a dbus/*.service >/dev/null || die >- >- cd "${WORKDIR}/${P}" || die >+ | tee -a "${PN}"/dbus/*.service >/dev/null || die > > if use wimax; then > # generate-libeap-peer.patch comes before >@@ -145,9 +139,13 @@ > > # bug (640492) > sed -i 's#-Werror ##' wpa_supplicant/Makefile || die >+ >+ default > } > > src_configure() { >+ cd "${PN}" || die >+ > # Toolchain setup > tc-export CC > >@@ -338,13 +336,14 @@ > fi > > if use qt5 ; then >- pushd "${S}"/wpa_gui-qt4 > /dev/null || die >+ pushd "${S}/${PN}"/wpa_gui-qt4 > /dev/null || die > eqmake5 wpa_gui.pro > popd > /dev/null || die > fi > } > > src_compile() { >+ cd "${PN}" || die > einfo "Building wpa_supplicant" > emake V=1 BINDIR=/usr/sbin > >@@ -355,7 +354,7 @@ > > if use qt5; then > einfo "Building wpa_gui" >- emake -C "${S}"/wpa_gui-qt4 >+ emake -C "${S}/${PN}"/wpa_gui-qt4 > fi > > if use eapol_test ; then >@@ -364,6 +363,7 @@ > } > > src_install() { >+ cd "${PN}" || die > dosbin wpa_supplicant > use privsep && dosbin wpa_priv > dobin wpa_cli wpa_passphrase >@@ -404,7 +404,7 @@ > use wimax && emake DESTDIR="${D}" -C ../src/eap_peer install > > if use dbus ; then >- pushd "${S}"/dbus > /dev/null || die >+ pushd "${S}/${PN}"/dbus > /dev/null || die > insinto /etc/dbus-1/system.d > newins dbus-wpa_supplicant.conf wpa_supplicant.conf > insinto /usr/share/dbus-1/system-services
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 671004
: 554962