wpa_supplicant: Drop custom systemd file

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/wpa_supplicant/systemd/wpa_supplicant@.service b/wpa_supplicant/systemd/wpa_supplicant@.service
deleted file mode 100644 (file)
index 7907310..0000000
--- a/wpa_supplicant/systemd/wpa_supplicant@.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=wpa_supplicant for %I.
-
-[Service]
-ExecStart=/usr/lib/network/helpers/wpa_supplicant %I
-ExecReload=/bin/kill -HUP $MAINPID
-PIDFile=/run/wpa_supplicant-%I.pid
-Restart=on-failure
-UtmpIdentifier=%I
-KillMode=process

diff --git a/wpa_supplicant/wpa_supplicant.nm b/wpa_supplicant/wpa_supplicant.nm
index 101fb5959efa5d7d126228daf0e9c8c7b79134d6..d93a3c1660b35fc3cc99ca4ea95a0dc74f54f2ae 100644 (file)
--- a/wpa_supplicant/wpa_supplicant.nm
+++ b/wpa_supplicant/wpa_supplicant.nm
@@ -5,7 +5,7 @@
 
 name       = wpa_supplicant
 version    = 2.9
-release    = 1.1
+release    = 2
 
 groups     = Sytem/Base
 url        = https://w1.fi/wpa_supplicant/
@@ -54,23 +54,26 @@ build
        end
 
        install
-               mkdir -pv %{BUILDROOT}/etc/wpa_supplicant
-               mkdir -pv %{BUILDROOT}/usr/sbin
+               mkdir -pv %{BUILDROOT}%{sysconfdir}/wpa_supplicant
+               mkdir -pv %{BUILDROOT}%{sbindir}
+               mkdir -pv %{BUILDROOT}%{unitdir}
 
                # Install config file
                install -D -m 0600 %{DIR_SOURCE}/wpa_supplicant.conf %{BUILDROOT}/etc/wpa_supplicant
 
                # Install binaries
-               install -m 0755 %{DIR_APP}/wpa_supplicant/wpa_passphrase %{BUILDROOT}/usr/sbin
-               install -m 0755 %{DIR_APP}/wpa_supplicant/wpa_cli %{BUILDROOT}/usr/sbin
-               install -m 0755 %{DIR_APP}/wpa_supplicant/wpa_supplicant %{BUILDROOT}/usr/sbin
+               install -m 0755 %{DIR_APP}/wpa_supplicant/wpa_passphrase %{BUILDROOT}%{sbindir}
+               install -m 0755 %{DIR_APP}/wpa_supplicant/wpa_cli %{BUILDROOT}%{sbindir}
+               install -m 0755 %{DIR_APP}/wpa_supplicant/wpa_supplicant %{BUILDROOT}%{sbindir}
+
+               # Install systemd unit file
+               install -v -m 644 wpa_supplicant/systemd/wpa_supplicant.service \
+                       %{BUILDROOT}%{unitdir}
        end
 end
 
 packages
        package %{name}
-               requires += network >= 005
-
                script postin
                        /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || :
                end