diff options
author | Kai Kang <kai.kang@windriver.com> | 2020-06-07 21:21:57 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-06-26 18:26:48 +0100 |
commit | 26a66b8b70ca535d6435289d8fa2ef9d785c81e4 (patch) | |
tree | ca2042e629ee64b9eda0c310319f5928e04c30e2 /meta/recipes-connectivity | |
parent | 63fb575413e42ad11be3b5b8352b07f981f9f442 (diff) | |
download | poky-26a66b8b70ca535d6435289d8fa2ef9d785c81e4.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)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit fe9b8e50461ab00ab3ad8b065ebd32f0eea2a255)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r-- | meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb | 6 |
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 3e92427bb0..2936e89eed 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 | ||
16 | inherit pkgconfig systemd | 16 | inherit pkgconfig systemd |
17 | 17 | ||
18 | SYSTEMD_SERVICE_${PN} = "wpa_supplicant.service wpa_supplicant-nl80211@.service wpa_supplicant-wired@.service" | 18 | SYSTEMD_SERVICE_${PN} = "wpa_supplicant.service" |
19 | SYSTEMD_AUTO_ENABLE = "disable" | 19 | SYSTEMD_AUTO_ENABLE = "disable" |
20 | 20 | ||
21 | SRC_URI = "http://w1.fi/releases/wpa_supplicant-${PV}.tar.gz \ | 21 | SRC_URI = "http://w1.fi/releases/wpa_supplicant-${PV}.tar.gz \ |
@@ -37,13 +37,13 @@ S = "${WORKDIR}/wpa_supplicant-${PV}" | |||
37 | PACKAGES_prepend = "wpa-supplicant-passphrase wpa-supplicant-cli " | 37 | PACKAGES_prepend = "wpa-supplicant-passphrase wpa-supplicant-cli " |
38 | FILES_wpa-supplicant-passphrase = "${bindir}/wpa_passphrase" | 38 | FILES_wpa-supplicant-passphrase = "${bindir}/wpa_passphrase" |
39 | FILES_wpa-supplicant-cli = "${sbindir}/wpa_cli" | 39 | FILES_wpa-supplicant-cli = "${sbindir}/wpa_cli" |
40 | FILES_${PN} += "${datadir}/dbus-1/system-services/*" | 40 | FILES_${PN} += "${datadir}/dbus-1/system-services/* ${systemd_system_unitdir}/*" |
41 | CONFFILES_${PN} += "${sysconfdir}/wpa_supplicant.conf" | 41 | CONFFILES_${PN} += "${sysconfdir}/wpa_supplicant.conf" |
42 | 42 | ||
43 | do_configure () { | 43 | do_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 |