From: Jouni Malinen <j@w1.fi>
Date: Sat, 28 Jan 2012 15:12:30 +0000 (+0200)
Subject: Rename systemd template files to avoid @ in the file name
X-Git-Tag: aosp-jb-start~56
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6897ce14a41c30460c75fe06232f1bb91695c6ae;p=thirdparty%2Fhostap.git

Rename systemd template files to avoid @ in the file name

Perforce does not like @ in the file name and since these template files
do not really need to have that in the name, make the files in
repository friendlier to Perforce. The generated *.service file will
maintain their old names.

Signed-hostap: Jouni Malinen <j@w1.fi>
---

diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index 0832f10e3..c30440795 100644
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -1476,6 +1476,9 @@ eap_ikev2.so: ../src/eap_peer/eap_ikev2.c ../src/eap_peer/ikev2.c ../src/eap_com
 %.service: %.service.in
 	sed -e 's|\@BINDIR\@|$(BINDIR)|g' $< >$@
 
+%@.service: %.service.arg.in
+	sed -e 's|\@BINDIR\@|$(BINDIR)|g' $< >$@
+
 wpa_supplicant.exe: wpa_supplicant
 	mv -f $< $@
 wpa_cli.exe: wpa_cli
diff --git a/wpa_supplicant/systemd/wpa_supplicant-nl80211@.service.in b/wpa_supplicant/systemd/wpa_supplicant-nl80211.service.arg.in
similarity index 100%
rename from wpa_supplicant/systemd/wpa_supplicant-nl80211@.service.in
rename to wpa_supplicant/systemd/wpa_supplicant-nl80211.service.arg.in
diff --git a/wpa_supplicant/systemd/wpa_supplicant-wired@.service.in b/wpa_supplicant/systemd/wpa_supplicant-wired.service.arg.in
similarity index 100%
rename from wpa_supplicant/systemd/wpa_supplicant-wired@.service.in
rename to wpa_supplicant/systemd/wpa_supplicant-wired.service.arg.in
diff --git a/wpa_supplicant/systemd/wpa_supplicant@.service.in b/wpa_supplicant/systemd/wpa_supplicant.service.arg.in
similarity index 100%
rename from wpa_supplicant/systemd/wpa_supplicant@.service.in
rename to wpa_supplicant/systemd/wpa_supplicant.service.arg.in