summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/mdadm/files/0001-Revert-tests-wait-for-complete-rebuild-in-integrity-.patch53
-rw-r--r--meta/recipes-extended/mdadm/mdadm_4.1.bb1
2 files changed, 54 insertions, 0 deletions
diff --git a/meta/recipes-extended/mdadm/files/0001-Revert-tests-wait-for-complete-rebuild-in-integrity-.patch b/meta/recipes-extended/mdadm/files/0001-Revert-tests-wait-for-complete-rebuild-in-integrity-.patch
new file mode 100644
index 0000000000..b196084a5c
--- /dev/null
+++ b/meta/recipes-extended/mdadm/files/0001-Revert-tests-wait-for-complete-rebuild-in-integrity-.patch
@@ -0,0 +1,53 @@
1From 02a41c3fd560fb5250186dd6b3cff6b21daa2e2b Mon Sep 17 00:00:00 2001
2From: Mingli Yu <Mingli.Yu@windriver.com>
3Date: Mon, 15 Jul 2019 14:12:24 +0800
4Subject: [PATCH] Revert "tests: wait for complete rebuild in integrity checks"
5
6This reverts commit e2a8e9dcf67a28bc722fa5ab2c49b0bc452d4d74
7as the logic "check state 'U*'" will make the test enters
8infinite loop especially in qemu env, so revert it to
9use the previous logic "check wait" which also used
10commonly by other tests such as tests/02r5grow, tests/07revert-grow
11and etc.
12
13Upstream-Status: Submitted[https://marc.info/?l=linux-raid&m=156317157314030&w=2]
14
15Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
16---
17 tests/01r5integ | 2 +-
18 tests/01raid6integ | 4 ++--
19 2 files changed, 3 insertions(+), 3 deletions(-)
20
21diff --git a/tests/01r5integ b/tests/01r5integ
22index 48676a2..ffb30ce 100644
23--- a/tests/01r5integ
24+++ b/tests/01r5integ
25@@ -27,7 +27,7 @@ do
26 exit 1
27 fi
28 mdadm $md0 -a $i
29- while ! (check state 'U*'); do check wait; sleep 0.2; done
30+ check wait
31 done
32 mdadm -S $md0
33 done
34diff --git a/tests/01raid6integ b/tests/01raid6integ
35index 12f4d81..c6fcdae 100644
36--- a/tests/01raid6integ
37+++ b/tests/01raid6integ
38@@ -47,10 +47,10 @@ do
39 exit 1
40 fi
41 mdadm $md0 -a $first
42- while ! (check state 'U*_U*'); do check wait; sleep 0.2; done
43+ check wait
44 done
45 mdadm $md0 -a $second
46- while ! (check state 'U*'); do check wait; sleep 0.2; done
47+ check wait
48 totest="$totest $second"
49 done
50 mdadm -S $md0
51--
522.7.4
53
diff --git a/meta/recipes-extended/mdadm/mdadm_4.1.bb b/meta/recipes-extended/mdadm/mdadm_4.1.bb
index 766004fe9d..5df3f9087b 100644
--- a/meta/recipes-extended/mdadm/mdadm_4.1.bb
+++ b/meta/recipes-extended/mdadm/mdadm_4.1.bb
@@ -18,6 +18,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \
18 file://0001-Compute-abs-diff-in-a-standard-compliant-way.patch \ 18 file://0001-Compute-abs-diff-in-a-standard-compliant-way.patch \
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://mdadm.init \ 22 file://mdadm.init \
22 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 \
23 " 24 "