summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2020-06-07 21:21:56 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-09 13:14:01 +0100
commitce441fde6ff5031d03309d78919156c0d8beb76f (patch)
tree5628daa7b6c91fd029a9b068cbb7b9acd03ed091
parent844d54288eba16127e80e921a4e93e1aa6bbce48 (diff)
downloadpoky-ce441fde6ff5031d03309d78919156c0d8beb76f.tar.gz
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: a55b2b29bb86d98700836de5b7d68965c7cd5ee5) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/mdadm/mdadm_4.1.bb6
1 files changed, 3 insertions, 3 deletions
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 \
19 file://0001-fix-gcc-8-format-truncation-warning.patch \ 19 file://0001-fix-gcc-8-format-truncation-warning.patch \
20 file://debian-no-Werror.patch \ 20 file://debian-no-Werror.patch \
21 file://0001-Revert-tests-wait-for-complete-rebuild-in-integrity-.patch \ 21 file://0001-Revert-tests-wait-for-complete-rebuild-in-integrity-.patch \
22 file://mdadm.init \ 22 file://mdadm.init \
23 file://0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch \ 23 file://0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch \
24 file://include_sysmacros.patch \ 24 file://include_sysmacros.patch \
25 file://0001-mdadm-skip-test-11spare-migration.patch \ 25 file://0001-mdadm-skip-test-11spare-migration.patch \
26 " 26 "
@@ -30,7 +30,7 @@ SRC_URI[sha256sum] = "ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1
30 30
31inherit autotools-brokensep ptest systemd 31inherit autotools-brokensep ptest systemd
32 32
33SYSTEMD_SERVICE_${PN} = "mdmonitor.service mdmon@.service" 33SYSTEMD_SERVICE_${PN} = "mdmonitor.service"
34SYSTEMD_AUTO_ENABLE = "disable" 34SYSTEMD_AUTO_ENABLE = "disable"
35 35
36CFLAGS_append_toolchain-clang = " -Wno-error=address-of-packed-member" 36CFLAGS_append_toolchain-clang = " -Wno-error=address-of-packed-member"