summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2020-07-08 21:07:53 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-04 22:17:37 (GMT)
commit6b37ae304a26ef0fc0e63a4c5578bdf640a8f544 (patch)
treec6553862cc34c1bd9bdaa42af021f9f720bcf3ce
parent662919a486406b322f96cc72744b3823c0eb1469 (diff)
downloadpoky-6b37ae304a26ef0fc0e63a4c5578bdf640a8f544.tar.gz
wpa-supplicant: remove service templates from SYSTEMD_SERVICE
Remove service templates wpa_supplicant-nl80211@.service and wpa_supplicant-wired@.service from SYSTEMD_SERVICE that they should NOT be started/stopped by calling 'systemctl' in postinst and prerm scripts. (From OE-Core rev: 7910a0d6f332253608767a9576a0d521dd87efd7) (From OE-Core rev: c6c26311e846a688f2981b541be0966c73cd69d8) Signed-off-by: Kai Kang <kai.kang@windriver.com> (cherry picked from commit fe9b8e50461ab00ab3ad8b065ebd32f0eea2a255) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb
index 2db09ad..0e74d21 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb
@@ -15,7 +15,7 @@ PACKAGECONFIG[openssl] = ",,openssl"
15 15
16inherit pkgconfig systemd 16inherit pkgconfig systemd
17 17
18SYSTEMD_SERVICE_${PN} = "wpa_supplicant.service wpa_supplicant-nl80211@.service wpa_supplicant-wired@.service" 18SYSTEMD_SERVICE_${PN} = "wpa_supplicant.service"
19SYSTEMD_AUTO_ENABLE = "disable" 19SYSTEMD_AUTO_ENABLE = "disable"
20 20
21SRC_URI = "http://w1.fi/releases/wpa_supplicant-${PV}.tar.gz \ 21SRC_URI = "http://w1.fi/releases/wpa_supplicant-${PV}.tar.gz \
@@ -37,13 +37,13 @@ S = "${WORKDIR}/wpa_supplicant-${PV}"
37PACKAGES_prepend = "wpa-supplicant-passphrase wpa-supplicant-cli " 37PACKAGES_prepend = "wpa-supplicant-passphrase wpa-supplicant-cli "
38FILES_wpa-supplicant-passphrase = "${bindir}/wpa_passphrase" 38FILES_wpa-supplicant-passphrase = "${bindir}/wpa_passphrase"
39FILES_wpa-supplicant-cli = "${sbindir}/wpa_cli" 39FILES_wpa-supplicant-cli = "${sbindir}/wpa_cli"
40FILES_${PN} += "${datadir}/dbus-1/system-services/*" 40FILES_${PN} += "${datadir}/dbus-1/system-services/* ${systemd_system_unitdir}/*"
41CONFFILES_${PN} += "${sysconfdir}/wpa_supplicant.conf" 41CONFFILES_${PN} += "${sysconfdir}/wpa_supplicant.conf"
42 42
43do_configure () { 43do_configure () {
44 ${MAKE} -C wpa_supplicant clean 44 ${MAKE} -C wpa_supplicant clean
45 install -m 0755 ${WORKDIR}/defconfig wpa_supplicant/.config 45 install -m 0755 ${WORKDIR}/defconfig wpa_supplicant/.config
46 46
47 if echo "${PACKAGECONFIG}" | grep -qw "openssl"; then 47 if echo "${PACKAGECONFIG}" | grep -qw "openssl"; then
48 ssl=openssl 48 ssl=openssl
49 elif echo "${PACKAGECONFIG}" | grep -qw "gnutls"; then 49 elif echo "${PACKAGECONFIG}" | grep -qw "gnutls"; then