summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/mdadm/files/0001-mdadm-skip-test-11spare-migration.patch43
-rw-r--r--meta/recipes-extended/mdadm/mdadm_4.1.bb2
2 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-extended/mdadm/files/0001-mdadm-skip-test-11spare-migration.patch b/meta/recipes-extended/mdadm/files/0001-mdadm-skip-test-11spare-migration.patch
new file mode 100644
index 0000000000..3a192cc95c
--- /dev/null
+++ b/meta/recipes-extended/mdadm/files/0001-mdadm-skip-test-11spare-migration.patch
@@ -0,0 +1,43 @@
1From 1b83afa7c3121f819e72ea74883f8b6d61d6548e Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Fri, 6 Sep 2019 10:59:02 +0800
4Subject: [PATCH] mdadm: skip test 11spare-migration
5
611spare-migration is a test series to check mdadm Monitor migrates spares
7according to rules in /etc/mdadm.conf defined by POLICY lines.
8
9[snip]
10for scan in no yes; do
11 for platform in 1.2 imsm; do
12 try
13 done
14done
15[snip]
16
17"try" includes near 20 sub testcase, so there are nearly 80 subcases need to run,
18so it will take long time than ptest-runner timeout limit, skip it as workaround.
19
20Upstream-Status: Inappropriate[oe-specific]
21
22Signed-off-by: Changqing Li <changqing.li@windriver.com>
23---
24 test | 3 +++
25 1 file changed, 3 insertions(+)
26
27diff --git a/test b/test
28index 711a3c7..880dd1d 100755
29--- a/test
30+++ b/test
31@@ -272,6 +272,9 @@ main() {
32 else
33 for script in $testdir/$prefix $testdir/$prefix*[^~]
34 do
35+ if [ $script == "$testdir/11spare-migration" ];then
36+ continue
37+ fi
38 do_test $script
39 done
40 fi
41--
422.7.4
43
diff --git a/meta/recipes-extended/mdadm/mdadm_4.1.bb b/meta/recipes-extended/mdadm/mdadm_4.1.bb
index 74c94f6ecb..639382e137 100644
--- a/meta/recipes-extended/mdadm/mdadm_4.1.bb
+++ b/meta/recipes-extended/mdadm/mdadm_4.1.bb
@@ -22,7 +22,9 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \
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 " 26 "
27
26SRC_URI[md5sum] = "51bf3651bd73a06c413a2f964f299598" 28SRC_URI[md5sum] = "51bf3651bd73a06c413a2f964f299598"
27SRC_URI[sha256sum] = "ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1934f4a" 29SRC_URI[sha256sum] = "ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1934f4a"
28 30