From 63fb575413e42ad11be3b5b8352b07f981f9f442 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Sun, 7 Jun 2020 21:21:56 +0800 Subject: mdadm: remove service template from SYSTEMD_SERVICE Remove service template mdmon@.service 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. (From OE-Core rev: f54c3c049eacce423d9c75c823f8ab15ba185167) Signed-off-by: Kai Kang Signed-off-by: Richard Purdie (cherry picked from commit a55b2b29bb86d98700836de5b7d68965c7cd5ee5) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- meta/recipes-extended/mdadm/mdadm_4.1.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/recipes-extended') diff --git a/meta/recipes-extended/mdadm/mdadm_4.1.bb b/meta/recipes-extended/mdadm/mdadm_4.1.bb index 40c5273e00..001d3331a7 100644 --- a/meta/recipes-extended/mdadm/mdadm_4.1.bb +++ b/meta/recipes-extended/mdadm/mdadm_4.1.bb @@ -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 mdmon@.service" +SYSTEMD_SERVICE_${PN} = "mdmonitor.service" SYSTEMD_AUTO_ENABLE = "disable" CFLAGS_append_toolchain-clang = " -Wno-error=address-of-packed-member" -- cgit v1.2.3-54-g00ecf