summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Slater <joe.slater@windriver.com>2019-06-20 15:04:21 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-06-21 00:33:23 +0100
commit9d91ba408e65a11412570511f1ed267867444baf (patch)
tree4048bc655f1f5f85c287f734f4394b5d4e47c786
parenta5431f3b81ecc1095b4b916355d24ee0b0a307dd (diff)
downloadpoky-9d91ba408e65a11412570511f1ed267867444baf.tar.gz
parted: change device manager check in ptest
t6001-psep should check for device manager the same way as other ptests for parted -- look for an environment variable. (From OE-Core rev: c724a2feaef9030718742c02cb7da5a976e6b6e4) Signed-off-by: Joe Slater <joe.slater@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/parted/files/dm_check.patch22
-rw-r--r--meta/recipes-extended/parted/parted_3.2.bb1
2 files changed, 23 insertions, 0 deletions
diff --git a/meta/recipes-extended/parted/files/dm_check.patch b/meta/recipes-extended/parted/files/dm_check.patch
new file mode 100644
index 0000000000..5f3c4ddae8
--- /dev/null
+++ b/meta/recipes-extended/parted/files/dm_check.patch
@@ -0,0 +1,22 @@
1parted: change check for device-manager
2
3Other ptests use this method.
4
5Upstream-Status: Submitted [bug-parted@gnu.org]
6
7Signed-off-by: Joe Slater <joe.slater@windriver.com>
8
9
10--- a/tests/t6001-psep.sh
11+++ b/tests/t6001-psep.sh
12@@ -19,7 +19,9 @@
13 . "${srcdir=.}/init.sh"; path_prepend_ ../parted
14
15 require_root_
16-(dmsetup --help) > /dev/null 2>&1 || skip_test_ "No dmsetup installed"
17+
18+test "x$ENABLE_DEVICE_MAPPER" = xyes \
19+ || skip_ "no device-mapper support"
20
21 # Device maps names - should be random to not conflict with existing ones on
22 # the system
diff --git a/meta/recipes-extended/parted/parted_3.2.bb b/meta/recipes-extended/parted/parted_3.2.bb
index 13d7d6676c..21a815345a 100644
--- a/meta/recipes-extended/parted/parted_3.2.bb
+++ b/meta/recipes-extended/parted/parted_3.2.bb
@@ -18,6 +18,7 @@ SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \
18 file://run-ptest \ 18 file://run-ptest \
19 file://Makefile \ 19 file://Makefile \
20 file://0001-libparted-Use-read-only-when-probing-devices-on-linu.patch \ 20 file://0001-libparted-Use-read-only-when-probing-devices-on-linu.patch \
21 file://dm_check.patch \
21" 22"
22 23
23SRC_URI[md5sum] = "0247b6a7b314f8edeb618159fa95f9cb" 24SRC_URI[md5sum] = "0247b6a7b314f8edeb618159fa95f9cb"