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:26:21 +0100
commitc724a2feaef9030718742c02cb7da5a976e6b6e4 (patch)
treef614aafb1859dae8d5e5c280f88ad15f524be67d
parente53ebf297c86bba727e075c44c595beb061dbfc8 (diff)
downloadopenembedded-core-contrib-c724a2feaef9030718742c02cb7da5a976e6b6e4.tar.gz
openembedded-core-contrib-c724a2feaef9030718742c02cb7da5a976e6b6e4.tar.bz2
openembedded-core-contrib-c724a2feaef9030718742c02cb7da5a976e6b6e4.zip
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. 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 @@
+parted: change check for device-manager
+
+Other ptests use this method.
+
+Upstream-Status: Submitted [bug-parted@gnu.org]
+
+Signed-off-by: Joe Slater <joe.slater@windriver.com>
+
+
+--- a/tests/t6001-psep.sh
++++ b/tests/t6001-psep.sh
+@@ -19,7 +19,9 @@
+ . "${srcdir=.}/init.sh"; path_prepend_ ../parted
+
+ require_root_
+-(dmsetup --help) > /dev/null 2>&1 || skip_test_ "No dmsetup installed"
++
++test "x$ENABLE_DEVICE_MAPPER" = xyes \
++ || skip_ "no device-mapper support"
+
+ # Device maps names - should be random to not conflict with existing ones on
+ # 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 \
file://run-ptest \
file://Makefile \
file://0001-libparted-Use-read-only-when-probing-devices-on-linu.patch \
+ file://dm_check.patch \
"
SRC_URI[md5sum] = "0247b6a7b314f8edeb618159fa95f9cb"