mdadm: remove service template from SYSTEMD_SERVICE
PATCH 1/2 mdadm: remove service template from SYSTEMD_SERVICE
From: Kai Kang <[email protected]>
Remove service template [email protected] from SYSTEMD_SERVICE which should be not started by systemctl directly. It is hanlded by udev rules.
Replace tab with spaces in SRC_URI as well.
Signed-off-by Kai Kang <[email protected]>
--- meta/recipes-extended/mdadm/mdadm_4.1.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
meta/recipes-extended/mdadm/mdadm_4.1.bb +3 -3
@@ -19,8 +19,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \ file://0001-fix-gcc-8-format-truncation-warning.patch \ file://debian-no-Werror.patch \ file://0001-Revert-tests-wait-for-complete-rebuild-in-integrity-.patch \ - file://mdadm.init \ - file://0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch \ + file://mdadm.init \ + file://0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch \ file://include_sysmacros.patch \ file://0001-mdadm-skip-test-11spare-migration.patch \ "
@@ -30,7 +30,7 @@ SRC_URI[sha256sum] = "ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1 inherit autotools-brokensep ptest systemd -SYSTEMD_SERVICE_${PN} = "mdmonitor.service [email protected]" +SYSTEMD_SERVICE_${PN} = "mdmonitor.service" SYSTEMD_AUTO_ENABLE = "disable" CFLAGS_append_toolchain-clang = " -Wno-error=address-of-packed-member"
Signature · 1 line
2.17.1
PATCH 2/2 wpa-supplicant: remove service templates from SYSTEMD_SERVICE
From: Kai Kang <[email protected]>
Remove service templates [email protected] and [email protected] from SYSTEMD_SERVICE that they should NOT be started/stopped by calling 'systemctl' in postinst and prerm scripts.
Signed-off-by Kai Kang <[email protected]>
--- .../wpa-supplicant/wpa-supplicant_2.9.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb +3 -3
@@ -15,7 +15,7 @@ PACKAGECONFIG[openssl] = ",,openssl" inherit pkgconfig systemd -SYSTEMD_SERVICE_${PN} = "wpa_supplicant.service [email protected] [email protected]" +SYSTEMD_SERVICE_${PN} = "wpa_supplicant.service" SYSTEMD_AUTO_ENABLE = "disable" SRC_URI = "http://w1.fi/releases/wpa_supplicant-${PV}.tar.gz \
@@ -37,13 +37,13 @@ S = "${WORKDIR}/wpa_supplicant-${PV}" PACKAGES_prepend = "wpa-supplicant-passphrase wpa-supplicant-cli " FILES_wpa-supplicant-passphrase = "${bindir}/wpa_passphrase" FILES_wpa-supplicant-cli = "${sbindir}/wpa_cli" -FILES_${PN} += "${datadir}/dbus-1/system-services/*" +FILES_${PN} += "${datadir}/dbus-1/system-services/* ${systemd_system_unitdir}/*" CONFFILES_${PN} += "${sysconfdir}/wpa_supplicant.conf" do_configure () { ${MAKE} -C wpa_supplicant clean install -m 0755 ${WORKDIR}/defconfig wpa_supplicant/.config - + if echo "${PACKAGECONFIG}" | grep -qw "openssl"; then ssl=openssl elif echo "${PACKAGECONFIG}" | grep -qw "gnutls"; then
Signature · 1 line
2.17.1