From 8e36191fbe07c1a84e4a58423178b01f09dcd5b7 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 14 Aug 2018 00:22:18 +0800 Subject: python3-blivet: remove dmraid from dependency check OE does not have dmraid recipe, so remove it from dependency check. Signed-off-by: Hongxu Jia Signed-off-by: Khem Raj --- .../0012-remove-dmraid-dependency-check.patch | 31 ++++++++++++++++++++++ .../python-blivet/python3-blivet_3.0.1.bb | 1 + 2 files changed, 32 insertions(+) create mode 100644 meta-python/recipes-extended/python-blivet/python3-blivet/0012-remove-dmraid-dependency-check.patch (limited to 'meta-python') diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet/0012-remove-dmraid-dependency-check.patch b/meta-python/recipes-extended/python-blivet/python3-blivet/0012-remove-dmraid-dependency-check.patch new file mode 100644 index 0000000000..886e3ff93a --- /dev/null +++ b/meta-python/recipes-extended/python-blivet/python3-blivet/0012-remove-dmraid-dependency-check.patch @@ -0,0 +1,31 @@ +From 4476e846a1e64dde17df2e2370c803ce695514f9 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Mon, 6 Aug 2018 17:18:27 +0800 +Subject: [PATCH] remove dmraid dependency check + +OE does not support dmraid, remove it from dependency check + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia +--- + blivet/tasks/availability.py | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/blivet/tasks/availability.py b/blivet/tasks/availability.py +index 9a87cfd..843cf6a 100644 +--- a/blivet/tasks/availability.py ++++ b/blivet/tasks/availability.py +@@ -316,8 +316,7 @@ BLOCKDEV_DM_ALL_MODES = (blockdev.DMTechMode.CREATE_ACTIVATE | + blockdev.DMTechMode.QUERY) + BLOCKDEV_DM = BlockDevTechInfo(plugin_name="dm", + check_fn=blockdev.dm_is_tech_avail, +- technologies={blockdev.DMTech.MAP: BLOCKDEV_DM_ALL_MODES, +- blockdev.DMTech.RAID: BLOCKDEV_DM_ALL_MODES}) ++ technologies={blockdev.DMTech.MAP: BLOCKDEV_DM_ALL_MODES}) + BLOCKDEV_DM_TECH = BlockDevMethod(BLOCKDEV_DM) + + # libblockdev loop plugin required technologies and modes +-- +2.7.4 + diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet_3.0.1.bb b/meta-python/recipes-extended/python-blivet/python3-blivet_3.0.1.bb index 218c158c69..5fcbd88eba 100644 --- a/meta-python/recipes-extended/python-blivet/python3-blivet_3.0.1.bb +++ b/meta-python/recipes-extended/python-blivet/python3-blivet_3.0.1.bb @@ -21,6 +21,7 @@ SRC_URI = "git://github.com/rhinstaller/blivet;branch=3.1-release \ file://0009-invoking-fsck-with-infinite-timeout.patch \ file://0010-invoking-mkfs-with-infinite-timeout.patch \ file://0011-invoking-dd-with-infinite-timeout.patch \ + file://0012-remove-dmraid-dependency-check.patch \ " UPSTREAM_CHECK_GITTAGREGEX = "blivet-(?P\d+(\.\d+)+)$" -- cgit 1.2.3-korg