[oe-commits] [openembedded-core] 04/08: parted: change device manager check in ptest

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 1ce18ae0c5663dbe180ecbb6398db40822f4820f
Author: Joe Slater <joe.slater at windriver.com>
AuthorDate: Wed Jun 19 14:26:47 2019 -0700

    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 at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-extended/parted/files/dm_check.patch | 22 ++++++++++++++++++++++
 meta/recipes-extended/parted/parted_3.2.bb        |  1 +
 2 files changed, 23 insertions(+)

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 0000000..bc0e95f
--- /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: Pending
+
+Signed-off-by: Joe Slater <joe.slater at 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 13d7d66..21a8153 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"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.