From e2d43b87ba072c120632cfe46970b19317e39d42 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 1 Jul 2015 08:40:45 +0200 Subject: [PATCH] wpa_supplicant: remove systemd build option (#1736). --- .../wpa_supplicant/files/wpa_supplicant.tmpfiles.d | 1 - srcpkgs/wpa_supplicant/template | 14 +------------- 2 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 srcpkgs/wpa_supplicant/files/wpa_supplicant.tmpfiles.d diff --git a/srcpkgs/wpa_supplicant/files/wpa_supplicant.tmpfiles.d b/srcpkgs/wpa_supplicant/files/wpa_supplicant.tmpfiles.d deleted file mode 100644 index 485b4534373..00000000000 --- a/srcpkgs/wpa_supplicant/files/wpa_supplicant.tmpfiles.d +++ /dev/null @@ -1 +0,0 @@ -d /run/wpa_supplicant 0755 root wheel - diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template index 3346c2d7297..2f1e074f313 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.4 -revision=3 +revision=4 patch_args="-Np1" build_wrksrc=$pkgname short_desc="WPA/WPA2/IEEE 802.1X Supplicant" @@ -15,7 +15,6 @@ build_pie=yes hostmakedepends="pkg-config" makedepends="libnl3-devel libressl-devel dbus-devel readline-devel" conf_files="/etc/sv/wpa_supplicant/conf /etc/sv/wpa_supplicant/log/run /etc/${pkgname}/${pkgname}.conf" -build_options="systemd" pre_build() { sed -i 's|/usr/local|$(PREFIX)|g' Makefile @@ -43,17 +42,6 @@ do_install() { rm ${DESTDIR}/usr/share/man/man8/wpa_gui.8 - if [ "$build_option_systemd" ]; then - vinstall ${FILESDIR}/${pkgname}.tmpfiles.d 644 usr/lib/tmpfiles.d ${pkgname}.conf - vmkdir usr/lib/systemd/system - install -m644 systemd/*.service ${DESTDIR}/usr/lib/systemd/system - # 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 - # Make wpa_supplicant@.service also work for wext (nl80211 is the default). - sed -e 's|-i%I|& -Dnl80211,wext|' -i ${DESTDIR}/usr/lib/systemd/system/wpa_supplicant@.service - fi - vlicense README vsv wpa_supplicant }