From 8e32c2c60cb684e06418a095c5b075fdc88aeadd Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 15 Jan 2014 10:14:00 +0100 Subject: [PATCH] wpa_supplicant: /usr/bin move. --- srcpkgs/wpa_supplicant/template | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template index db25c4123a2..cb93965b5a8 100644 --- a/srcpkgs/wpa_supplicant/template +++ b/srcpkgs/wpa_supplicant/template @@ -1,7 +1,7 @@ # Template file for 'wpa_supplicant' pkgname=wpa_supplicant version=2.0 -revision=2 +revision=3 build_wrksrc=$pkgname short_desc="WPA/WPA2/IEEE 802.1X Supplicant" maintainer="Juan RP " @@ -14,14 +14,13 @@ hostmakedepends="pkg-config" makedepends="libnl3-devel openssl-devel dbus-devel readline-devel" conf_files="/etc/wpa_supplicant.conf" -do_build() { +pre_build() { sed -i 's|/usr/local|$(PREFIX)|g' Makefile cp -f ${FILESDIR}/config .config +} - if [ "$CROSS_BUILD" ]; then - export CFLAGS="-I$XBPS_CROSS_BASE/usr/include/libnl3 $CFLAGS" - fi - +do_build() { + CFLAGS+=" -I$XBPS_CROSS_BASE/usr/include/libnl3" make ${make_build_args} V=1 PREFIX=/usr } @@ -50,4 +49,9 @@ do_install() { # Fix wpa_supplicant@.service to respect instance name. sed -e 's,wpa_supplicant@wlan0.service,wpa_supplicant@%i.service,' -i \ ${DESTDIR}/usr/lib/systemd/system/wpa_supplicant@.service + + vmkdir usr/bin + mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin + sed -e 's,/usr/sbin/,/usr/bin,g' -i \ + ${DESTDIR}/usr/lib/systemd/system/*.service }