summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/ltp
diff options
context:
space:
mode:
authorYongxin Liu <yongxin.liu@windriver.com>2019-11-13 14:48:55 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-11-14 13:21:00 +0000
commitbf12fa8a48b4aefdfb430467560bdc17e0fbad69 (patch)
tree4673bf578d6ed295dc130072ea585692d7c6a48f /meta/recipes-extended/ltp
parent8195cff91100a2051c19df104f46c61c7b4f3b93 (diff)
downloadpoky-bf12fa8a48b4aefdfb430467560bdc17e0fbad69.tar.gz
ltp: Add "udevadm trigger" before swap verification in mkswap01.sh
Swap verification sometimes fails due to race condition with udev. This is a known issue: https://github.com/linux-test-project/ltp/issues/458. "udevadm trigger" forces udev to sync up device events with kernel. (From OE-Core rev: 9d0bfa64d491c9bbef38c1530dc56386add12485) Signed-off-by: Yongxin Liu <yongxin.liu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/ltp')
-rw-r--r--meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch35
-rw-r--r--meta/recipes-extended/ltp/ltp_20190517.bb1
2 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch b/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch
new file mode 100644
index 0000000000..1b433d3ad3
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch
@@ -0,0 +1,35 @@
1From fae8852a63d9fa6e56fb8b24eaf10560bd13757f Mon Sep 17 00:00:00 2001
2From: Yongxin Liu <yongxin.liu@windriver.com>
3Date: Tue, 12 Nov 2019 11:33:50 +0800
4Subject: [PATCH] mkswap01.sh: Add "udevadm trigger" before swap verification
5
6Fix: https://github.com/linux-test-project/ltp/issues/458
7
8Sometimes the swap device cannot show up in /dev/disk/by-uuid/
9or /dev/disk/by-lable/ due to the issue #458. When this issue
10happens, "blkid -c /dev/null" and "ls /dev/disk/by-uuid/" show
11different UUID of the device.
12
13Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/1193414]
14
15Signed-off-by: Yongxin Liu <yongxin.liu@windriver.com>
16---
17 testcases/commands/mkswap/mkswap01.sh | 2 ++
18 1 file changed, 2 insertions(+)
19
20diff --git a/testcases/commands/mkswap/mkswap01.sh b/testcases/commands/mkswap/mkswap01.sh
21index 3a348c6e6..9437c4a4e 100755
22--- a/testcases/commands/mkswap/mkswap01.sh
23+++ b/testcases/commands/mkswap/mkswap01.sh
24@@ -129,6 +129,8 @@ mkswap_test()
25 return
26 fi
27
28+ udevadm trigger --name-match=$TST_DEVICE
29+
30 if [ -n "$device" ]; then
31 mkswap_verify "$mkswap_op" "$op_arg" "$device" "$size" "$dev_file"
32 if [ $? -ne 0 ]; then
33--
342.14.4
35
diff --git a/meta/recipes-extended/ltp/ltp_20190517.bb b/meta/recipes-extended/ltp/ltp_20190517.bb
index 5915b1c72a..47aa9675d8 100644
--- a/meta/recipes-extended/ltp/ltp_20190517.bb
+++ b/meta/recipes-extended/ltp/ltp_20190517.bb
@@ -50,6 +50,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
50 file://0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch \ 50 file://0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch \
51 file://0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch \ 51 file://0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch \
52 file://0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch \ 52 file://0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch \
53 file://0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch \
53 " 54 "
54 55
55S = "${WORKDIR}/git" 56S = "${WORKDIR}/git"