summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2022-02-07 00:35:44 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-02-08 14:20:18 +0000
commit0d4392fbb3061872579c981147da45cd55bf76b9 (patch)
tree7ac78f9650a0712d79d1063436f3acda32e8898e
parenta7f7161ff4c681796ddc0d3bab40d92994e8f447 (diff)
downloadpoky-0d4392fbb3061872579c981147da45cd55bf76b9.tar.gz
mdadm: install mdcheck
This script is used in mdcheck_xxx.service files. So we need to install it. Also, as it requires bash, we add bash to RDEPENDS. (From OE-Core rev: 0942b161252fc70c65d46754b44bfebe75cf8c09) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/mdadm/files/0001-Makefile-install-mdcheck.patch30
-rw-r--r--meta/recipes-extended/mdadm/mdadm_4.2.bb2
2 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-extended/mdadm/files/0001-Makefile-install-mdcheck.patch b/meta/recipes-extended/mdadm/files/0001-Makefile-install-mdcheck.patch
new file mode 100644
index 0000000000..3f76ef54d8
--- /dev/null
+++ b/meta/recipes-extended/mdadm/files/0001-Makefile-install-mdcheck.patch
@@ -0,0 +1,30 @@
1From 97e776724ab9763c5bca9816370bb1635b7a8232 Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Tue, 25 Jan 2022 16:25:01 +0800
4Subject: [PATCH] Makefile: install mdcheck
5
6The mdcheck_xxx.service files use mdcheck, but it's not installed.
7We need to install this script.
8
9Upstream-Status: Submitted [Sent patch to maintainer]
10
11Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
12---
13 Makefile | 1 +
14 1 file changed, 1 insertion(+)
15
16diff --git a/Makefile b/Makefile
17index 2a51d813..db40c7fd 100644
18--- a/Makefile
19+++ b/Makefile
20@@ -303,6 +303,7 @@ install-systemd: systemd/mdmon@.service
21 install-bin: mdadm mdmon
22 $(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm
23 $(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon
24+ $(INSTALL) -D -m 755 misc/mdcheck $(DESTDIR)/usr/share/mdadm/mdcheck
25
26 uninstall:
27 rm -f $(DESTDIR)$(MAN8DIR)/mdadm.8 $(DESTDIR)$(MAN8DIR)/mdmon.8 $(DESTDIR)$(MAN4DIR)/md.4 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 $(DESTDIR)$(BINDIR)/mdadm
28--
292.17.1
30
diff --git a/meta/recipes-extended/mdadm/mdadm_4.2.bb b/meta/recipes-extended/mdadm/mdadm_4.2.bb
index e3bbb4cf33..641b598f68 100644
--- a/meta/recipes-extended/mdadm/mdadm_4.2.bb
+++ b/meta/recipes-extended/mdadm/mdadm_4.2.bb
@@ -23,6 +23,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \
23 file://include_sysmacros.patch \ 23 file://include_sysmacros.patch \
24 file://0001-mdadm-skip-test-11spare-migration.patch \ 24 file://0001-mdadm-skip-test-11spare-migration.patch \
25 file://0001-Fix-parsing-of-r-in-monitor-manager-mode.patch \ 25 file://0001-Fix-parsing-of-r-in-monitor-manager-mode.patch \
26 file://0001-Makefile-install-mdcheck.patch \
26 " 27 "
27 28
28SRC_URI[sha256sum] = "461c215670864bb74a4d1a3620684aa2b2f8296dffa06743f26dda5557acf01d" 29SRC_URI[sha256sum] = "461c215670864bb74a4d1a3620684aa2b2f8296dffa06743f26dda5557acf01d"
@@ -93,6 +94,7 @@ do_install_ptest() {
93 done 94 done
94} 95}
95 96
97RDEPENDS:${PN} += "bash"
96RDEPENDS:${PN}-ptest += "bash e2fsprogs-mke2fs" 98RDEPENDS:${PN}-ptest += "bash e2fsprogs-mke2fs"
97RRECOMMENDS:${PN}-ptest += " \ 99RRECOMMENDS:${PN}-ptest += " \
98 coreutils \ 100 coreutils \